diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index ee8773c384..c133c6b251 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -11,6 +11,7 @@ new /obj/item/clothing/suit/toggle/labcoat/depjacket/sup/qm(src) new /obj/item/clothing/under/rank/cargo/qm(src) new /obj/item/clothing/under/rank/cargo/qm/skirt(src) + new /obj/item/clothing/under/color/dual_tone/cargo/quartermaster(src) // GS13 EDIT new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/radio/headset/heads/qm(src) new /obj/item/clothing/suit/fire/firefighter(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index f0e7784496..401a3d295a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -9,6 +9,7 @@ new /obj/item/clothing/head/beret/ce(src) new /obj/item/clothing/under/rank/engineering/chief_engineer(src) new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src) + new /obj/item/clothing/under/color/dual_tone/engineering/chief(src) // GS13 EDIT new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/hardhat/weldhat/white(src) new /obj/item/clothing/gloves/color/yellow/ce(src) @@ -17,7 +18,7 @@ new /obj/item/radio/headset/heads/ce(src) new /obj/item/megaphone/command(src) new /obj/item/areaeditor/blueprints(src) - new /obj/item/holosign_creator/engineering(src) + new /obj/item/holosign_creator/atmos(src) // GS13 EDIT - not even I use the engi holosign projector new /obj/item/assembly/flash/handheld(src) new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/door_remote/chief_engineer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index ce9ae2e280..7d85ee4931 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -53,18 +53,19 @@ icon_state = "paramed_secure" /obj/structure/closet/secure_closet/paramedic/PopulateContents() - ..() - new /obj/item/clothing/suit/toggle/labcoat/paramedic(src) - new /obj/item/clothing/under/rank/medical/paramedic(src) - new /obj/item/clothing/under/rank/medical/paramedic/skirt(src) - new /obj/item/radio/headset/headset_med(src) - new /obj/item/defibrillator/loaded(src) - new /obj/item/clothing/gloves/color/latex/nitrile(src) - new /obj/item/storage/belt/medical(src) - new /obj/item/clothing/glasses/hud/health(src) - new /obj/item/pinpointer/crew(src) - new /obj/item/sensor_device(src) - return + ..() + new /obj/item/clothing/suit/toggle/labcoat/paramedic(src) + new /obj/item/clothing/under/rank/medical/paramedic(src) + new /obj/item/clothing/under/rank/medical/paramedic/skirt(src) + new /obj/item/clothing/under/color/dual_tone/medbay/paramedic(src) // GS13 EDIT + new /obj/item/radio/headset/headset_med(src) + new /obj/item/defibrillator/loaded(src) + new /obj/item/clothing/gloves/color/latex/nitrile(src) + new /obj/item/storage/belt/medical(src) + new /obj/item/clothing/glasses/hud/health(src) + new /obj/item/pinpointer/crew(src) + new /obj/item/sensor_device(src) + return /obj/structure/closet/secure_closet/CMO name = "\proper chief medical officer's locker" @@ -82,6 +83,7 @@ new /obj/item/clothing/under/rank/medical/chief_medical_officer(src) new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src) new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck(src) + new /obj/item/clothing/under/color/dual_tone/medbay/chief_medical_officer(src) // GS13 EDIT new /obj/item/clothing/shoes/sneakers/brown (src) new /obj/item/cartridge/cmo(src) new /obj/item/radio/headset/heads/cmo(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index a7b0153ef0..e0cedf3c61 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -16,6 +16,7 @@ new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src) + new /obj/item/clothing/under/color/dual_tone/science/research_director(src) // GS13 EDIT new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/cartridge/rd(src) new /obj/item/clothing/gloves/color/latex(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index a2239caa92..97f0189d27 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -2,12 +2,14 @@ name = "\proper captain's locker" req_access = list(ACCESS_CAPTAIN) icon_state = "cap" + /obj/structure/closet/secure_closet/captains/PopulateContents() //Excess clothing and such can be found in the Captain's Wardrobe. You can also find this file in code/modules/vending/wardrobes. ..() new /obj/item/clothing/neck/petcollar(src) //I considered removing the pet stuff too but eh, who knows. We might get Renault back. Plus I guess you could use that collar for... other means. Aren't you supposed to be guarding the disk? new /obj/item/pet_carrier(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/suit/toggle/captains_parade(src) + new /obj/item/clothing/under/color/dual_tone/command/captain(src) // GS13 EDIT new /obj/item/clothing/head/crown/fancy(src) new /obj/item/cartridge/captain(src) new /obj/item/storage/box/silver_ids(src) @@ -24,12 +26,14 @@ name = "\proper head of personnel's locker" req_access = list(ACCESS_HOP) icon_state = "hop" + /obj/structure/closet/secure_closet/hop/PopulateContents() ..() new /obj/item/clothing/neck/cloak/hop(src) new /obj/item/clothing/under/rank/civilian/head_of_personnel/whimsy(src) new /obj/item/clothing/under/rank/civilian/head_of_personnel(src) new /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt(src) + new /obj/item/clothing/under/color/dual_tone/service/head_of_personnel(src) // GS13 EDIT new /obj/item/clothing/head/hopcap(src) new /obj/item/clothing/head/hopcap/beret(src) new /obj/item/cartridge/hop(src) @@ -55,6 +59,7 @@ name = "\proper head of security's locker" req_access = list(ACCESS_HOS) icon_state = "hos" + /obj/structure/closet/secure_closet/hos/PopulateContents() ..() new /obj/item/clothing/neck/cloak/hos(src) @@ -64,6 +69,7 @@ new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src) new /obj/item/clothing/under/rank/security/head_of_security/parade(src) new /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/hoscorp(src) + new /obj/item/clothing/under/color/dual_tone/security/head_of_security(src) // GS13 EDIT new /obj/item/clothing/suit/armor/vest/leather(src) new /obj/item/clothing/suit/armor/hos(src) new /obj/item/clothing/suit/armor/hos/platecarrier(src) @@ -96,6 +102,7 @@ name = "\proper warden's locker" req_access = list(ACCESS_ARMORY) icon_state = "warden" + /obj/structure/closet/secure_closet/warden/PopulateContents() ..() new /obj/item/radio/headset/headset_sec(src) @@ -107,6 +114,7 @@ new /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/wardencorp(src) new /obj/item/clothing/under/rank/security/warden/formal(src) new /obj/item/clothing/under/rank/security/warden/skirt(src) + new /obj/item/clothing/under/color/dual_tone/security/warden(src) // GS13 EDIT new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/holosign_creator/security(src) new /obj/item/clothing/mask/gas/sechailer(src) @@ -197,6 +205,7 @@ ..() new /obj/item/clothing/under/rank/prisoner( src ) new /obj/item/clothing/under/rank/prisoner/skirt( src ) + new /obj/item/clothing/under/color/dual_tone/prisonner(src) // GS13 EDIT new /obj/item/clothing/shoes/sneakers/orange( src ) new /obj/item/radio/headset/headset_prisoner( src ) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 967dd4b1d6..68c09d5fbc 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -17,7 +17,8 @@ icon_state = "secdrobe" product_ads = "Beat perps in style!;It's red so you can't see the blood!;You have the right to be fashionable!;Now you can be the fashion police you always wanted to be!" vend_reply = "Thank you for using the SecDrobe!" - products = list(/obj/item/clothing/under/color/grey/security = 10, + products = list(/obj/item/clothing/under/color/dual_tone/security = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/security = 10, // GS13 EDIT /obj/item/clothing/suit/hooded/wintercoat/security = 2, /obj/item/storage/backpack/security = 3, /obj/item/storage/backpack/satchel/sec = 3, @@ -49,7 +50,8 @@ icon_state = "medidrobe" product_ads = "Make those blood stains look fashionable!!" vend_reply = "Thank you for using the MediDrobe!" - products = list(/obj/item/clothing/under/color/grey/medical = 10, + products = list(/obj/item/clothing/under/color/dual_tone/medbay = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/medical = 10, // GS13 EDIT /obj/item/clothing/accessory/pocketprotector = 5, /obj/item/clothing/head/beret/med = 5, /obj/item/storage/backpack/medic = 5, @@ -92,7 +94,8 @@ icon_state = "engidrobe" product_ads = "Guaranteed to protect your feet from industrial accidents!;Afraid of radiation? Then wear yellow!" vend_reply = "Thank you for using the EngiDrobe!" - products = list(/obj/item/clothing/under/color/grey/engi = 10, + products = list(/obj/item/clothing/under/color/dual_tone/engineering = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/engi = 10, // GS13 EDIT /obj/item/clothing/accessory/pocketprotector = 5, /obj/item/clothing/head/beret/eng = 3, /obj/item/storage/backpack/industrial = 3, @@ -124,7 +127,8 @@ icon_state = "atmosdrobe" product_ads = "Get your inflammable clothing right here!!!" vend_reply = "Thank you for using the AtmosDrobe!" - products = list(/obj/item/clothing/under/color/grey/engi = 10, + products = list(/obj/item/clothing/under/color/dual_tone/engineering/atmos = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/engi = 10, // GS13 EDIT /obj/item/clothing/accessory/pocketprotector = 3, /obj/item/clothing/head/beret/atmos = 3, /obj/item/storage/backpack/industrial = 3, @@ -149,7 +153,8 @@ product_ads = "Upgraded Assistant Style! Pick yours today!;These shorts are comfy and easy to wear, get yours now!" vend_reply = "Thank you for using the CargoDrobe!" products = list( - /obj/item/clothing/under/color/grey/cargo = 10, + /obj/item/clothing/under/color/dual_tone/cargo = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/cargo = 10, // GS13 EDIT /obj/item/storage/bag/mail = 3, /obj/item/clothing/suit/hooded/wintercoat/cargo = 3, /obj/item/clothing/under/rank/cargo/tech = 3, @@ -164,6 +169,7 @@ /obj/item/book/manual/supply_SOP = 5 //GS13 edit ) premium = list( + /obj/item/clothing/under/color/dual_tone/cargo/miner = 5, // GS13 EDIT /obj/item/clothing/under/rank/cargo/miner = 3, /obj/item/clothing/head/mailman = 1, /obj/item/clothing/under/misc/mailman = 1 @@ -180,7 +186,8 @@ icon_state = "robodrobe" product_ads = "You turn me TRUE, use defines!;0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101" vend_reply = "Thank you for using the RoboDrobe!" - products = list(/obj/item/clothing/under/color/grey/science = 10, + products = list(/obj/item/clothing/under/color/dual_tone/science/roboticist = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/science = 10, // GS13 EDIT /obj/item/clothing/glasses/hud/diagnostic = 3, /obj/item/stack/medical/nanogel = 5, /obj/item/clothing/head/beret/robo = 3, @@ -209,7 +216,8 @@ icon_state = "scidrobe" product_ads = "Longing for the smell of plasma burnt flesh? Buy your science clothing now!;Made with 10% Auxetics, so you don't have to worry about losing your arm!" vend_reply = "Thank you for using the SciDrobe!" - products = list(/obj/item/clothing/under/color/grey/science = 10, + products = list(/obj/item/clothing/under/color/dual_tone/science = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/science = 10, // GS13 EDIT /obj/item/clothing/accessory/pocketprotector = 5, /obj/item/clothing/head/beret/sci = 3, /obj/item/storage/backpack/science = 3, @@ -237,7 +245,8 @@ icon_state = "hydrobe" product_ads = "Do you love soil? Then buy our clothes!;Get outfits to match your green thumb here!" vend_reply = "Thank you for using the Hydrobe!" - products = list(/obj/item/clothing/under/color/grey/service = 10, + products = list(/obj/item/clothing/under/color/dual_tone/service/hydroponics = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/service = 10, // GS13 EDIT /obj/item/storage/backpack/botany = 3, /obj/item/storage/backpack = 3, /obj/item/storage/backpack/satchel/hyd = 3, @@ -263,7 +272,8 @@ icon_state = "curadrobe" product_ads = "Glasses for your eyes and literature for your soul, Curadrobe has it all!; Impress & enthrall your library guests with Curadrobe's extended line of pens!" vend_reply = "Thank you for using the CuraDrobe!" - products = list(/obj/item/pen = 4, + products = list(/obj/item/clothing/under/color/dual_tone/service/curator = 10, // GS13 EDIT + /obj/item/pen = 4, /obj/item/pen/red = 2, /obj/item/pen/blue = 2, /obj/item/pen/fourcolor = 1, @@ -289,7 +299,8 @@ icon_state = "bardrobe" product_ads = "Guaranteed to prevent stains from spilled drinks!" vend_reply = "Thank you for using the BarDrobe!" - products = list(/obj/item/clothing/under/color/grey/service = 10, + products = list(/obj/item/clothing/under/color/dual_tone/service/bartender = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/service = 10, // GS13 EDIT /obj/item/clothing/head/that = 3, /obj/item/radio/headset/headset_srv = 3, /obj/item/clothing/suit/hooded/wintercoat/bar = 3, @@ -321,7 +332,8 @@ icon_state = "chefdrobe" product_ads = "Our clothes are guaranteed to protect you from food splatters!" vend_reply = "Thank you for using the ChefDrobe!" - products = list(/obj/item/clothing/under/color/grey/service = 10, + products = list(/obj/item/clothing/under/color/dual_tone/service/chef = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/service = 10, // GS13 EDIT /obj/item/clothing/under/suit/waiter = 3, /obj/item/radio/headset/headset_srv = 4, /obj/item/clothing/accessory/waistcoat = 3, @@ -349,7 +361,8 @@ icon_state = "janidrobe" product_ads = "Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!" vend_reply = "Thank you for using the JaniDrobe!" - products = list(/obj/item/clothing/under/color/grey/service = 10, + products = list(/obj/item/clothing/under/color/dual_tone/service/janitor = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/service = 10, // GS13 EDIT /obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/clothing/under/rank/civilian/janitor/skirt = 2, /obj/item/clothing/suit/hooded/wintercoat/janitor = 3, @@ -387,7 +400,8 @@ icon_state = "lawdrobe" product_ads = "OBJECTION! Get the rule of law for yourself!" vend_reply = "Thank you for using the LawDrobe!" - products = list(/obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt = 3, + products = list(/obj/item/clothing/under/color/dual_tone/service/lawyer = 10, // GS13 EDIT + /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt = 3, /obj/item/clothing/under/rank/civilian/lawyer/purpsuit = 3, /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt = 3, /obj/item/clothing/under/rank/civilian/lawyer/female = 3, @@ -420,7 +434,8 @@ icon_state = "chapdrobe" product_ads = "Are you being bothered by cultists or pesky revenants? Then come and dress like the holy man!;Clothes for men of the cloth!" vend_reply = "Thank you for using the DeusVend!" - products = list(/obj/item/choice_beacon/holy = 1, + products = list(/obj/item/clothing/under/color/dual_tone/service/chaplain = 10, // GS13 EDIT + /obj/item/choice_beacon/holy = 1, /obj/item/storage/backpack/cultpack = 2, /obj/item/clothing/accessory/pocketprotector/cosmetology = 2, /obj/item/clothing/under/rank/civilian/chaplain = 2, @@ -433,7 +448,8 @@ /obj/item/clothing/head/nemes = 1, /obj/item/clothing/head/pharaoh = 1, /obj/item/storage/fancy/candle_box = 3, - /obj/item/book/manual/service_SOP = 1) + /obj/item/book/manual/service_SOP = 1 // GS 13 + ) premium = list(/obj/item/toy/plush/plushvar = 1, /obj/item/toy/plush/narplush = 1) refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe @@ -447,7 +463,8 @@ icon_state = "chemdrobe" product_ads = "Our clothes are 0.5% more resistant to acid spills! Get yours now!" vend_reply = "Thank you for using the ChemDrobe!" - products = list(/obj/item/clothing/under/color/grey/medical = 10, + products = list(/obj/item/clothing/under/color/dual_tone/medbay/chemist = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/medical = 10, // GS13 EDIT /obj/item/clothing/under/rank/medical/chemist = 3, /obj/item/clothing/head/beret/chem = 3, /obj/item/clothing/under/rank/medical/chemist/skirt = 3, @@ -469,7 +486,8 @@ icon_state = "genedrobe" product_ads = "Perfect for the mad scientist in you!" vend_reply = "Thank you for using the GeneDrobe!" - products = list(/obj/item/clothing/under/color/grey/medical = 10, + products = list(/obj/item/clothing/under/color/dual_tone/medbay/geneticist = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/medical = 10, // GS13 EDIT /obj/item/clothing/under/rank/medical/geneticist = 3, /obj/item/clothing/under/rank/medical/geneticist/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/genetics = 3, @@ -488,7 +506,8 @@ icon_state = "virodrobe" product_ads = " Viruses getting you down? Then upgrade to sterilized clothing today!" vend_reply = "Thank you for using the ViroDrobe" - products = list(/obj/item/clothing/under/color/grey/medical = 10, + products = list(/obj/item/clothing/under/color/dual_tone/medbay/virologist = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/medical = 10, // GS13 EDIT /obj/item/clothing/head/beret/viro = 3, /obj/item/clothing/under/rank/medical/virologist = 3, /obj/item/clothing/under/rank/medical/virologist/skirt = 3, @@ -509,7 +528,8 @@ icon_state = "detdrobe" product_ads = "Apply your brilliant deductive methods in style!" vend_reply = "Thank you for using the DetDrobe!" - products = list(/obj/item/clothing/under/color/grey/security = 10, + products = list(/obj/item/clothing/under/color/dual_tone/security/detective = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/security = 10, // GS13 EDIT /obj/item/clothing/under/rank/security/detective = 2, /obj/item/clothing/under/rank/security/detective/skirt = 2, /obj/item/clothing/under/rank/security/detective/brown = 2, @@ -550,7 +570,8 @@ icon_deny = "capsdrobe-deny" product_ads = "Only the greatest for a commander such as ours." vend_reply = "A wonderful day to you, great leader." - products = list(/obj/item/clothing/under/color/grey/command = 10, + products = list(/obj/item/clothing/under/color/dual_tone/command/captain = 10, // GS13 EDIT + /obj/item/clothing/under/color/grey/command = 10, // GS13 EDIT /obj/item/clothing/suit/hooded/wintercoat/captain = 1, /obj/item/storage/backpack/captain = 1, /obj/item/storage/backpack/satchel/cap = 1,