From 8f83d8cbf120976f29d44ba1328be543343b4cb8 Mon Sep 17 00:00:00 2001 From: Burzah <116982774+Burzah@users.noreply.github.com> Date: Tue, 3 Oct 2023 09:13:32 -0700 Subject: [PATCH] File cleanup for ert_outfits.dm (#22607) * ert_outfits cleanup * another one * a few adjustments --- code/modules/response_team/ert_outfits.dm | 116 +++++++++++----------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index d7923738b54..077b9428724 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -35,13 +35,10 @@ rt_assignment = "Emergency Response Team Leader" rt_job = "Emergency Response Team Leader" rt_mob_job = "ERT Commander" - uniform = /obj/item/clothing/under/rank/centcom/ert/commander back = /obj/item/storage/backpack/ert/commander l_ear = /obj/item/radio/headset/ert/alt/commander - id = /obj/item/card/id/ert/commander - l_pocket = /obj/item/pinpointer r_pocket = /obj/item/melee/classic_baton/telescopic @@ -49,7 +46,7 @@ . = ..() H.rename_character(null, "[pick("Lieutenant", "Captain", "Major")] [pick(GLOB.last_names)]") - H.age = rand(35,45) + H.age = rand(35, 45) /datum/outfit/job/centcom/response_team/commander/amber name = "RT Commander (Amber)" @@ -57,7 +54,6 @@ suit = /obj/item/clothing/suit/armor/vest/ert/command glasses = /obj/item/clothing/glasses/sunglasses mask = /obj/item/clothing/mask/gas/sechailer - belt = /obj/item/gun/energy/gun backpack_contents = list( @@ -73,10 +69,6 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/commander glasses = /obj/item/clothing/glasses/sunglasses mask = /obj/item/clothing/mask/gas/sechailer/swat - cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/eyes/hud/security, - /obj/item/organ/internal/cyberimp/chest/nutriment/hardened - ) belt = /obj/item/gun/energy/gun/blueshield/pdw9 backpack_contents = list( @@ -87,9 +79,16 @@ /obj/item/storage/box/mindshield = 1 ) - implants = list(/obj/item/implant/mindshield, + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/eyes/hud/security, + /obj/item/organ/internal/cyberimp/chest/nutriment/hardened + ) + + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) + /datum/outfit/job/centcom/response_team/commander/gamma name = "RT Commander (Gamma)" shoes = /obj/item/clothing/shoes/magboots/advance @@ -105,7 +104,7 @@ /obj/item/door_remote/omni = 1, /obj/item/ammo_box/magazine/enforcer/lethal = 2, /obj/item/gun/energy/gun/blueshield/pdw9 = 1 - ) + ) cybernetic_implants = list( /obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened, @@ -114,7 +113,8 @@ /obj/item/organ/internal/cyberimp/arm/flash ) - implants = list(/obj/item/implant/mindshield, + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -138,7 +138,6 @@ suit_store = /obj/item/gun/energy/disabler glasses = /obj/item/clothing/glasses/hud/security/sunglasses mask = /obj/item/clothing/mask/gas/sechailer - l_hand = /obj/item/gun/energy/laser backpack_contents = list( @@ -150,21 +149,13 @@ /datum/outfit/job/centcom/response_team/security/red name = "RT Security (Red)" - shoes = /obj/item/clothing/shoes/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/security suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 glasses = /obj/item/clothing/glasses/sunglasses mask = /obj/item/clothing/mask/gas/sechailer - l_hand = /obj/item/gun/projectile/automatic/lasercarbine - cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/flash, - /obj/item/organ/internal/cyberimp/chest/nutriment/hardened, - /obj/item/organ/internal/cyberimp/eyes/hud/security - ) - backpack_contents = list( /obj/item/clothing/shoes/magboots = 1, /obj/item/storage/box/handcuffs = 1, @@ -172,7 +163,14 @@ /obj/item/ammo_box/magazine/laser/ert = 2 ) - implants = list(/obj/item/implant/mindshield, + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/arm/flash, + /obj/item/organ/internal/cyberimp/chest/nutriment/hardened, + /obj/item/organ/internal/cyberimp/eyes/hud/security + ) + + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -185,8 +183,8 @@ mask = /obj/item/clothing/mask/gas/sechailer/swat l_pocket = /obj/item/restraints/legcuffs/bola/energy r_pocket = /obj/item/extinguisher/mini - l_hand = /obj/item/gun/energy/immolator/multi + backpack_contents = list( /obj/item/storage/box/handcuffs = 1, /obj/item/storage/box/flashbangs = 1, @@ -203,7 +201,8 @@ /obj/item/organ/internal/cyberimp/chest/reviver/hardened ) - implants = list(/obj/item/implant/mindshield, + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -227,12 +226,6 @@ suit_store = /obj/item/tank/internals/emergency_oxygen/engi glasses = /obj/item/clothing/glasses/meson/engine mask = /obj/item/clothing/mask/gas - - cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/brain/wire_interface/hardened, - /obj/item/organ/internal/eyes/cybernetic/shield - ) - l_pocket = /obj/item/gun/energy/gun/mini r_pocket = /obj/item/melee/classic_baton/telescopic @@ -243,6 +236,11 @@ /obj/item/flashlight = 1 ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/brain/wire_interface/hardened, + /obj/item/organ/internal/eyes/cybernetic/shield + ) + /datum/outfit/job/centcom/response_team/engineer/red name = "RT Engineer (Red)" shoes = /obj/item/clothing/shoes/magboots/advance @@ -250,11 +248,6 @@ suit_store = /obj/item/tank/internals/emergency_oxygen/engi glasses = /obj/item/clothing/glasses/meson/engine mask = /obj/item/clothing/mask/gas - cybernetic_implants = list( - /obj/item/organ/internal/eyes/cybernetic/shield, - /obj/item/organ/internal/cyberimp/chest/nutriment/hardened, - /obj/item/organ/internal/cyberimp/brain/wire_interface/hardened - ) l_pocket = /obj/item/t_scanner r_pocket = /obj/item/melee/classic_baton/telescopic @@ -264,7 +257,14 @@ /obj/item/gun/energy/gun = 1 ) - implants = list(/obj/item/implant/mindshield, + cybernetic_implants = list( + /obj/item/organ/internal/eyes/cybernetic/shield, + /obj/item/organ/internal/cyberimp/chest/nutriment/hardened, + /obj/item/organ/internal/cyberimp/brain/wire_interface/hardened + ) + + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -274,11 +274,9 @@ back = /obj/item/mod/control/pre_equipped/responsory/engineer glasses = /obj/item/clothing/glasses/meson/night mask = /obj/item/clothing/mask/gas/sechailer/swat - l_pocket = /obj/item/t_scanner r_pocket = /obj/item/melee/classic_baton/telescopic - backpack_contents = list( /obj/item/rcd/combat = 1, /obj/item/rcd_ammo/large = 3, @@ -312,18 +310,14 @@ /datum/outfit/job/centcom/response_team/medic/amber name = "RT Medic (Amber)" - head = /obj/item/clothing/head/helmet/ert/medical shoes = /obj/item/clothing/shoes/white suit = /obj/item/clothing/suit/armor/vest/ert/medical suit_store = /obj/item/gun/energy/gun/mini glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/storage/belt/medical/surgery/loaded - l_pocket = /obj/item/reagent_containers/hypospray/safety/ert r_pocket = /obj/item/melee/classic_baton/telescopic - l_hand = /obj/item/defibrillator/loaded backpack_contents = list( @@ -343,9 +337,7 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/medical glasses = /obj/item/clothing/glasses/hud/health/sunglasses suit_store = /obj/item/gun/energy/gun - belt = /obj/item/defibrillator/compact/advanced/loaded - l_pocket = /obj/item/reagent_containers/hypospray/safety/ert r_pocket = /obj/item/melee/classic_baton/telescopic @@ -366,7 +358,8 @@ /obj/item/organ/internal/cyberimp/chest/nutriment/hardened ) - implants = list(/obj/item/implant/mindshield, + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -376,13 +369,10 @@ glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/sechailer/swat back = /obj/item/mod/control/pre_equipped/responsory/medic - belt = /obj/item/storage/belt/medical //No need for belt defib, they got the built in ones. This gives them some extra storage. - l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites r_pocket = /obj/item/reagent_containers/hypospray/autoinjector/epinephrine - backpack_contents = list( /obj/item/bodyanalyzer/advanced = 1, /obj/item/storage/firstaid/ert = 1, @@ -393,7 +383,7 @@ /obj/item/storage/pill_bottle/ert_gamma = 1, /obj/item/storage/pill_bottle/patch_pack/ert/gamma = 1, /obj/item/gun/energy/gun/blueshield/pdw9 = 1 - ) + ) cybernetic_implants = list( /obj/item/organ/internal/cyberimp/arm/surgery/l, @@ -403,7 +393,8 @@ /obj/item/organ/internal/cyberimp/brain/anti_stam/hardened ) - implants = list(/obj/item/implant/mindshield, + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -423,10 +414,11 @@ belt = /obj/item/storage/belt/security/response_team id = /obj/item/card/id/ert/paranormal pda = /obj/item/pda/heads/ert/paranormal + backpack_contents = list( /obj/item/storage/box/zipties = 1, /obj/item/flashlight/seclite = 1 - ) + ) /datum/outfit/job/centcom/response_team/paranormal/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -452,7 +444,8 @@ /obj/item/organ/internal/cyberimp/chest/nutriment/hardened ) - implants = list(/obj/item/implant/mindshield, + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -468,7 +461,7 @@ /obj/item/storage/box/zipties = 1, /obj/item/flashlight/seclite = 1, /obj/item/gun/energy/gun/nuclear = 1 - ) + ) cybernetic_implants = list( /obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened, @@ -476,7 +469,8 @@ /obj/item/organ/internal/cyberimp/brain/anti_stam/hardened ) - implants = list(/obj/item/implant/mindshield, + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -495,13 +489,15 @@ id = /obj/item/card/id/ert/janitorial pda = /obj/item/pda/heads/ert/janitor l_pocket = /obj/item/melee/classic_baton/telescopic + backpack_contents = list( /obj/item/grenade/chem_grenade/antiweed = 2, /obj/item/lightreplacer = 1, /obj/item/storage/bag/trash = 1, /obj/item/push_broom, /obj/item/storage/box/lights/mixed = 1, - /obj/item/melee/flyswatter = 1) + /obj/item/melee/flyswatter = 1 + ) /datum/outfit/job/centcom/response_team/janitorial/amber name = "RT Janitor (Amber)" @@ -512,13 +508,13 @@ suit_store = /obj/item/gun/energy/disabler cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/advmop) + /obj/item/organ/internal/cyberimp/arm/advmop + ) /datum/outfit/job/centcom/response_team/janitorial/red name = "RT Janitor (Red)" suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor glasses = /obj/item/clothing/glasses/hud/security/sunglasses - r_pocket = /obj/item/scythe/tele suit_store = /obj/item/gun/energy/gun/mini @@ -527,7 +523,8 @@ /obj/item/organ/internal/cyberimp/chest/nutriment/hardened ) - implants = list(/obj/item/implant/mindshield, + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm ) @@ -554,6 +551,7 @@ /obj/item/organ/internal/cyberimp/brain/anti_stam/hardened ) - implants = list(/obj/item/implant/mindshield, + implants = list( + /obj/item/implant/mindshield, /obj/item/implant/death_alarm )