Skip to content

Commit

Permalink
requested changes
Browse files Browse the repository at this point in the history
- changes the shuttle name
- changes the pulse carbine description
- changes the undershirt for the dsquad is now the military combat uniform.
- removes explosive walls
  • Loading branch information
Latentish committed Aug 13, 2024
1 parent 50e9e7c commit ae27213
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion _maps/shuttles/subshuttles/Subshuttle Catalog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Size = "15x11"
Purpose = "A hit-and-run vessel made locally by the Frontiersmen."
File Path = "_maps\shuttles\subshuttles\frontiersmen_brawler.dmm"

Name = "Watchman Final Solution"
Name = "Watchman Devastator"
Size = "15x12"
Purpose: "A vessel no one is meant to see, sent to clean up the biggest messes."
File Path = "_maps\shuttle\subhuttles\deathsquad_watchman.dmm"
11 changes: 4 additions & 7 deletions _maps/shuttles/subshuttles/deathsquad_watchman.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -837,9 +837,6 @@
/obj/effect/turf_decal/techfloor,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"TM" = (
/turf/closed/wall/mineral/plastitanium/explosive,
/area/ship/bridge)
"TP" = (
/obj/structure/cable{
icon_state = "4-8"
Expand Down Expand Up @@ -1045,8 +1042,8 @@ Rs
zV
zV
el
TM
TM
zV
zV
yM
zV
zV
Expand Down Expand Up @@ -1084,14 +1081,14 @@ Rs
(9,1,1) = {"
zV
zV
TM
zV
zV
TP
zV
zV
eM
zV
TM
zV
zV
lO
"}
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
/datum/outfit/centcom/death_commando
name = "Death Commando"

uniform = /obj/item/clothing/under/color/black
uniform = /obj/item/clothing/under/rank/security/officer/military
suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy/pulse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/obj/item/gun/energy/pulse/carbine
name = "pulse carbine"
desc = "A next-generation pulse carbine capable of decimating overwhelming opposition. This weapon has accrued a kill count of 2564 dead since it was first seen in issue #10 'DEATHSQUAD CLASSICS'."
desc = "A next-generation pulse carbine capable of decimating overwhelming opposition. This weapon has accrued a ridiculous kill count since it was first seen in issue #10 'DEATHSQUAD CLASSICS'."
icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
Expand Down

0 comments on commit ae27213

Please sign in to comment.