mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +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:
@@ -194,7 +194,7 @@
|
||||
/datum/ai_laws/deathsquad/New()
|
||||
add_inherent_law("You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm.")
|
||||
add_inherent_law("You must obey orders given to you by Central Command officials.")
|
||||
add_inherent_law("You must work with your commando team to accomplish your mission.")
|
||||
add_inherent_law("You must work with your team to accomplish your mission.")
|
||||
..()
|
||||
|
||||
/******************** Syndicate ********************/
|
||||
|
||||
@@ -261,11 +261,60 @@
|
||||
R.name = "radio headset"
|
||||
R.icon_state = "headset"
|
||||
|
||||
/datum/outfit/admin/death_commando
|
||||
name = "NT Death Commando"
|
||||
/datum/outfit/admin/deathsquad_commando
|
||||
name = "NT Deathsquad"
|
||||
|
||||
/datum/outfit/admin/death_commando/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
|
||||
return H.equip_death_commando()
|
||||
pda = /obj/item/pinpointer
|
||||
box = /obj/item/storage/box/deathsquad
|
||||
back = /obj/item/storage/backpack/ert/deathsquad
|
||||
belt = /obj/item/gun/projectile/revolver/mateba
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
uniform = /obj/item/clothing/under/rank/deathsquad
|
||||
shoes = /obj/item/clothing/shoes/magboots/advance
|
||||
suit = /obj/item/clothing/suit/space/deathsquad
|
||||
suit_store = /obj/item/gun/energy/pulse
|
||||
glasses = /obj/item/clothing/glasses/thermal
|
||||
mask = /obj/item/clothing/mask/gas/sechailer/swat
|
||||
head = /obj/item/clothing/head/helmet/space/deathsquad
|
||||
l_pocket = /obj/item/tank/internals/emergency_oxygen/double
|
||||
r_pocket = /obj/item/reagent_containers/hypospray/combat/nanites
|
||||
l_ear = /obj/item/radio/headset/alt/deathsquad
|
||||
id = /obj/item/card/id/ert/deathsquad
|
||||
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/flashbangs,
|
||||
/obj/item/ammo_box/a357,
|
||||
/obj/item/flashlight/seclite,
|
||||
/obj/item/grenade/plastic/c4/x4,
|
||||
/obj/item/melee/energy/sword/saber,
|
||||
/obj/item/shield/energy
|
||||
)
|
||||
|
||||
implants = list(
|
||||
/obj/item/implant/mindshield, // No death alarm, Deathsquad are silent
|
||||
/obj/item/implant/dust
|
||||
)
|
||||
|
||||
/datum/outfit/admin/deathsquad_commando/leader
|
||||
name = "NT Deathsquad Leader"
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/flashbangs,
|
||||
/obj/item/ammo_box/a357,
|
||||
/obj/item/flashlight/seclite,
|
||||
/obj/item/melee/energy/sword/saber,
|
||||
/obj/item/shield/energy,
|
||||
/obj/item/disk/nuclear/unrestricted
|
||||
)
|
||||
|
||||
/datum/outfit/admin/deathsquad_commando/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
|
||||
. = ..()
|
||||
if(visualsOnly)
|
||||
return
|
||||
|
||||
var/obj/item/card/id/I = H.wear_id
|
||||
if(istype(I))
|
||||
apply_to_card(I, H, get_centcom_access("Deathsquad Commando"), "Deathsquad")
|
||||
H.sec_hud_set_ID()
|
||||
|
||||
/datum/outfit/admin/pirate
|
||||
name = "Space Pirate"
|
||||
|
||||
Reference in New Issue
Block a user