Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernizes the Turreted Outpost #28561

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
5.56 nato
  • Loading branch information
Fordoxia committed Mar 2, 2025
commit 99d195397b23eff81084059bfd5c78336fc8d5f5
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/turreted_outpost/vault)
"WE" = (
/obj/machinery/porta_turret/syndicate/exterior,
/obj/machinery/porta_turret/syndicate/turret_outpost,
/turf/simulated/floor/plasteel/airless{
icon_state = "rockvault"
},
Expand Down
6 changes: 6 additions & 0 deletions code/game/machinery/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1150,6 +1150,12 @@ GLOBAL_LIST_EMPTY(turret_icons)
projectile = /obj/item/projectile/bullet
eprojectile = /obj/item/projectile/bullet

/obj/machinery/porta_turret/syndicate/turret_outpost
name = "machine gun turret (5.56x45mm)"
desc = "Syndicate exterior defense turret chambered for 5.56x45mm rounds. Designed to down intruders with rifle caliber bullets."
projectile = /obj/item/projectile/bullet/heavybullet2
eprojectile = /obj/item/projectile/bullet/heavybullet2

/obj/machinery/porta_turret/syndicate/grenade
name = "mounted grenade launcher (40mm)"
desc = "Syndicate 40mm grenade launcher defense turret. If you've had this much time to look at it, you're probably already dead."
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/projectile/bullets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@
/obj/item/projectile/bullet/heavybullet
damage = 35

/obj/item/projectile/bullet/heavybullet2
damage = 40

/// taser slugs for shotguns, nothing special
/obj/item/projectile/bullet/stunshot
name = "stunshot"
Expand Down