Skip to content

Commit

Permalink
Reorder the list of items in more outfits. (tgstation#57801)
Browse files Browse the repository at this point in the history 
On my quest to make outfits easier to read and fix some small mistakes by applying a priority order.

ID > uniform > suit > backpack > other clothing in alphabetic order > pockets > hands > others

Moved the base/assistant plasmaman outfit from the middle of the standard file to the top of the plasmaman outfit file.
Reorganized the plasmaman outfit order to have jobs within a department close to each other.
Moved the Death Commando outfit into the ERT file together with a line that adds mindshields to CentCom outfits because I had to dig to find that a long time ago...

Also fixes detective plasmaman spawning with a worse headset and plasmamen prisoners spawning with a different shoe.
Like... how no one has seen that plasmaman spawn with the wrong headset? Do we have no plasmaman sec? Yes I know the answer...
  • Loading branch information
@GuillaumePrata
GuillaumePrata authored Mar 28, 2021
1 parent fa12931 commit f38c8b1
Show file tree
Hide file tree
Showing 5 changed files with 392 additions and 375 deletions.
222 changes: 139 additions & 83 deletions code/modules/clothing/outfits/ert.dm
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/datum/outfit/centcom/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return

var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)//hmm lets have centcom officials become revs
L.implant(H, null, 1)

/datum/outfit/centcom/ert
name = "ERT Common"

Expand Down Expand Up @@ -31,8 +38,8 @@
suit_store = /obj/item/gun/energy/e_gun
back = /obj/item/storage/backpack/ert
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/melee/baton/loaded=1,
/obj/item/melee/baton/loaded = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/security/full
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
Expand All @@ -51,9 +58,9 @@
name = "ERT Commander - High Alert"

backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/melee/baton/loaded=1,
/obj/item/gun/energy/pulse/pistol/loyalpin=1,
/obj/item/gun/energy/pulse/pistol/loyalpin = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/storage/box/survival/engineer = 1,
)
glasses = /obj/item/clothing/glasses/thermal/eyepatch
l_pocket = /obj/item/melee/transforming/energy/sword/saber
Expand All @@ -66,9 +73,9 @@
suit_store = /obj/item/gun/energy/e_gun/stun
back = /obj/item/storage/backpack/ert/security
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/storage/box/handcuffs=1,
/obj/item/melee/baton/loaded=1,
/obj/item/melee/baton/loaded = 1,
/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/security/full
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
Expand All @@ -89,10 +96,10 @@

belt = /obj/item/gun/energy/pulse/carbine/loyalpin
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/storage/box/handcuffs=1,
/obj/item/melee/baton/loaded=1,
/obj/item/storage/belt/security/full=1,
/obj/item/melee/baton/loaded = 1,
/obj/item/storage/belt/security/full = 1,
/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/survival/engineer = 1,
)

/datum/outfit/centcom/ert/medic
Expand All @@ -103,11 +110,11 @@
suit_store = /obj/item/gun/energy/e_gun
back = /obj/item/storage/backpack/ert/medical
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/melee/baton/loaded=1,
/obj/item/reagent_containers/hypospray/combat=1,
/obj/item/gun/medbeam=1,
/obj/item/storage/box/hug/plushes=1,
/obj/item/gun/medbeam = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/reagent_containers/hypospray/combat = 1,
/obj/item/storage/box/hug/plushes = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/medical
glasses = /obj/item/clothing/glasses/hud/health
Expand All @@ -127,12 +134,12 @@
name = "ERT Medic - High Alert"

backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/melee/baton/loaded=1,
/obj/item/gun/energy/pulse/pistol/loyalpin=1,
/obj/item/reagent_containers/hypospray/combat/nanites=1,
/obj/item/gun/medbeam=1,
/obj/item/storage/box/hug/plushes=1,
/obj/item/gun/energy/pulse/pistol/loyalpin = 1,
/obj/item/gun/medbeam = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/reagent_containers/hypospray/combat/nanites = 1,
/obj/item/storage/box/hug/plushes = 1,
/obj/item/storage/box/survival/engineer = 1,
)
mask = /obj/item/clothing/mask/gas/sechailer/swat

Expand All @@ -144,10 +151,10 @@
suit_store = /obj/item/gun/energy/e_gun
back = /obj/item/storage/backpack/ert/engineer
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/melee/baton/loaded=1,
/obj/item/construction/rcd/loaded/upgraded=1,
/obj/item/pipe_dispenser=1,
/obj/item/construction/rcd/loaded/upgraded = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/pipe_dispenser = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/utility/full/powertools
glasses = /obj/item/clothing/glasses/meson/engine
Expand All @@ -167,11 +174,11 @@
name = "ERT Engineer - High Alert"

backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/melee/baton/loaded=1,
/obj/item/gun/energy/pulse/pistol/loyalpin=1,
/obj/item/construction/rcd/combat=1,
/obj/item/pipe_dispenser=1,
/obj/item/construction/rcd/combat = 1,
/obj/item/gun/energy/pulse/pistol/loyalpin = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/pipe_dispenser = 1,
/obj/item/storage/box/survival/engineer = 1,
)

/datum/outfit/centcom/centcom_official
Expand All @@ -182,8 +189,8 @@
uniform = /obj/item/clothing/under/rank/centcom/officer
back = /obj/item/storage/backpack/satchel
backpack_contents = list(
/obj/item/storage/box/survival=1,
/obj/item/stamp/centcom=1,
/obj/item/stamp/centcom = 1,
/obj/item/storage/box/survival = 1,
)
belt = /obj/item/gun/energy/e_gun
ears = /obj/item/radio/headset/headset_cent
Expand Down Expand Up @@ -224,22 +231,22 @@
suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
suit_store = /obj/item/gun/energy/e_gun/stun
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/storage/box/handcuffs=1,
/obj/item/melee/baton/loaded=1,
/obj/item/construction/rcd/loaded=1,
/obj/item/construction/rcd/loaded = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/survival/engineer = 1,
)

/datum/outfit/centcom/ert/medic/inquisitor
name = "Inquisition Medic"

suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/melee/baton/loaded=1,
/obj/item/reagent_containers/hypospray/combat=1,
/obj/item/reagent_containers/hypospray/combat/heresypurge=1,
/obj/item/gun/medbeam=1,
/obj/item/gun/medbeam = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/storage/box/survival/engineer = 1,
/obj/item/reagent_containers/hypospray/combat = 1,
/obj/item/reagent_containers/hypospray/combat/heresypurge = 1,
)

/datum/outfit/centcom/ert/chaplain
Expand All @@ -250,8 +257,8 @@
suit_store = /obj/item/gun/energy/e_gun
back = /obj/item/storage/backpack/cultpack
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/nullrod=1,
/obj/item/nullrod = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/soulstone
glasses = /obj/item/clothing/glasses/hud/health
Expand All @@ -267,12 +274,12 @@
/datum/outfit/centcom/ert/chaplain/inquisitor
name = "Inquisition Chaplain"

belt = /obj/item/storage/belt/soulstone/full/chappy
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/grenade/chem_grenade/holy=1,
/obj/item/nullrod=1,
/obj/item/grenade/chem_grenade/holy = 1,
/obj/item/nullrod = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/soulstone/full/chappy

/datum/outfit/centcom/ert/janitor
name = "ERT Janitor"
Expand All @@ -281,12 +288,12 @@
suit = /obj/item/clothing/suit/space/hardsuit/ert/jani
back = /obj/item/storage/backpack/ert/janitor
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/storage/box/lights/mixed=1,
/obj/item/melee/baton/loaded=1,
/obj/item/mop/advanced=1,
/obj/item/reagent_containers/glass/bucket=1,
/obj/item/grenade/clusterbuster/cleaner=1,
/obj/item/grenade/clusterbuster/cleaner = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/mop/advanced = 1,
/obj/item/reagent_containers/glass/bucket = 1,
/obj/item/storage/box/lights/mixed = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/janitor/full
glasses = /obj/item/clothing/glasses/night
Expand All @@ -308,10 +315,10 @@
name = "ERT Janitor - Heavy Duty"

backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/storage/box/lights/mixed=1,
/obj/item/melee/baton/loaded=1,
/obj/item/grenade/clusterbuster/cleaner=3,
/obj/item/grenade/clusterbuster/cleaner = 3,
/obj/item/melee/baton/loaded = 1,
/obj/item/storage/box/lights/mixed = 1,
/obj/item/storage/box/survival/engineer = 1,
)
l_hand = /obj/item/reagent_containers/spray/chemsprayer/janitor

