diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index c6f94cef208..8547ce04627 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -26,8 +26,11 @@ var/wall_mounted = FALSE //never solid (You can always pass over it) var/health = 100 var/breakout = 0 //if someone is currently breaking out. mutex - var/storage_capacity = 40 //Tying this to mob sizes was dumb - //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients. + + var/storage_capacity = 45 //Tying this to mob sizes was dumb + //This is so that someone can't pack hundreds of items in a locker/crate + //then open it in a populated area to crash clients. + var/open_sound = 'sound/effects/closet_open.ogg' var/close_sound = 'sound/effects/closet_close.ogg' var/open_sound_volume = 35 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 cab3aadd4ec..1a9b872c33e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -8,6 +8,7 @@ new /obj/item/storage/backpack/industrial(src) else new /obj/item/storage/backpack/satchel_eng(src) + new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/clothing/accessory/storage/brown_vest(src) new /obj/item/blueprints(src) new /obj/item/clothing/under/rank/chief_engineer(src) @@ -95,6 +96,7 @@ new /obj/item/storage/backpack/industrial(src) else new /obj/item/storage/backpack/satchel_eng(src) + new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/clothing/accessory/storage/brown_vest(src) new /obj/item/storage/toolbox/mechanical(src) new /obj/item/device/radio/headset/headset_eng(src) @@ -115,6 +117,7 @@ new /obj/item/storage/backpack/industrial(src) else new /obj/item/storage/backpack/satchel_eng(src) + new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/clothing/accessory/storage/brown_vest(src) new /obj/item/clothing/suit/fire/atmos(src) new /obj/item/clothing/head/hardhat/red/atmos(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 fe5531d550d..3ab4e0b9f0b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -40,6 +40,7 @@ new /obj/item/storage/backpack/medic(src) else new /obj/item/storage/backpack/satchel_med(src) + new /obj/item/storage/backpack/duffel/med(src) new /obj/item/clothing/head/nursehat (src) switch(pick("blue", "green", "purple")) if ("blue") @@ -118,6 +119,7 @@ new /obj/item/storage/backpack/medic(src) else new /obj/item/storage/backpack/satchel_med(src) + new /obj/item/storage/backpack/duffel/med(src) new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) new /obj/item/clothing/shoes/medical(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 930d281a538..e4c951c7085 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -9,6 +9,7 @@ new /obj/item/storage/backpack/captain(src) else new /obj/item/storage/backpack/satchel_cap(src) + new /obj/item/storage/backpack/duffel/cap(src) // Armor new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/suit/armor/carrier/officer(src) @@ -103,6 +104,7 @@ new /obj/item/storage/backpack/security(src) else new /obj/item/storage/backpack/satchel_sec(src) + new /obj/item/storage/backpack/duffel/sec(src) new /obj/item/clothing/suit/armor/carrier/hos(src) new /obj/item/clothing/accessory/leg_guard(src) new /obj/item/clothing/accessory/arm_guard(src) @@ -142,6 +144,7 @@ new /obj/item/storage/backpack/security(src) else new /obj/item/storage/backpack/satchel_sec(src) + new /obj/item/storage/backpack/duffel/sec(src) new /obj/item/clothing/suit/armor/carrier/hos(src) new /obj/item/clothing/accessory/leg_guard(src) new /obj/item/clothing/accessory/arm_guard(src) @@ -172,6 +175,7 @@ new /obj/item/storage/backpack/security(src) else new /obj/item/storage/backpack/satchel_sec(src) + new /obj/item/storage/backpack/duffel/sec(src) new /obj/item/clothing/suit/armor/carrier/officer(src) new /obj/item/clothing/accessory/arm_guard(src) new /obj/item/clothing/accessory/leg_guard(src) @@ -206,6 +210,7 @@ new /obj/item/storage/backpack/security(src) else new /obj/item/storage/backpack/satchel_sec(src) + new /obj/item/storage/backpack/duffel/sec(src) new /obj/item/clothing/head/beret/security(src) new /obj/item/clothing/head/softcap/security(src) new /obj/item/clothing/suit/storage/hazardvest/security(src) @@ -234,6 +239,7 @@ new /obj/item/storage/backpack/security(src) else new /obj/item/storage/backpack/satchel_sec(src) + new /obj/item/storage/backpack/duffel/sec(src) new /obj/item/clothing/suit/armor/carrier/officer(src) new /obj/item/clothing/accessory/arm_guard(src) new /obj/item/clothing/accessory/leg_guard(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 57beaf11a98..98e6dccf2f1 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -285,8 +285,9 @@ /obj/structure/closet/wardrobe/pharmacy_white/fill() ..() - new /obj/item/clothing/under/rank/medical/pharmacist(src) + new /obj/item/storage/backpack/duffel/pharm(src) new /obj/item/clothing/under/rank/medical/pharmacist/zeng(src) + new /obj/item/clothing/under/rank/medical/pharmacist(src) new /obj/item/clothing/under/rank/medical/pharmacist/pmc(src) new /obj/item/clothing/shoes/chemist(src) new /obj/item/clothing/shoes/chemist(src) diff --git a/html/changelogs/omicega-rfdsfoijdsfojidsfiosdfoij.yml b/html/changelogs/omicega-rfdsfoijdsfojidsfiosdfoij.yml new file mode 100644 index 00000000000..954a5d7189f --- /dev/null +++ b/html/changelogs/omicega-rfdsfoijdsfojidsfiosdfoij.yml @@ -0,0 +1,13 @@ +# Your name. +author: Omicega + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Adds departmental duffel bags to various departments' job lockers."