From cf6f9febd778223758022ac19940a7515b3b8c4c Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Sat, 3 Jul 2021 21:50:01 +0200 Subject: [PATCH] Makes department lockers less random (#12121) --- .../closets/secure/engineering.dm | 15 +--- .../crates_lockers/closets/secure/security.dm | 69 +++++-------------- html/changelogs/LockerConsistency.yml | 7 ++ 3 files changed, 29 insertions(+), 62 deletions(-) create mode 100644 html/changelogs/LockerConsistency.yml 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 f09c1fd3a55..04e7c96a1d0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -13,10 +13,7 @@ new /obj/item/storage/backpack/industrial(src) else new /obj/item/storage/backpack/satchel_eng(src) - if (prob(70)) - new /obj/item/clothing/accessory/storage/brown_vest(src) - else - new /obj/item/clothing/accessory/storage/webbing(src) + new /obj/item/clothing/accessory/storage/brown_vest(src) new /obj/item/blueprints(src) new /obj/item/clothing/under/rank/chief_engineer(src) new /obj/item/clothing/head/hardhat/white(src) @@ -121,10 +118,7 @@ new /obj/item/storage/backpack/industrial(src) else new /obj/item/storage/backpack/satchel_eng(src) - if (prob(70)) - new /obj/item/clothing/accessory/storage/brown_vest(src) - else - new /obj/item/clothing/accessory/storage/webbing(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) new /obj/item/device/radio/headset/headset_eng/alt(src) @@ -149,10 +143,7 @@ new /obj/item/storage/backpack/industrial(src) else new /obj/item/storage/backpack/satchel_eng(src) - if (prob(70)) - new /obj/item/clothing/accessory/storage/brown_vest(src) - else - new /obj/item/clothing/accessory/storage/webbing(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) new /obj/item/device/flashlight(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 2b3c87f76ea..4960551c277 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -74,6 +74,7 @@ new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/suit/armor/carrier/generic(src) new /obj/item/clothing/head/helmet(src) + new /obj/item/clothing/accessory/holster/waist(src) //Tools new /obj/item/device/radio/headset/heads/hop(src) new /obj/item/device/radio/headset/heads/hop/alt(src) @@ -128,14 +129,9 @@ 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) - if(prob(50)) - new /obj/item/clothing/under/rank/head_of_security(src) - new /obj/item/clothing/head/beret/security/hos(src) - new /obj/item/clothing/head/hos(src) - else - new /obj/item/clothing/under/rank/head_of_security/corp(src) - new /obj/item/clothing/head/beret/security/hos/corp(src) - new /obj/item/clothing/head/hos/corp(src) + new /obj/item/clothing/under/rank/head_of_security/corp(src) + new /obj/item/clothing/head/beret/security/hos/corp(src) + new /obj/item/clothing/head/hos/corp(src) new /obj/item/clothing/head/helmet/hos(src) new /obj/item/clothing/suit/storage/security/hos(src) new /obj/item/clothing/accessory/badge/hos(src) @@ -182,14 +178,9 @@ 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) - if(prob(50)) // chance to spawn either corporate or regular outfit. to prevent locker bloat which makes it lag when right clicked - new /obj/item/clothing/under/rank/head_of_security(src) - new /obj/item/clothing/head/beret/security/hos(src) - new /obj/item/clothing/head/hos(src) - else - new /obj/item/clothing/under/rank/head_of_security/corp(src) - new /obj/item/clothing/head/beret/security/corp(src) - new /obj/item/clothing/head/hos/corp(src) + new /obj/item/clothing/under/rank/head_of_security/corp(src) + new /obj/item/clothing/head/beret/security/corp(src) + new /obj/item/clothing/head/hos/corp(src) new /obj/item/clothing/head/helmet/hos(src) new /obj/item/clothing/suit/storage/security/hos(src) //Tools @@ -225,17 +216,9 @@ 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) - if(prob(50)) - if(prob(50)) - new /obj/item/clothing/under/rank/warden(src) - else - new /obj/item/clothing/under/rank/warden/blue(src) - new /obj/item/clothing/head/beret/security/warden(src) - new /obj/item/clothing/head/warden(src) - else - new /obj/item/clothing/under/rank/warden/corp(src) - new /obj/item/clothing/head/beret/security/corp(src) - new /obj/item/clothing/head/warden/corp(src) + new /obj/item/clothing/under/rank/warden/corp(src) + new /obj/item/clothing/head/beret/security/corp(src) + new /obj/item/clothing/head/warden/corp(src) new /obj/item/clothing/head/helmet/security(src) new /obj/item/clothing/suit/storage/security/warden(src) new /obj/item/clothing/accessory/badge/warden(src) @@ -250,10 +233,8 @@ new /obj/item/melee/baton/loaded(src) new /obj/item/gun/energy/disruptorpistol(src) //Belts - if (prob(50)) - new /obj/item/clothing/accessory/storage/black_vest(src) - else - new /obj/item/clothing/accessory/storage/pouches/black(src) + new /obj/item/clothing/accessory/storage/black_vest(src) + new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/storage/belt/security(src) @@ -287,10 +268,7 @@ new /obj/item/device/holowarrant(src) new /obj/item/device/flashlight/flare/glowstick/red(src) //Belts - if (prob(50)) - new /obj/item/clothing/accessory/storage/black_vest(src) - else - new /obj/item/clothing/accessory/storage/pouches/black(src) + new /obj/item/clothing/accessory/storage/black_vest(src) new /obj/item/storage/belt/security(src) /obj/structure/closet/secure_closet/security @@ -312,17 +290,9 @@ 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) - if(prob(50)) - if(prob(50)) - new /obj/item/clothing/under/rank/security(src) - else - new /obj/item/clothing/under/rank/security/blue(src) - new /obj/item/clothing/head/beret/security/officer(src) - new /obj/item/clothing/head/softcap/security(src) - else - new /obj/item/clothing/under/rank/security/corp(src) - new /obj/item/clothing/head/beret/security/corp(src) - new /obj/item/clothing/head/softcap/security/corp(src) + new /obj/item/clothing/under/rank/security/corp(src) + new /obj/item/clothing/head/beret/security/corp(src) + new /obj/item/clothing/head/softcap/security/corp(src) new /obj/item/clothing/head/helmet/security(src) new /obj/item/clothing/suit/storage/security/officer(src) new /obj/item/clothing/accessory/badge/officer(src) @@ -343,10 +313,7 @@ new /obj/item/device/flashlight/flare/glowstick/red(src) new /obj/item/handcuffs(src) //Belts - if (prob(50)) - new /obj/item/clothing/accessory/storage/black_vest(src) - else - new /obj/item/clothing/accessory/storage/pouches/black(src) + new /obj/item/clothing/accessory/storage/black_vest(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/storage/belt/security(src) @@ -383,6 +350,7 @@ /obj/structure/closet/secure_closet/investigator/fill() //Appearance + new /obj/item/storage/backpack/satchel/leather(src) new /obj/item/clothing/suit/storage/det_jacket(src) new /obj/item/clothing/under/det(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) @@ -405,6 +373,7 @@ new /obj/item/device/camera_film(src) //Belts new /obj/item/clothing/accessory/holster/waist(src) + new /obj/item/clothing/accessory/storage/pouches/black(src) /obj/structure/closet/secure_closet/injection name = "lethal injections locker" diff --git a/html/changelogs/LockerConsistency.yml b/html/changelogs/LockerConsistency.yml new file mode 100644 index 00000000000..656cd62a509 --- /dev/null +++ b/html/changelogs/LockerConsistency.yml @@ -0,0 +1,7 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - tweak: "Engineering & security lockers have been tweaked to ensure their contents remain consistent instead of random. Bags remains random between satchel & backpack however." + - rscadd: "Investigator's locker now gets drop pouches and a bag to fit with the rest of security. Warden & HoP are now issued holsters with their weapons."