cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes department lockers less random (#12121)

Browse Source
This commit is contained in:
Casper3667
2021-07-03 21:50:01 +02:00
committed by GitHub
parent d265892c6c
commit cf6f9febd7
3 changed files with 29 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+3 -12
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+19 -50
View File
@@ -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"