diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 8d571d3a176..261a6593115 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -30,6 +30,10 @@ name = "chief engineer's garment bag" desc = "A bag for storing extra clothes and shoes. This one belongs to the chief engineer." +/obj/item/storage/bag/garment/quartermaster + name = "quartermasters's garment bag" + desc = "A bag for storing extra clothes and shoes. This one belongs to the quartermaster." + /obj/item/storage/bag/garment/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -47,21 +51,21 @@ new /obj/item/clothing/under/rank/captain/parade(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal(src) + new /obj/item/clothing/suit/hooded/wintercoat/captain(src) new /obj/item/clothing/suit/jacket/capjacket(src) new /obj/item/clothing/glasses/sunglasses/gar/giga(src) new /obj/item/clothing/gloves/color/captain(src) + new /obj/item/clothing/head/costume/crown/fancy(src) new /obj/item/clothing/head/hats/caphat(src) new /obj/item/clothing/head/hats/caphat/parade(src) - new /obj/item/clothing/head/costume/crown/fancy(src) new /obj/item/clothing/neck/cloak/cap(src) new /obj/item/clothing/shoes/laceup(src) - new /obj/item/clothing/suit/hooded/wintercoat/captain(src) - /obj/item/storage/bag/garment/hop/PopulateContents() 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/suit/armor/vest/hop(src) + new /obj/item/clothing/suit/hooded/wintercoat/hop(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/head/hats/hopcap(src) new /obj/item/clothing/neck/cloak/hop(src) @@ -70,21 +74,21 @@ new /obj/item/clothing/suit/hooded/wintercoat/hopformal(src) /obj/item/storage/bag/garment/hos/PopulateContents() - //new /obj/item/clothing/under/rank/security/head_of_security/grey(src) //SKYRAT EDIT REMOVAL - //new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) //SKYRAT EDIT REMOVAL + new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) new /obj/item/clothing/under/rank/security/head_of_security/alt(src) new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src) - new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src) + new /obj/item/clothing/under/rank/security/head_of_security/grey(src) new /obj/item/clothing/under/rank/security/head_of_security/parade(src) + new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src) new /obj/item/clothing/suit/armor/hos(src) new /obj/item/clothing/suit/armor/hos/hos_formal(src) + new /obj/item/clothing/suit/armor/hos/trenchcoat/winter(src) new /obj/item/clothing/suit/armor/vest/leather(src) new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src) new /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga(src) new /obj/item/clothing/head/hats/hos(src) new /obj/item/clothing/mask/gas/sechailer/swat(src) new /obj/item/clothing/neck/cloak/hos(src) - new /obj/item/clothing/suit/armor/hos/trenchcoat/winter(src) /obj/item/storage/bag/garment/research_director/PopulateContents() new /obj/item/clothing/under/rank/rnd/research_director(src) @@ -95,31 +99,42 @@ new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src) new /obj/item/clothing/suit/toggle/labcoat/skyrat/rd(src) //SKYRAT EDIT ADDITION new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) + new /obj/item/clothing/suit/hooded/wintercoat/science/rd(src) new /obj/item/clothing/head/beret/science/rd(src) + new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/neck/cloak/rd(src) new /obj/item/clothing/shoes/jackboots(src) - new /obj/item/clothing/suit/hooded/wintercoat/science/rd(src) - new /obj/item/clothing/gloves/color/black(src) /obj/item/storage/bag/garment/chief_medical/PopulateContents() - new /obj/item/clothing/head/beret/medical/cmo(src) - new /obj/item/clothing/head/utility/surgerycap/cmo(src) 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/scrubs(src) + new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo(src) new /obj/item/clothing/suit/toggle/labcoat/cmo(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) + new /obj/item/clothing/head/beret/medical/cmo(src) + new /obj/item/clothing/head/utility/surgerycap/cmo(src) new /obj/item/clothing/neck/cloak/cmo(src) new /obj/item/clothing/shoes/sneakers/blue (src) - new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo(src) /obj/item/storage/bag/garment/engineering_chief/PopulateContents() 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/suit/hooded/wintercoat/engineering/ce(src) new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/clothing/gloves/color/chief_engineer(src) new /obj/item/clothing/head/utility/hardhat/white(src) new /obj/item/clothing/head/utility/hardhat/weldhat/white(src) new /obj/item/clothing/neck/cloak/ce(src) new /obj/item/clothing/shoes/sneakers/brown(src) - new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src) + +/obj/item/storage/bag/garment/quartermaster/PopulateContents() + new /obj/item/clothing/under/rank/cargo/qm(src) + new /obj/item/clothing/under/rank/cargo/qm/skirt(src) + new /obj/item/clothing/suit/hooded/wintercoat/cargo/qm(src) + new /obj/item/clothing/suit/utility/fire/firefighter(src) + new /obj/item/clothing/gloves/fingerless(src) + new /obj/item/clothing/head/soft(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/neck/cloak/qm(src) + new /obj/item/clothing/shoes/sneakers/brown(src) 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 f1c2d2ea8fc..9985ade7b7a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -5,20 +5,7 @@ /obj/structure/closet/secure_closet/quartermaster/PopulateContents() ..() - new /obj/item/clothing/neck/cloak/qm(src) new /obj/item/storage/lockbox/medal/cargo(src) - // SKYRAT EDIT REMOVAL BEGIN - MOVED TO COMMAND CLOTHING VENDOR - /* - new /obj/item/clothing/under/rank/cargo/qm(src) - new /obj/item/clothing/under/rank/cargo/qm/skirt(src) - new /obj/item/clothing/shoes/sneakers/brown(src) - new /obj/item/clothing/gloves/fingerless(src) // Why does the QM spawn with generic gloves - new /obj/item/clothing/mask/gas(src) // Why does the QM spawn with a generic gas mask - new /obj/item/clothing/head/soft(src) // Why does the QM spawn with a generic soft cap - */ - new /obj/item/radio/headset/heads/qm(src) - new /obj/item/clothing/suit/utility/fire/firefighter(src) - new /obj/item/clothing/gloves/fingerless(src) new /obj/item/megaphone/cargo(src) new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/universal_scanner(src) @@ -26,10 +13,10 @@ new /obj/item/circuitboard/machine/techfab/department/cargo(src) new /obj/item/storage/photo_album/qm(src) new /obj/item/circuitboard/machine/ore_silo(src) - new /obj/item/clothing/suit/hooded/wintercoat/cargo/qm(src) new /obj/item/gun/ballistic/rifle/boltaction/brand_new/quartermaster(src) // SKYRAT EDIT - The QM's 'special' head item. It spawns loaded, but you have to find more ammo if you run out and get ready to manually load rounds in! new /obj/item/cargo_teleporter(src) // SKYRAT EDIT - Adds a cargo teleporter to QM locker, so they can intice others to research it new /obj/item/clothing/glasses/hud/gun_permit/sunglasses(src) //SKYRAT EDIT - GUN CARGO + new /obj/item/storage/bag/garment/quartermaster(src) /obj/structure/closet/secure_closet/quartermaster/populate_contents_immediate() . = ..()