Expand All @@ -322,10 +329,10 @@
suit = /obj/item/clothing/suit/space/hardsuit/ert/clown
back = /obj/item/storage/backpack/ert/clown
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/melee/transforming/energy/sword/bananium=1,
/obj/item/shield/energy/bananium=1,
/obj/item/gun/ballistic/revolver/reverse=1,
/obj/item/gun/ballistic/revolver/reverse = 1,
/obj/item/melee/transforming/energy/sword/bananium = 1,
/obj/item/shield/energy/bananium = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/champion
glasses = /obj/item/clothing/glasses/godeye
Expand Down Expand Up @@ -406,10 +413,10 @@
suit = /obj/item/clothing/suit/apron
suit_store = null
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/storage/box/lights/mixed=1,
/obj/item/mop/advanced=1,
/obj/item/reagent_containers/glass/bucket=1,
/obj/item/mop/advanced = 1,
/obj/item/reagent_containers/glass/bucket = 1,
/obj/item/storage/box/lights/mixed = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/janitor/full
glasses = /obj/item/clothing/glasses/meson
Expand All @@ -425,9 +432,9 @@
suit = /obj/item/clothing/suit/armor/vest
suit_store = null
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/clothing/head/helmet/police=1,
/obj/item/storage/box/handcuffs=1,
/obj/item/clothing/head/helmet/police = 1,
/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/melee/classic_baton/telescopic
l_pocket = /obj/item/assembly/flash
Expand All @@ -440,13 +447,13 @@
suit = /obj/item/clothing/suit/hazardvest
suit_store = null
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/stack/sheet/iron/fifty=1,
/obj/item/stack/sheet/glass/fifty=1,
/obj/item/stack/sheet/plasteel/twenty=1,
/obj/item/etherealballdeployer=1,
/obj/item/stack/light_w=30,
/obj/item/construction/rcd/loaded=1,
/obj/item/construction/rcd/loaded = 1,
/obj/item/etherealballdeployer = 1,
/obj/item/stack/light_w = 30,
/obj/item/stack/sheet/glass/fifty = 1,
/obj/item/stack/sheet/iron/fifty = 1,
/obj/item/stack/sheet/plasteel/twenty = 1,
/obj/item/storage/box/survival/engineer = 1,
)
head = /obj/item/clothing/head/hardhat/weldhat
mask = /obj/item/clothing/mask/gas/atmos
Expand All @@ -459,9 +466,9 @@
suit = /obj/item/clothing/suit/chameleon
suit_store = null
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/shield/energy/bananium=1,
/obj/item/instrument/piano_synth=1,
/obj/item/instrument/piano_synth = 1,
/obj/item/shield/energy/bananium = 1,
/obj/item/storage/box/survival/engineer = 1,
)
glasses = /obj/item/clothing/glasses/chameleon
head = /obj/item/clothing/head/chameleon
Expand All @@ -473,11 +480,60 @@
suit = /obj/item/clothing/suit/coordinator
suit_store = null
backpack_contents = list(
/obj/item/storage/box/survival/engineer=1,
/obj/item/storage/box/fireworks=3,
/obj/item/food/cake/birthday=1,
/obj/item/food/cake/birthday = 1,
/obj/item/storage/box/fireworks = 3,
/obj/item/storage/box/survival/engineer = 1,
)
belt = /obj/item/storage/belt/sabre
head = /obj/item/clothing/head/coordinator
l_pocket = /obj/item/kitchen/knife
l_hand = /obj/item/toy/balloon

/datum/outfit/centcom/death_commando
name = "Death Commando"

id = /obj/item/card/id/advanced/black/deathsquad
id_trim = /datum/id_trim/centcom/deathsquad
uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
suit_store = /obj/item/tank/internals/emergency_oxygen/double
back = /obj/item/storage/backpack/security
backpack_contents = list(
/obj/item/ammo_box/a357 = 1,
/obj/item/flashlight = 1,
/obj/item/grenade/c4/x4 = 1,
/obj/item/storage/box/flashbangs = 1,
/obj/item/storage/box/survival/engineer = 1,
/obj/item/storage/firstaid/regular = 1,
)
belt = /obj/item/gun/ballistic/revolver/mateba
ears = /obj/item/radio/headset/headset_cent/alt
glasses = /obj/item/clothing/glasses/hud/toggle/thermal
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
mask = /obj/item/clothing/mask/gas/sechailer/swat
shoes = /obj/item/clothing/shoes/combat/swat
l_pocket = /obj/item/melee/transforming/energy/sword/saber
r_pocket = /obj/item/shield/energy
l_hand = /obj/item/gun/energy/pulse/loyalpin

skillchips = list(
/obj/item/skillchip/disk_verifier,
)

/datum/outfit/centcom/death_commando/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return

var/obj/item/radio/R = H.ears
R.set_frequency(FREQ_CENTCOM)
R.freqlock = TRUE
var/obj/item/card/id/W = H.wear_id
W.registered_name = H.real_name
W.update_label()
W.update_icon()
..()

/datum/outfit/centcom/death_commando/officer
name = "Death Commando Officer"

head = /obj/item/clothing/head/helmet/space/beret
10 changes: 6 additions & 4 deletions code/modules/clothing/outfits/event.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
name = "Santa Claus"

uniform = /obj/item/clothing/under/color/red
shoes = /obj/item/clothing/shoes/sneakers/red
suit = /obj/item/clothing/suit/space/santa
head = /obj/item/clothing/head/santa
back = /obj/item/storage/backpack/santabag
r_pocket = /obj/item/flashlight
backpack_contents = list(
/obj/item/a_gift/anything = 5,
)
gloves = /obj/item/clothing/gloves/color/red
head = /obj/item/clothing/head/santa
shoes = /obj/item/clothing/shoes/sneakers/red
r_pocket = /obj/item/flashlight

box = /obj/item/storage/box/survival/engineer
backpack_contents = list(/obj/item/a_gift/anything = 5)

/datum/outfit/santa/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
Expand Down
Loading

0 comments on commit f38c8b1

Please sign in to comment.