mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 19:17:50 +01:00
Refactors Deathsquad, adds more customization to their spawning (#18135)
* a new coat of paint
* no shooting teammates on spawn for 100 damage
* datumization part 1, makes DS more OP, spacing fix
* hnng still broken but better
* breaks stuff less 99%
* mostly tgui
* oops, removes left over things from testing
* seperate tgui
* undo changes to ERT file and ERT manager
* build TGUI, front end is working
* minor fix, still broken
* this hurts me
* few small changes
* please dont fail
* mind code runs, but it doesnt work
* logging good, tgui built, will finish later
* mind code hurts, tgui should deconflict
* part one of giving up on TGUI
* 3 days of debugging, 2 lines of errors fixed
* no more unneccessary spawners
* Revert "no more unneccessary spawners"
* wow it works
* tgui, deconflict please
* a little clean up
* little more cleanup
* Sirryan addressed pt1
* Oops should commit this before the next commit
* DS isnt an option in one click antag, nuke it
* oops forgot this one small bit
* wow, simple code works
* oops, forgot to address, doesnt fix headset
* ds headset was broken long ago
* removes testing implants
* addresses requests
* get addressed code, you will be good
* few code improvements
* address moxian
* Makes deathsquad naming consistent
* this comment is true again
* a little precaution to stop AFKs
* no nuke code? no problem
* bing bam boom, more addressing
* no more runtimes I think
* clarified a few things
* gloves now show again following #18190
* Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* okay I'm a bit stupid
* deathsquad jumpsuit desc update
* CI my beloved, have a fix
* deathsquad gets their proper icon
* Revert "deathsquad gets their proper icon"
This reverts commit a52519305b.
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
This commit is contained in:
@@ -59,7 +59,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
|
||||
return ..()
|
||||
|
||||
/obj/effect/landmark/spawner/ds
|
||||
name = "Commando"
|
||||
name = "Deathsquad"
|
||||
icon_state = "ERT"
|
||||
|
||||
/obj/effect/landmark/spawner/wiz
|
||||
@@ -205,7 +205,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
|
||||
name = "Atmospheric Test Start"
|
||||
|
||||
/obj/effect/landmark/spawner/commando_manual
|
||||
name = "Commando_Manual"
|
||||
name = "Deathsquad Commando Manual"
|
||||
|
||||
/obj/effect/landmark/spawner/holding_facility
|
||||
name = "Holding Facility"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
var/list/possible_appearances = list("Assistant", "Clown", "Mime",
|
||||
"Traitor", "Nuke Op", "Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer",
|
||||
"Deathsquad Officer", "Ian", "Slaughter Demon",
|
||||
"Deathsquad Commando", "Ian", "Slaughter Demon",
|
||||
"Laughter Demon", "Xenomorph Maid", "Security Officer", "Terror Spider")
|
||||
var/pushed_over = FALSE //If the cutout is pushed over and has to be righted
|
||||
var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version
|
||||
@@ -146,9 +146,9 @@
|
||||
// name = random_name(pick(MALE,FEMALE),"Unathi")
|
||||
// desc = "A cardboard cutout of an ash walker."
|
||||
// icon_state = "cutout_free_antag"
|
||||
if("Deathsquad Officer")
|
||||
name = pick(GLOB.commando_names)
|
||||
desc = "A cardboard cutout of a death commando."
|
||||
if("Deathsquad Commando")
|
||||
name = pick(GLOB.deathsquad_names)
|
||||
desc = "A cardboard cutout of a Deathsquad Commando, from that show about loose-cannon ERT Officers."
|
||||
icon_state = "cutout_deathsquad"
|
||||
if("Ian")
|
||||
name = "Ian"
|
||||
|
||||
@@ -82,6 +82,17 @@
|
||||
icon_state = "com_headset_alt"
|
||||
item_state = "com_headset_alt"
|
||||
|
||||
/obj/item/radio/headset/alt/deathsquad
|
||||
name = "Deathsquad headset"
|
||||
desc = "Special Operations only. Protects ears from flashbangs."
|
||||
requires_tcomms = FALSE
|
||||
instant = TRUE
|
||||
freqlock = TRUE
|
||||
|
||||
/obj/item/radio/headset/alt/deathsquad/Initialize()
|
||||
. = ..()
|
||||
set_frequency(DTH_FREQ)
|
||||
|
||||
/obj/item/radio/headset/syndicate
|
||||
origin_tech = "syndicate=3"
|
||||
ks1type = /obj/item/encryptionkey/syndicate/nukeops
|
||||
|
||||
@@ -1475,8 +1475,8 @@
|
||||
icon_state = "fireripleytoy"
|
||||
|
||||
/obj/item/toy/figure/mech/deathripley
|
||||
name = "toy Death Squad Ripley"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 3/11. This one is the black ripley used by the hero of DeathSquad, that TV drama about loose-cannon ERT officers!"
|
||||
name = "toy Deathsquad Ripley"
|
||||
desc = "Mini-Mecha action figure! Collect them all! 3/11. This one is the black ripley used by the hero of Deathsquad, that TV drama about loose-cannon ERT officers!"
|
||||
icon_state = "deathripleytoy"
|
||||
|
||||
/obj/item/toy/figure/mech/gygax
|
||||
|
||||
@@ -812,13 +812,19 @@
|
||||
|
||||
/obj/item/card/id/ert/commander
|
||||
icon_state = "ERT_leader"
|
||||
|
||||
/obj/item/card/id/ert/security
|
||||
icon_state = "ERT_security"
|
||||
|
||||
/obj/item/card/id/ert/engineering
|
||||
icon_state = "ERT_engineering"
|
||||
|
||||
/obj/item/card/id/ert/medic
|
||||
icon_state = "ERT_medical"
|
||||
|
||||
/obj/item/card/id/ert/deathsquad
|
||||
icon_state = "deathsquad"
|
||||
|
||||
/obj/item/card/id/golem
|
||||
name = "Free Golem ID"
|
||||
desc = "A card used to claim mining points and buy gear. Use it to mark it as yours."
|
||||
@@ -926,6 +932,8 @@
|
||||
return "ERT Medical"
|
||||
if("ERT_janitorial")
|
||||
return "ERT Janitorial"
|
||||
if("deathsquad")
|
||||
return "Deathsquad"
|
||||
if("syndie")
|
||||
return "Syndicate"
|
||||
if("TDred")
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
message_say = "FOR THE FEDERATION!"
|
||||
else if(role == ROLE_REV || role == "head revolutionary")
|
||||
message_say = "FOR THE REVOLUTION!"
|
||||
else if(role == "death commando" || role == ROLE_ERT)
|
||||
else if(role == SPECIAL_ROLE_DEATHSQUAD || role == ROLE_ERT)
|
||||
message_say = "FOR NANOTRASEN!"
|
||||
user.say(message_say)
|
||||
target = user
|
||||
|
||||
@@ -598,3 +598,9 @@
|
||||
name = "\improper TSF marine backpack"
|
||||
desc = "A spacious backpack with lots of pockets, worn by marines of the Trans-Solar Federation."
|
||||
icon_state = "ert_solgov"
|
||||
|
||||
/obj/item/storage/backpack/ert/deathsquad
|
||||
name = "Deathsquad backpack"
|
||||
desc = "A spacious backpack with lots of pockets, worn by those working in Special Operations."
|
||||
icon_state = "ert_security"
|
||||
|
||||
|
||||
@@ -798,6 +798,7 @@
|
||||
/obj/item/storage/box/responseteam
|
||||
name = "boxed survival kit"
|
||||
icon_state = "box_ert"
|
||||
storage_slots = 8
|
||||
|
||||
/obj/item/storage/box/responseteam/populate_contents()
|
||||
new /obj/item/clothing/mask/breath(src)
|
||||
@@ -809,6 +810,19 @@
|
||||
new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
|
||||
new /obj/item/reagent_containers/hypospray/autoinjector(src)
|
||||
|
||||
/obj/item/storage/box/deathsquad
|
||||
name = "boxed death kit"
|
||||
icon_state = "box_of_doom"
|
||||
|
||||
/obj/item/storage/box/deathsquad/populate_contents()
|
||||
new /obj/item/flashlight/flare(src)
|
||||
new /obj/item/crowbar/red(src)
|
||||
new /obj/item/kitchen/knife/combat(src)
|
||||
new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
|
||||
new /obj/item/reagent_containers/hypospray/autoinjector/survival(src)
|
||||
new /obj/item/ammo_box/a357(src)
|
||||
new /obj/item/ammo_box/a357(src)
|
||||
|
||||
/obj/item/storage/box/clown
|
||||
name = "clown box"
|
||||
desc = "A colorful cardboard box for the clown"
|
||||
|
||||
Reference in New Issue
Block a user