diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index e8e7bf3cdd2..5fde9d4af48 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -57413,19 +57413,6 @@
c_tag = "Gateway Access";
dir = 4
},
-/obj/structure/closet/medical_wall{
- pixel_x = -32
- },
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/bruise_pack/advanced,
-/obj/item/stack/medical/ointment,
-/obj/item/stack/medical/ointment/advanced,
-/obj/item/reagent_containers/glass/bottle/charcoal,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/syringe,
-/obj/item/storage/pill_bottle/painkillers,
-/obj/item/reagent_containers/food/pill/patch/styptic,
-/obj/item/reagent_containers/food/pill/patch/silver_sulf,
/turf/simulated/floor/plasteel,
/area/gateway)
"cys" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
index ff7aaa221dd..91b41acb6aa 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -515,9 +515,6 @@
"bm" = (
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
/area/derelict/crew_quarters)
-"bn" = (
-/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
-/area/derelict/arrival)
"bo" = (
/obj/structure/cable{
d2 = 4;
@@ -3752,11 +3749,6 @@
icon_state = "dark"
},
/area/derelict/crew_quarters)
-"hU" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/derelict/crew_quarters)
"hV" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -8002,7 +7994,6 @@
},
/area/derelict/crew_quarters)
"rn" = (
-/obj/structure/closet/medical_wall,
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
/area/derelict/arrival)
"ro" = (
@@ -9173,12 +9164,12 @@ ac
ac
ac
QN
-bn
+rn
jm
-bn
-bn
+rn
+rn
lu
-bn
+rn
QN
ac
ac
@@ -9264,14 +9255,14 @@ ac
ac
ac
ac
-bn
+rn
iS
jn
jS
kL
hY
lK
-bn
+rn
ac
ac
ac
@@ -9354,17 +9345,17 @@ ac
ac
ac
aW
-bn
-bn
-bn
+rn
+rn
+rn
iT
hY
jT
kM
lv
lL
-bn
-bn
+rn
+rn
aW
ac
ac
@@ -9442,10 +9433,10 @@ ac
ac
ac
aW
-bn
+rn
gJ
-bn
-bn
+rn
+rn
hI
hX
iv
@@ -9458,8 +9449,8 @@ hY
me
mu
mG
-bn
-bn
+rn
+rn
mG
aW
ac
@@ -9531,8 +9522,8 @@ ac
ac
ac
aW
-bn
-bn
+rn
+rn
dO
gq
gK
@@ -9549,12 +9540,12 @@ lw
hY
mf
mv
-bn
+rn
mR
ni
nw
mG
-bn
+rn
mG
aW
ac
@@ -9622,7 +9613,7 @@ ac
ac
ac
aW
-bn
+rn
ff
fA
dL
@@ -9712,16 +9703,16 @@ ac
ac
ac
aW
-bn
-bn
-bn
+rn
+rn
+rn
de
do
do
do
do
hb
-bn
+rn
hK
hY
ix
@@ -9905,7 +9896,7 @@ do
do
gM
hc
-bn
+rn
hM
ia
iz
@@ -9985,7 +9976,7 @@ ac
ac
ac
aW
-bn
+rn
dP
dV
dV
@@ -9997,19 +9988,19 @@ fY
do
gN
hd
-bn
-bn
-bn
-bn
-bn
+rn
+rn
+rn
+rn
+rn
jr
ka
kT
ly
-bn
-bn
-bn
-bn
+rn
+rn
+rn
+rn
mV
nm
mS
@@ -10075,9 +10066,9 @@ ac
ac
ac
aW
-bn
-bn
-bn
+rn
+rn
+rn
dQ
do
do
@@ -10088,21 +10079,21 @@ fE
fZ
gs
dO
-bn
+rn
aW
ac
ac
ac
aW
-bn
+rn
kb
-bn
-bn
+rn
+rn
aW
ac
ac
aW
-bn
+rn
mG
ny
nK
@@ -10166,7 +10157,7 @@ ac
ac
ac
aW
-bn
+rn
dm
dA
dL
@@ -10174,10 +10165,10 @@ do
do
do
eo
-bn
+rn
fh
fF
-bn
+rn
fG
aW
ac
@@ -10257,7 +10248,7 @@ ac
ac
ac
aW
-bn
+rn
dd
dn
do
@@ -10266,8 +10257,8 @@ do
do
ee
ep
-bn
-bn
+rn
+rn
fG
aW
ac
@@ -10348,7 +10339,7 @@ ac
ac
ac
aW
-bn
+rn
cL
de
do
@@ -10358,7 +10349,7 @@ do
do
ef
eq
-bn
+rn
aW
ac
ac
@@ -10439,9 +10430,9 @@ ac
ac
ac
aW
-bn
-bn
-bn
+rn
+rn
+rn
df
dp
dB
@@ -10530,10 +10521,10 @@ ac
ac
ac
ac
-bn
+rn
cl
cz
-bn
+rn
de
dq
dC
@@ -10721,7 +10712,7 @@ cN
cB
dr
dE
-bn
+rn
dS
ac
ac
@@ -10804,7 +10795,7 @@ ac
ac
ac
ac
-bn
+rn
bF
bT
co
@@ -10812,7 +10803,7 @@ cA
cM
dg
ds
-bn
+rn
aW
ac
ac
@@ -10858,7 +10849,7 @@ mS
qC
mU
qY
-bn
+rn
ac
ac
ac
@@ -10896,12 +10887,12 @@ ac
ac
ac
aW
-bn
+rn
bG
bU
cp
cC
-bn
+rn
dh
dt
dF
@@ -10942,7 +10933,7 @@ ac
ac
ac
ag
-bn
+rn
pT
mU
mU
@@ -11035,15 +11026,15 @@ aj
ac
ag
aW
-bn
-bn
+rn
+rn
qh
qs
qD
qL
-bn
+rn
ro
-bn
+rn
aW
ac
ac
@@ -11128,7 +11119,7 @@ ag
ag
ag
aW
-bn
+rn
qi
qt
ka
@@ -11136,7 +11127,7 @@ hY
ra
qy
rw
-bn
+rn
ac
ac
ac
@@ -11505,7 +11496,7 @@ re
qM
hY
qw
-bn
+rn
aW
ac
ac
@@ -11598,7 +11589,7 @@ hY
hY
qy
rJ
-bn
+rn
ac
ac
ac
@@ -11683,7 +11674,7 @@ ac
ac
ac
aW
-bn
+rn
qN
rf
hY
@@ -11966,7 +11957,7 @@ hY
hY
rk
rN
-bn
+rn
ac
ac
ac
@@ -12059,7 +12050,7 @@ rq
hY
rO
rZ
-bn
+rn
aW
ac
ac
@@ -12142,7 +12133,7 @@ if
if
if
if
-bn
+rn
qy
qR
ri
@@ -12242,9 +12233,9 @@ rs
rz
qu
rQ
-bn
-bn
-bn
+rn
+rn
+rn
sh
ac
kJ
@@ -12326,7 +12317,7 @@ if
if
if
if
-bn
+rn
qw
qS
rk
@@ -12419,7 +12410,7 @@ ac
ac
ac
aW
-bn
+rn
qv
hY
ru
@@ -12427,7 +12418,7 @@ ru
hY
rS
rZ
-bn
+rn
aW
ac
ac
@@ -12518,7 +12509,7 @@ hY
hY
rk
rT
-bn
+rn
ac
ac
ac
@@ -12787,7 +12778,7 @@ ac
ac
ac
aW
-bn
+rn
qN
qt
hY
@@ -12886,7 +12877,7 @@ hY
hY
qy
rX
-bn
+rn
ac
ac
ac
@@ -12977,7 +12968,7 @@ hY
hY
hY
rG
-bn
+rn
aW
ac
ac
@@ -13336,7 +13327,7 @@ ac
ag
ag
aW
-bn
+rn
qm
qz
jn
@@ -13344,7 +13335,7 @@ hY
rl
rv
rD
-bn
+rn
ac
ac
ac
@@ -14690,16 +14681,16 @@ go
gV
hn
aV
-hU
-hU
+pC
+pC
hT
jf
-hU
+pC
kC
ll
-hU
-hU
-hU
+pC
+pC
+pC
hT
bm
ng
@@ -14783,16 +14774,16 @@ gW
gH
hH
hT
-hU
+pC
iL
eD
jI
kD
lm
eD
-hU
-hU
-hU
+pC
+pC
+pC
mQ
ng
ng
diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
index 80ddcf91249..a75145a548f 100644
--- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
@@ -2091,19 +2091,8 @@
name = "Syndicate Outpost"
})
"dr" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective_locked";
- name = "personal closet";
- req_access_txt = "150"
- },
-/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
+/obj/structure/closet/cabinet,
/obj/item/suppressor,
/turf/simulated/floor/plasteel/airless{
dir = 8;
@@ -2114,18 +2103,7 @@
name = "Syndicate Outpost"
})
"ds" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "150"
- },
+/obj/structure/closet/cabinet,
/obj/item/stack/spacecash/c50,
/turf/simulated/floor/wood,
/area/awaycontent/a4{
@@ -3954,16 +3932,6 @@
/turf/simulated/floor/plating,
/area/awaycontent/a7)
"gj" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secbroken";
- icon_closed = "sec";
- icon_locked = "sec1";
- icon_off = "secoff";
- icon_opened = "secopen";
- icon_state = "sec1";
- name = "security officer's locker";
- req_access_txt = "271"
- },
/obj/item/clothing/suit/armor/vest,
/obj/item/reagent_containers/spray/pepper,
/obj/item/grenade/flashbang,
@@ -3977,6 +3945,7 @@
pixel_y = 23;
req_access = null
},
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -5142,18 +5111,8 @@
name = "MO19 Arrivals"
})
"hX" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secureresbroken";
- icon_closed = "secureres";
- icon_locked = "secureres1";
- icon_off = "secureresoff";
- icon_opened = "secureresopen";
- icon_state = "secureres";
- locked = 0;
- name = "scientist's locker";
- req_access_txt = "271"
- },
/obj/item/clothing/suit/storage/labcoat,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel,
/area/awaycontent/a2{
name = "MO19 Research"
@@ -5392,20 +5351,11 @@
})
"iq" = (
/obj/structure/window/reinforced,
-/obj/structure/closet/secure_closet{
- icon_broken = "secureresbroken";
- icon_closed = "secureres";
- icon_locked = "secureres1";
- icon_off = "secureresoff";
- icon_opened = "secureresopen";
- icon_state = "secureres1";
- name = "scientist's locker";
- req_access_txt = "271"
- },
/obj/item/clothing/suit/storage/labcoat,
/obj/item/tank/internals/air,
/obj/item/clothing/mask/gas,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel,
/area/awaycontent/a2{
name = "MO19 Research"
@@ -5961,18 +5911,9 @@
name = "MO19 Arrivals"
})
"jr" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "rdsecurebroken";
- icon_closed = "rdsecure";
- icon_locked = "rdsecure1";
- icon_off = "rdsecureoff";
- icon_opened = "rdsecureopen";
- icon_state = "rdsecure1";
- name = "research director's locker";
- req_access_txt = "271"
- },
/obj/item/storage/backpack/satchel_tox,
/obj/item/clothing/gloves/color/latex,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -8696,18 +8637,7 @@
name = "MO19 Arrivals"
})
"oA" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/obj/item/clothing/under/suit_jacket/navy,
/turf/simulated/floor/carpet,
/area/awaycontent/a1{
@@ -8817,21 +8747,11 @@
name = "MO19 Arrivals"
})
"oK" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "fridgebroken";
- icon_closed = "fridge";
- icon_locked = "fridge1";
- icon_off = "fridgeoff";
- icon_opened = "fridgeopen";
- icon_state = "fridge";
- locked = 0;
- name = "meat fridge";
- req_access_txt = "271"
- },
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/meat/monkey,
+/obj/structure/closet/secure_closet/freezer/meat,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor";
temperature = 273.15
@@ -8841,7 +8761,6 @@
})
"oL" = (
/obj/structure/closet/secure_closet{
- icon_state = "secure";
locked = 0;
name = "kitchen Cabinet";
req_access_txt = "271"
@@ -8858,21 +8777,11 @@
name = "MO19 Arrivals"
})
"oM" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "fridgebroken";
- icon_closed = "fridge";
- icon_locked = "fridge1";
- icon_off = "fridgeoff";
- icon_opened = "fridgeopen";
- icon_state = "fridge";
- locked = 0;
- name = "refrigerator";
- req_access_txt = "271"
- },
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/storage/fancy/egg_box,
+/obj/structure/closet/secure_closet/freezer/fridge,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor";
temperature = 273.15
@@ -8981,18 +8890,7 @@
name = "MO19 Arrivals"
})
"oZ" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/obj/item/clothing/under/assistantformal,
/turf/simulated/floor/carpet,
/area/awaycontent/a1{
@@ -9015,18 +8913,7 @@
name = "MO19 Arrivals"
})
"pg" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/obj/item/clothing/under/suit_jacket/burgundy,
/turf/simulated/floor/carpet,
/area/awaycontent/a1{
diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm
index 837cabbf460..0ed650145fe 100644
--- a/_maps/map_files/RandomZLevels/terrorspiders.dmm
+++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm
@@ -196,18 +196,7 @@
/turf/simulated/floor/carpet,
/area/awaymission/UO71/plaza)
"aF" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/obj/item/clothing/under/suit_jacket/female,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/plaza)
@@ -420,18 +409,7 @@
/turf/simulated/floor/carpet,
/area/awaymission/UO71/plaza)
"bh" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/plaza)
"bi" = (
@@ -752,18 +730,7 @@
/area/awaymission/UO71/plaza)
"ci" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/obj/item/clothing/under/pj/blue,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/plaza)
@@ -1217,17 +1184,7 @@
},
/area/awaymission/UO71/plaza)
"ds" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "hydrosecurebroken";
- icon_closed = "hydrosecure";
- icon_locked = "hydrosecure1";
- icon_off = "hydrosecureoff";
- icon_opened = "hydrosecureopen";
- icon_state = "hydrosecure";
- locked = 0;
- name = "botanist's locker";
- req_access_txt = "271"
- },
+/obj/structure/closet/secure_closet,
/obj/item/plant_analyzer,
/obj/item/clothing/mask/bandana,
/obj/item/hatchet,
@@ -1257,16 +1214,7 @@
},
/area/awaymission/UO71/plaza)
"dw" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secbroken";
- icon_closed = "sec";
- icon_locked = "sec1";
- icon_off = "secoff";
- icon_opened = "secopen";
- icon_state = "sec1";
- name = "security officer's locker";
- req_access_txt = "271"
- },
+/obj/structure/closet/secure_closet,
/obj/item/storage/belt/security,
/obj/item/flash,
/obj/effect/decal/cleanable/dirt,
@@ -1372,17 +1320,7 @@
},
/area/awaymission/UO71/plaza)
"dK" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "hydrosecurebroken";
- icon_closed = "hydrosecure";
- icon_locked = "hydrosecure1";
- icon_off = "hydrosecureoff";
- icon_opened = "hydrosecureopen";
- icon_state = "hydrosecure";
- locked = 0;
- name = "botanist's locker";
- req_access_txt = "271"
- },
+/obj/structure/closet/secure_closet,
/obj/item/clothing/suit/apron,
/obj/item/clothing/mask/bandana,
/turf/simulated/floor/plasteel{
@@ -2200,17 +2138,7 @@
},
/area/awaymission/UO71/centralhall)
"fH" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "fridgebroken";
- icon_closed = "fridge";
- icon_locked = "fridge1";
- icon_off = "fridgeoff";
- icon_opened = "fridgeopen";
- icon_state = "fridge";
- locked = 0;
- name = "meat fridge";
- req_access_txt = "271"
- },
+/obj/structure/closet/secure_closet/freezer/meat,
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/meat/monkey,
@@ -3316,17 +3244,7 @@
},
/area/awaymission/UO71/centralhall)
"ir" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "fridgebroken";
- icon_closed = "fridge";
- icon_locked = "fridge1";
- icon_off = "fridgeoff";
- icon_opened = "fridgeopen";
- icon_state = "fridge";
- locked = 0;
- name = "refrigerator";
- req_access_txt = "271"
- },
+/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/milk,
@@ -3524,7 +3442,6 @@
/area/awaymission/UO71/centralhall)
"iX" = (
/obj/structure/closet/secure_closet{
- icon_state = "secure";
locked = 0;
name = "kitchen Cabinet";
req_access_txt = "271"
@@ -5271,18 +5188,7 @@
/turf/simulated/floor/carpet,
/area/awaymission/UO71/centralhall)
"mF" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/obj/item/clothing/under/pj/red,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/centralhall)
@@ -5464,16 +5370,7 @@
/turf/simulated/floor/plating,
/area/awaymission/UO71/science)
"mX" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "rdsecurebroken";
- icon_closed = "rdsecure";
- icon_locked = "rdsecure1";
- icon_off = "rdsecureoff";
- icon_opened = "rdsecureopen";
- icon_state = "rdsecure1";
- name = "research director's locker";
- req_access_txt = "271"
- },
+/obj/structure/closet/secure_closet,
/obj/item/storage/backpack/satchel_tox,
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/suit/storage/labcoat/science,
@@ -5589,18 +5486,7 @@
/turf/simulated/floor/carpet,
/area/awaymission/UO71/centralhall)
"nj" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/obj/item/clothing/under/suit_jacket/navy,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/centralhall)
@@ -6700,16 +6586,7 @@
},
/area/awaymission/UO71/science)
"pb" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secbroken";
- icon_closed = "sec";
- icon_locked = "sec1";
- icon_off = "secoff";
- icon_opened = "secopen";
- icon_state = "sec1";
- name = "security officer's locker";
- req_access_txt = "271"
- },
+/obj/structure/closet/secure_closet,
/obj/item/flash,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
@@ -7644,15 +7521,8 @@
},
/area/awaymission/UO71/eng)
"qY" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secureengbroken";
- icon_closed = "secureeng";
- icon_locked = "secureeng1";
- icon_off = "secureengoff";
- icon_opened = "secureengopen";
- icon_state = "secureeng1";
- name = "engineer's locker";
- req_access_txt = "271"
+/obj/structure/closet/secure_closet/engineering_personal{
+ req_access = list(271)
},
/obj/structure/window/reinforced{
dir = 8
@@ -9557,16 +9427,7 @@
pixel_y = 6;
req_access_txt = "271"
},
-/obj/structure/closet/secure_closet{
- icon_broken = "secbroken";
- icon_closed = "sec";
- icon_locked = "sec1";
- icon_off = "secoff";
- icon_opened = "secopen";
- icon_state = "sec1";
- name = "security officer's locker";
- req_access_txt = "271"
- },
+/obj/structure/closet/secure_closet,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet,
/turf/simulated/floor/plasteel{
@@ -10743,18 +10604,7 @@
/turf/simulated/floor/carpet,
/area/awaymission/UO71/mining)
"xj" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/mining)
"xk" = (
@@ -11063,18 +10913,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/mining)
"xQ" = (
@@ -11091,15 +10930,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/closet/secure_closet/engineering_personal{
- icon_broken = "miningsecbroken";
- icon_closed = "miningsec";
- icon_locked = "miningsec1";
- icon_off = "miningsecoff";
- icon_opened = "miningsecopen";
- icon_state = "miningsec";
- locked = 0;
- name = "miner's equipment";
+/obj/structure/closet/secure_closet/miner{
req_access = list(271)
},
/obj/item/storage/backpack/satchel_eng,
@@ -11689,18 +11520,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/UO71/queen)
"zn" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "271"
- },
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaymission/UO71/loot)
"zo" = (
diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
index 200307625ab..831bfe6552d 100644
--- a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
@@ -192,8 +192,8 @@
name = "UO45 Central Hall"
})
"aE" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -258,11 +258,11 @@
name = "UO45 Central Hall"
})
"aL" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
/obj/structure/sign/poster/official/safety_internals{
pixel_x = -32
},
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -1082,8 +1082,8 @@
name = "UO45 Central Hall"
})
"cw" = (
-/obj/structure/closet,
/obj/item/storage/box/lights/mixed,
+/obj/structure/closet,
/turf/simulated/floor/plating,
/area/awaycontent/a1{
name = "UO45 Central Hall"
@@ -1119,19 +1119,8 @@
})
"cz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "201"
- },
/obj/item/clothing/under/pj/blue,
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaycontent/a1{
name = "UO45 Central Hall"
@@ -1141,19 +1130,8 @@
dir = 8;
initialize_directions = 7
},
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "201"
- },
/obj/item/clothing/under/suit_jacket/female,
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaycontent/a1{
name = "UO45 Central Hall"
@@ -1196,8 +1174,8 @@
name = "UO45 Central Hall"
})
"cE" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/awaycontent/a1{
name = "UO45 Central Hall"
@@ -1434,8 +1412,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/structure/closet,
/obj/item/poster/random_contraband,
+/obj/structure/closet,
/turf/simulated/floor/plating,
/area/awaycontent/a1{
name = "UO45 Central Hall"
@@ -1801,20 +1779,10 @@
name = "UO45 Central Hall"
})
"dM" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "hydrosecurebroken";
- icon_closed = "hydrosecure";
- icon_locked = "hydrosecure1";
- icon_off = "hydrosecureoff";
- icon_opened = "hydrosecureopen";
- icon_state = "hydrosecure";
- locked = 0;
- name = "botanist's locker";
- req_access_txt = "201"
- },
/obj/item/plant_analyzer,
/obj/item/clothing/mask/bandana,
/obj/item/hatchet,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "vault"
@@ -1861,19 +1829,10 @@
name = "UO45 Central Hall"
})
"dQ" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secbroken";
- icon_closed = "sec";
- icon_locked = "sec1";
- icon_off = "secoff";
- icon_opened = "secopen";
- icon_state = "sec1";
- name = "security officer's locker";
- req_access_txt = "201"
- },
/obj/item/storage/belt/security,
/obj/item/flash,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
@@ -2009,20 +1968,10 @@
name = "UO45 Central Hall"
})
"ee" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "hydrosecurebroken";
- icon_closed = "hydrosecure";
- icon_locked = "hydrosecure1";
- icon_off = "hydrosecureoff";
- icon_opened = "hydrosecureopen";
- icon_state = "hydrosecure";
- locked = 0;
- name = "botanist's locker";
- req_access_txt = "201"
- },
/obj/item/clothing/suit/apron,
/obj/item/clothing/mask/bandana,
/obj/item/cultivator,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "vault"
@@ -2475,7 +2424,6 @@
name = "UO45 Central Hall"
})
"eW" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
@@ -2749,11 +2697,11 @@
name = "UO45 Central Hall"
})
"fu" = (
-/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
/obj/item/wrench,
/obj/item/screwdriver,
/obj/item/reagent_containers/glass/bucket,
+/obj/structure/closet/crate/hydroponics,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -3211,13 +3159,13 @@
name = "UO45 Crew Quarters"
})
"gn" = (
+/obj/item/storage/box/mousetraps,
+/obj/item/clothing/under/waiter,
+/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate{
desc = "It's a storage unit for kitchen clothes and equipment.";
name = "Kitchen Crate"
},
-/obj/item/storage/box/mousetraps,
-/obj/item/clothing/under/waiter,
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -3225,21 +3173,11 @@
name = "UO45 Crew Quarters"
})
"go" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "fridgebroken";
- icon_closed = "fridge";
- icon_locked = "fridge1";
- icon_off = "fridgeoff";
- icon_opened = "fridgeopen";
- icon_state = "fridge";
- locked = 0;
- name = "meat fridge";
- req_access_txt = "201"
- },
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/meat/monkey,
/obj/item/reagent_containers/food/snacks/meat/monkey,
+/obj/structure/closet/secure_closet/freezer/meat,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -3867,12 +3805,12 @@
name = "UO45 Gateway"
})
"hz" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
/obj/structure/sign/poster/official/safety_internals{
pixel_y = 32
},
/obj/effect/landmark/burnturf,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel,
/area/awaycontent/a2{
name = "UO45 Crew Quarters"
@@ -4229,8 +4167,8 @@
name = "UO45 Gateway"
})
"if" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/awaycontent/a6{
name = "UO45 Gateway"
@@ -4569,22 +4507,12 @@
name = "UO45 Crew Quarters"
})
"iM" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "fridgebroken";
- icon_closed = "fridge";
- icon_locked = "fridge1";
- icon_off = "fridgeoff";
- icon_opened = "fridgeopen";
- icon_state = "fridge";
- locked = 0;
- name = "refrigerator";
- req_access_txt = "201"
- },
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/storage/fancy/egg_box,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/freezer/fridge,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -4611,9 +4539,9 @@
name = "UO45 Central Hall"
})
"iO" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
/obj/effect/landmark/damageturf,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/awaycontent/a1{
name = "UO45 Central Hall"
@@ -4664,8 +4592,8 @@
name = "UO45 Gateway"
})
"iT" = (
-/obj/structure/closet/l3closet/scientist,
/obj/effect/decal/warning_stripes/north,
+/obj/structure/closet/l3closet/scientist,
/turf/simulated/floor/plasteel,
/area/awaycontent/a6{
name = "UO45 Gateway"
@@ -4821,16 +4749,15 @@
name = "UO45 Crew Quarters"
})
"jg" = (
-/obj/structure/closet/secure_closet{
- icon_state = "secure";
- locked = 0;
- name = "kitchen Cabinet";
- req_access_txt = "201"
- },
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet{
+ locked = 0;
+ name = "kitchen Cabinet";
+ req_access_txt = "271"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -4849,8 +4776,8 @@
name = "UO45 Gateway"
})
"ji" = (
-/obj/structure/closet/l3closet/scientist,
/obj/effect/decal/warning_stripes/northeast,
+/obj/structure/closet/l3closet/scientist,
/turf/simulated/floor/plasteel,
/area/awaycontent/a6{
name = "UO45 Gateway"
@@ -5091,17 +5018,6 @@
name = "UO45 Central Hall"
})
"jG" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secureresbroken";
- icon_closed = "secureres";
- icon_locked = "secureres1";
- icon_off = "secureresoff";
- icon_opened = "secureresopen";
- icon_state = "secureres";
- locked = 0;
- name = "scientist's locker";
- req_access_txt = "201"
- },
/obj/item/tank/internals/air,
/obj/item/clothing/mask/gas,
/obj/effect/decal/cleanable/dirt,
@@ -5115,17 +5031,6 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/structure/closet/secure_closet{
- icon_broken = "secureresbroken";
- icon_closed = "secureres";
- icon_locked = "secureres1";
- icon_off = "secureresoff";
- icon_opened = "secureresopen";
- icon_state = "secureres";
- locked = 0;
- name = "scientist's locker";
- req_access_txt = "201"
- },
/obj/item/clothing/gloves/color/latex,
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -5629,13 +5534,13 @@
name = "UO45 Research"
})
"kx" = (
-/obj/structure/closet/crate,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
pixel_y = -1
},
/obj/item/multitool,
+/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/awaycontent/a1{
name = "UO45 Central Hall"
@@ -6729,7 +6634,6 @@
name = "UO45 Engineering"
})
"lZ" = (
-/obj/structure/closet/crate,
/obj/item/stack/sheet/mineral/plasma{
amount = 26
},
@@ -6742,6 +6646,7 @@
maxcharge = 15000
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/awaycontent/a3{
name = "UO45 Engineering"
@@ -6876,12 +6781,12 @@
name = "UO45 Research"
})
"mm" = (
-/obj/structure/closet/firecloset,
/obj/machinery/light/small,
/obj/structure/sign/securearea{
pixel_y = -32
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/firecloset,
/turf/simulated/floor/plasteel{
icon_state = "warnwhite"
},
@@ -6987,19 +6892,8 @@
name = "UO45 Crew Quarters"
})
"mw" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "201"
- },
/obj/item/clothing/under/pj/red,
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaycontent/a2{
name = "UO45 Crew Quarters"
@@ -7051,7 +6945,6 @@
name = "UO45 Engineering"
})
"mB" = (
-/obj/structure/closet/crate,
/obj/item/stack/sheet/metal{
amount = 50
},
@@ -7061,6 +6954,7 @@
/obj/item/stack/rods{
amount = 50
},
+/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/awaycontent/a3{
name = "UO45 Engineering"
@@ -7135,20 +7029,11 @@
name = "UO45 Gateway"
})
"mI" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "rdsecurebroken";
- icon_closed = "rdsecure";
- icon_locked = "rdsecure1";
- icon_off = "rdsecureoff";
- icon_opened = "rdsecureopen";
- icon_state = "rdsecure1";
- name = "research director's locker";
- req_access_txt = "201"
- },
/obj/item/storage/backpack/satchel_tox,
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/suit/storage/labcoat/science,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -7334,19 +7219,8 @@
name = "UO45 Crew Quarters"
})
"mZ" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "201"
- },
/obj/item/clothing/under/suit_jacket/navy,
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaycontent/a2{
name = "UO45 Crew Quarters"
@@ -7657,6 +7531,7 @@
})
"nz" = (
/obj/machinery/vending/coffee,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -8474,6 +8349,7 @@
pixel_x = -30
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -8893,16 +8769,6 @@
name = "UO45 Research"
})
"pi" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secbroken";
- icon_closed = "sec";
- icon_locked = "sec1";
- icon_off = "secoff";
- icon_opened = "secopen";
- icon_state = "sec1";
- name = "security officer's locker";
- req_access_txt = "201"
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/restraints/handcuffs,
/obj/item/flash,
@@ -9369,7 +9235,6 @@
name = "UO45 Engineering"
})
"qa" = (
-/obj/structure/closet/crate,
/obj/item/storage/box/lights/mixed,
/obj/item/poster/random_contraband,
/obj/effect/decal/cleanable/dirt,
@@ -9553,6 +9418,7 @@
})
"qq" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/l3closet/general,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitehall"
@@ -9729,13 +9595,13 @@
dir = 4;
layer = 2.9
},
-/obj/structure/closet/secure_closet/engineering_personal{
- req_access = list(201)
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
+/obj/structure/closet/secure_closet/engineering_personal{
+ req_access = list(271)
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellow"
@@ -9759,16 +9625,6 @@
name = "UO45 Engineering"
})
"qH" = (
-/obj/structure/closet/secure_closet{
- icon_broken = "secureengbroken";
- icon_closed = "secureeng";
- icon_locked = "secureeng1";
- icon_off = "secureengoff";
- icon_opened = "secureengopen";
- icon_state = "secureeng1";
- name = "engineer's locker";
- req_access_txt = "201"
- },
/obj/structure/window/reinforced{
dir = 8
},
@@ -9779,6 +9635,9 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
+/obj/structure/closet/secure_closet/engineering_personal{
+ req_access = list(271)
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellow"
@@ -10989,7 +10848,6 @@
name = "UO45 Engineering"
})
"sr" = (
-/obj/structure/closet/l3closet/general,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -11045,7 +10903,6 @@
name = "UO45 Research"
})
"sw" = (
-/obj/structure/closet/l3closet/general,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -11355,9 +11212,9 @@
name = "UO45 Engineering"
})
"sU" = (
-/obj/structure/closet,
/obj/item/storage/belt/utility,
/obj/effect/landmark/burnturf,
+/obj/structure/closet,
/turf/simulated/floor/plating,
/area/awaycontent/a2{
name = "UO45 Crew Quarters"
@@ -11447,7 +11304,6 @@
name = "UO45 Engineering"
})
"te" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
@@ -11733,7 +11589,6 @@
name = "UO45 Engineering"
})
"tA" = (
-/obj/structure/closet/firecloset,
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plating,
/area/awaycontent/a5{
@@ -12057,18 +11912,9 @@
pixel_y = 6;
req_access_txt = "201"
},
-/obj/structure/closet/secure_closet{
- icon_broken = "secbroken";
- icon_closed = "sec";
- icon_locked = "sec1";
- icon_off = "secoff";
- icon_opened = "secopen";
- icon_state = "sec1";
- name = "security officer's locker";
- req_access_txt = "201"
- },
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet,
+/obj/structure/closet/secure_closet,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
@@ -12256,6 +12102,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/west,
+/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
/area/awaycontent/a5{
name = "UO45 Research"
@@ -12666,22 +12513,22 @@
name = "UO45 Engineering"
})
"vc" = (
-/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel,
/area/awaycontent/a3{
name = "UO45 Engineering"
})
"vd" = (
-/obj/structure/closet/firecloset,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/closet/firecloset,
/turf/simulated/floor/plasteel,
/area/awaycontent/a3{
name = "UO45 Engineering"
@@ -12739,11 +12586,11 @@
name = "UO45 Engineering"
})
"vi" = (
-/obj/structure/closet/firecloset,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/closet/firecloset,
/turf/simulated/floor/plasteel,
/area/awaycontent/a3{
name = "UO45 Engineering"
@@ -13138,10 +12985,10 @@
dir = 1;
pixel_y = -24
},
-/obj/structure/closet/secure_closet/miner{
- req_access = list(201)
- },
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/miner{
+ req_access = list(271)
+ },
/turf/simulated/floor/plasteel,
/area/awaycontent/a4{
name = "UO45 Mining"
@@ -13428,18 +13275,7 @@
name = "UO45 Mining"
})
"wq" = (
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "201"
- },
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaycontent/a4{
name = "UO45 Mining"
@@ -13806,19 +13642,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/closet/secure_closet/engineering_personal{
- icon_broken = "miningsecbroken";
- icon_closed = "miningsec";
- icon_locked = "miningsec1";
- icon_off = "miningsecoff";
- icon_opened = "miningsecopen";
- icon_state = "miningsec";
- locked = 0;
- name = "miner's equipment";
- req_access = list(201)
- },
/obj/item/storage/backpack/satchel_eng,
/obj/item/clothing/gloves/fingerless,
+/obj/structure/closet/secure_closet/miner{
+ req_access = list(271)
+ },
/turf/simulated/floor/plasteel{
icon_state = "browncorner"
},
@@ -13848,18 +13676,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/structure/closet/secure_closet{
- desc = "It's a secure locker for personnel. The first card swiped gains control.";
- icon_broken = "cabinetdetective_broken";
- icon_closed = "cabinetdetective";
- icon_locked = "cabinetdetective_locked";
- icon_off = "cabinetdetective_broken";
- icon_opened = "cabinetdetective_open";
- icon_state = "cabinetdetective";
- locked = 0;
- name = "personal closet";
- req_access_txt = "201"
- },
+/obj/structure/closet/cabinet,
/turf/simulated/floor/carpet,
/area/awaycontent/a4{
name = "UO45 Mining"
@@ -14045,7 +13862,6 @@
dir = 4;
initialize_directions = 11
},
-/obj/structure/closet/crate,
/obj/item/stack/sheet/metal{
amount = 26
},
@@ -14053,6 +13869,7 @@
amount = 19
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
/turf/simulated/floor/plasteel,
/area/awaycontent/a4{
name = "UO45 Mining"
@@ -14091,7 +13908,6 @@
dir = 4;
pixel_x = 24
},
-/obj/structure/closet/crate,
/obj/item/stack/sheet/mineral/plasma{
amount = 6
},
@@ -14148,17 +13964,15 @@
name = "UO45 Mining"
})
"xv" = (
-/obj/machinery/alarm/monitor{
- dir = 4;
- locked = 0;
- pixel_x = -23;
- req_access = null
- },
-/obj/structure/closet/emcloset,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/awaycontent/a4{
- name = "UO45 Mining"
+/obj/structure/closet/cabinet,
+/turf/simulated/mineral/random/labormineral,
+/area/awaycontent/a7{
+ always_unpowered = 1;
+ name = "UO45 Caves";
+ power_environ = 0;
+ power_equip = 0;
+ power_light = 0;
+ poweralm = 0
})
"xw" = (
/obj/structure/table,
@@ -14512,15 +14326,10 @@
poweralm = 0
})
"yn" = (
-/obj/structure/closet/crate,
-/turf/simulated/floor/plating/asteroid/airless,
-/area/awaycontent/a7{
- always_unpowered = 1;
- name = "UO45 Caves";
- power_environ = 0;
- power_equip = 0;
- power_light = 0;
- poweralm = 0
+/obj/structure/closet/emcloset,
+/turf/simulated/wall/r_wall/rust,
+/area/awaycontent/a4{
+ name = "UO45 Mining"
})
"yo" = (
/obj/structure/alien/weeds{
@@ -24626,11 +24435,11 @@ aB
aB
aC
aC
+xv
ac
ac
ac
-ac
-ac
+xv
ac
ac
bQ
@@ -25901,7 +25710,7 @@ yl
fo
fo
fo
-yn
+fo
ac
ac
ac
@@ -26044,7 +25853,7 @@ xG
xO
xn
wx
-xv
+vy
xB
wx
ev
@@ -26496,7 +26305,7 @@ vJ
vJ
vJ
vJ
-vJ
+yn
yl
fo
fo
@@ -29954,7 +29763,7 @@ ac
ac
ac
ac
-ac
+xv
ac
ac
ac
diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm
index 5d887935865..4899ae47dce 100644
--- a/code/game/area/ss13_areas.dm
+++ b/code/game/area/ss13_areas.dm
@@ -1371,8 +1371,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/brig/prison_break()
for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
- temp_closet.locked = 0
- temp_closet.icon_state = temp_closet.icon_closed
+ temp_closet.locked = FALSE
+ temp_closet.close()
for(var/obj/machinery/door_timer/temp_timer in src)
temp_timer.releasetime = 1
..()
@@ -1391,7 +1391,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/prison/prison_break()
for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
temp_closet.locked = 0
- temp_closet.icon_state = temp_closet.icon_closed
+ temp_closet.close()
+ temp_closet.update_icon()
for(var/obj/machinery/door_timer/temp_timer in src)
temp_timer.releasetime = 1
..()
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index da050eb644c..ba2f836507a 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -206,8 +206,9 @@
continue
if(C.opened && !C.close())
continue
- C.locked = 1
- C.icon_state = C.icon_locked
+ C.locked = TRUE
+ C.close()
+ C.update_icon()
for(var/obj/machinery/treadmill_monitor/T in targets)
T.total_joules = 0
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index 2e91f668265..31c23ba3b52 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -232,12 +232,8 @@
/obj/structure/closet/secure_closet/random_drinks
name = "unlabelled booze closet"
req_access = list(ACCESS_BAR)
- icon_state = "cabinetdetective_locked"
- icon_closed = "cabinetdetective"
- icon_locked = "cabinetdetective_locked"
- icon_opened = "cabinetdetective_open"
- icon_broken = "cabinetdetective_broken"
- icon_off = "cabinetdetective_broken"
+ icon_state = "cabinet"
+ open_door_sprite = "cabient_door"
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 49e9b4e2f48..c055d66b540 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -2,19 +2,20 @@
name = "closet"
desc = "It's a basic storage unit."
icon = 'icons/obj/closet.dmi'
- icon_state = "closed"
- density = 1
+ icon_state = "generic"
+ density = TRUE
max_integrity = 200
integrity_failure = 50
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 60)
- var/icon_closed = "closed"
- var/icon_opened = "open"
+ var/icon_closed
+ var/icon_opened
+ var/open_door_sprite = "generic_door"
var/opened = FALSE
var/welded = FALSE
var/locked = FALSE
var/large = TRUE
var/can_be_emaged = FALSE
- var/wall_mounted = 0 //never solid (You can always pass over it)
+ var/wall_mounted //never solid (You can always pass over it)
var/lastbang
var/open_sound = 'sound/machines/closet_open.ogg'
var/close_sound = 'sound/machines/closet_close.ogg'
@@ -27,6 +28,9 @@
// Please dont override this unless you absolutely have to
/obj/structure/closet/Initialize(mapload)
. = ..()
+ icon_closed = "[icon_state]"
+ if(!icon_opened)
+ icon_opened = "[icon_state]_open"
if(mapload && !opened)
// Youre probably asking, why is this a 0 seconds timer AA?
// Well, I will tell you. One day, all /obj/effect/spawner will use Initialize
@@ -34,8 +38,8 @@
// the loot will just be in a pile. Adding a timer with 0 delay will cause it to only take in contents once the MC has loaded,
// therefore solving the issue on mapload. During rounds, everything will happen as normal
addtimer(CALLBACK(src, .proc/take_contents), 0)
- update_icon() // Set it to the right icon if needed
populate_contents() // Spawn all its stuff
+ update_icon() // Set it to the right icon if needed
// Override this to spawn your things in. This lets you use probabilities, and also doesnt cause init overrides
/obj/structure/closet/proc/populate_contents()
@@ -95,10 +99,10 @@
dump_contents()
- icon_state = icon_opened
opened = TRUE
+ update_icon()
playsound(loc, open_sound, open_sound_volume, TRUE, -3)
- density = 0
+ density = FALSE
return TRUE
/obj/structure/closet/proc/close()
@@ -138,10 +142,10 @@
M.forceMove(src)
itemcount++
- icon_state = icon_closed
opened = FALSE
+ update_icon()
playsound(loc, close_sound, close_sound_volume, TRUE, -3)
- density = 1
+ density = TRUE
return TRUE
/obj/structure/closet/proc/toggle(mob/user)
@@ -295,13 +299,22 @@
to_chat(usr, "This mob type can't use this verb.")
/obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
- overlays.Cut()
if(!opened)
icon_state = icon_closed
- if(welded)
- overlays += "welded"
else
icon_state = icon_opened
+ update_overlays()
+
+/obj/structure/closet/proc/update_overlays(transparent = FALSE)
+ cut_overlays()
+ if(transparent && opened)
+ add_overlay("[open_door_sprite]_trans")
+ return
+ if(opened)
+ add_overlay(open_door_sprite)
+ return
+ if(welded)
+ add_overlay("welded")
// Objects that try to exit a locker by stepping were doing so successfully,
// and due to an oversight in turf/Enter() were going through walls. That
@@ -377,8 +390,7 @@
desc = "A storage unit that moves and stores through the fourth dimension."
density = 0
icon_state = "bluespace"
- icon_closed = "bluespace"
- icon_opened = "bluespaceopen"
+ open_door_sprite = "bluespace_door"
storage_capacity = 60
var/materials = list(MAT_METAL = 5000, MAT_PLASMA = 2500, MAT_TITANIUM = 500, MAT_BLUESPACE = 500)
@@ -392,13 +404,15 @@
if(A.density && A != src && A != AM)
transparent = TRUE
break
- icon_opened = transparent ? "bluespaceopentrans" : "bluespaceopen"
- icon_closed = transparent ? "bluespacetrans" : "bluespace"
+ icon_opened = transparent ? "bluespace_open_trans" : "bluespace_open"
+ icon_closed = transparent ? "bluespace_trans" : "bluespace"
icon_state = opened ? icon_opened : icon_closed
+ update_overlays(transparent)
/obj/structure/closet/bluespace/Crossed(atom/movable/AM, oldloc)
if(AM.density)
- icon_state = opened ? "bluespaceopentrans" : "bluespacetrans"
+ icon_state = opened ? "bluespace_open_trans" : "bluespace_trans"
+ update_overlays(TRUE)
/obj/structure/closet/bluespace/Move(NewLoc, direct) // Allows for "phasing" throug objects but doesn't allow you to stuff your EOC homebois in one of these and push them through walls.
var/turf/T = get_turf(NewLoc)
@@ -412,4 +426,4 @@
/obj/structure/closet/bluespace/close()
. = ..()
- density = 0
+ density = FALSE
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index fdeeab78878..d641c501d10 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -3,8 +3,7 @@
desc = "Just a box..."
icon = 'icons/obj/cardboard_boxes.dmi'
icon_state = "cardboard"
- icon_opened = "cardboard_open"
- icon_closed = "cardboard"
+ open_door_sprite = null
resistance_flags = FLAMMABLE
max_integrity = 70
integrity_failure = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index edb3d1e50d1..f0e319ae5c1 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -2,8 +2,7 @@
name = "coffin"
desc = "It's a burial receptacle for the dearly departed."
icon_state = "coffin"
- icon_closed = "coffin"
- icon_opened = "coffin_open"
+ open_door_sprite = null
resistance_flags = FLAMMABLE
max_integrity = 70
material_drop = /obj/item/stack/sheet/wood
@@ -21,8 +20,6 @@
/obj/structure/closet/coffin/sarcophagus
name = "sarcophagus"
icon_state = "sarc"
- icon_closed = "sarc"
- icon_opened = "sarc_open"
open_sound = 'sound/effects/stonedoor_openclose.ogg'
close_sound = 'sound/effects/stonedoor_openclose.ogg'
material_drop = /obj/item/stack/sheet/mineral/sandstone
diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
index 8370048ecd0..ccd41a88e64 100644
--- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
@@ -2,6 +2,5 @@
name = "critter crate"
desc = "A crate which can sustain life for a while."
icon_state = "critter"
- icon_opened = "critteropen"
- icon_closed = "critter"
+ open_door_sprite = null
material_drop = /obj/item/stack/sheet/wood
diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index d8a2cb5b04b..7d71a456abf 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -6,6 +6,7 @@
icon_state = "fireaxe1000"
icon_closed = "fireaxe1000"
icon_opened = "fireaxe1100"
+ open_door_sprite = null
anchored = TRUE
density = FALSE
armor = list(MELEE = 50, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, BIO = 100, RAD = 100, FIRE = 90, ACID = 50)
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index 62013452d23..b148c909663 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -2,7 +2,8 @@
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
icon_state = "mixed"
- icon_closed = "mixed"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/athletic_mixed/populate_contents()
new /obj/item/clothing/under/shorts/grey(src)
@@ -20,6 +21,8 @@
/obj/structure/closet/boxinggloves
name = "boxing gloves"
desc = "It's a storage unit for gloves for use in the boxing ring."
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/boxinggloves/populate_contents()
new /obj/item/clothing/gloves/boxing/blue(src)
@@ -31,6 +34,8 @@
/obj/structure/closet/masks
name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/masks/populate_contents()
new /obj/item/clothing/mask/luchador(src)
@@ -42,7 +47,8 @@
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_state = "red"
- icon_closed = "red"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/lasertag/red/populate_contents()
new /obj/item/gun/energy/laser/tag/red(src)
@@ -57,7 +63,8 @@
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_state = "blue"
- icon_closed = "blue"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/lasertag/blue/populate_contents()
new /obj/item/gun/energy/laser/tag/blue(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 0126a7f8a68..9a7a93f3da9 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -1,9 +1,8 @@
/obj/structure/closet/cabinet
name = "cabinet"
desc = "Old will forever be in fashion."
- icon_state = "cabinet_closed"
- icon_closed = "cabinet_closed"
- icon_opened = "cabinet_open"
+ icon_state = "cabinet"
+ open_door_sprite = "cabient_door"
resistance_flags = FLAMMABLE
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
@@ -20,25 +19,21 @@
/obj/structure/closet/acloset
name = "strange closet"
desc = "It looks alien!"
- icon_state = "acloset"
- icon_closed = "acloset"
- icon_opened = "aclosetopen"
-
+ icon_state = "alien"
+ open_door_sprite = "alien_door"
/obj/structure/closet/gimmick
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1open"
+ open_door_sprite = "syndicate1_door"
anchored = 0
/obj/structure/closet/gimmick/russian
name = "russian surplus closet"
desc = "It's a storage unit for Russian standard-issue surplus."
icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1open"
+ open_door_sprite = "syndicate1_door"
/obj/structure/closet/gimmick/russian/populate_contents()
new /obj/item/clothing/head/ushanka(src)
@@ -57,8 +52,7 @@
name = "tacticool gear closet"
desc = "It's a storage unit for Tacticool gear."
icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1open"
+ open_door_sprite = "syndicate1_door"
/obj/structure/closet/gimmick/tacticool/populate_contents()
new /obj/item/clothing/glasses/eyepatch(src)
@@ -81,8 +75,7 @@
name = "\improper Thunderdome closet"
desc = "Everything you need!"
icon_state = "syndicate"
- icon_closed = "syndicate"
- icon_opened = "syndicateopen"
+ open_door_sprite = "syndicate_door"
anchored = 1
/obj/structure/closet/thunderdome/tdred
@@ -111,8 +104,7 @@
/obj/structure/closet/thunderdome/tdgreen
name = "green-team Thunderdome closet"
icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1open"
+ open_door_sprite = "syndicate1_door"
/obj/structure/closet/thunderdome/tdgreen/populate_contents()
new /obj/item/clothing/suit/armor/tdome/green(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 37594cd5c31..505ae16b3f7 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -12,7 +12,8 @@
name = "formal closet"
desc = "It's a storage unit for formal clothing."
icon_state = "black"
- icon_closed = "black"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/gmcloset/populate_contents()
new /obj/item/clothing/head/that(src)
@@ -39,7 +40,8 @@
name = "chef's closet"
desc = "It's a storage unit for foodservice garments."
icon_state = "black"
- icon_closed = "black"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/chefcloset/populate_contents()
new /obj/item/clothing/under/waiter(src)
@@ -66,7 +68,8 @@
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
icon_state = "mixed"
- icon_closed = "mixed"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/jcloset/populate_contents()
new /obj/item/flashlight(src)
@@ -106,7 +109,8 @@
name = "legal closet"
desc = "It's a storage unit for courtroom apparel and items."
icon_state = "blue"
- icon_closed = "blue"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/lawcloset/populate_contents()
new /obj/item/clothing/under/lawyer/female(src)
@@ -125,7 +129,8 @@
name = "paramedic wardrobe"
desc = "It's a storage unit for paramedic equipment."
icon_state = "blue"
- icon_closed = "blue"
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
/obj/structure/closet/paramedic/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index 6eb2b680b35..fe93f4700a5 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -2,29 +2,22 @@
name = "level-3 biohazard suit closet"
desc = "It's a storage unit for level-3 biohazard gear."
icon_state = "bio"
- icon_closed = "bio"
- icon_opened = "bioopen"
+ open_door_sprite = "bio_door"
/obj/structure/closet/l3closet/populate_contents()
new /obj/item/storage/bag/bio( src )
new /obj/item/clothing/suit/bio_suit/general( src )
new /obj/item/clothing/head/bio_hood/general( src )
-
/obj/structure/closet/l3closet/general
- icon_state = "bio_general"
- icon_closed = "bio_general"
- icon_opened = "bio_generalopen"
/obj/structure/closet/l3closet/general/populate_contents()
new /obj/item/clothing/suit/bio_suit/general( src )
new /obj/item/clothing/head/bio_hood/general( src )
-
/obj/structure/closet/l3closet/virology
- icon_state = "bio_virology"
- icon_closed = "bio_virology"
- icon_opened = "bio_virologyopen"
+ icon_state = "bio_viro"
+ open_door_sprite = "bio_viro_door"
/obj/structure/closet/l3closet/virology/populate_contents()
new /obj/item/storage/bag/bio( src )
@@ -33,31 +26,25 @@
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/oxygen(src)
-
/obj/structure/closet/l3closet/security
- icon_state = "bio_security"
- icon_closed = "bio_security"
- icon_opened = "bio_securityopen"
+ icon_state = "bio_sec"
+ open_door_sprite = "bio_sec_door"
/obj/structure/closet/l3closet/security/populate_contents()
new /obj/item/clothing/suit/bio_suit/security( src )
new /obj/item/clothing/head/bio_hood/security( src )
-
/obj/structure/closet/l3closet/janitor
- icon_state = "bio_janitor"
- icon_closed = "bio_janitor"
- icon_opened = "bio_janitoropen"
+ icon_state = "bio_jan"
+ open_door_sprite = "bio_jan_door"
/obj/structure/closet/l3closet/janitor/populate_contents()
new /obj/item/clothing/suit/bio_suit/janitor( src )
new /obj/item/clothing/head/bio_hood/janitor( src )
-
/obj/structure/closet/l3closet/scientist
- icon_state = "bio_scientist"
- icon_closed = "bio_scientist"
- icon_opened = "bio_scientistopen"
+ icon_state = "bio"
+ open_door_sprite = "bio_door"
/obj/structure/closet/l3closet/scientist/populate_contents()
new /obj/item/storage/bag/bio( src )
diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm
index fcd763292e6..fb834c86d95 100644
--- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm
+++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm
@@ -2,8 +2,7 @@
/obj/structure/closet/malf/suits
desc = "It's a storage unit for operational gear."
icon_state = "syndicate"
- icon_closed = "syndicate"
- icon_opened = "syndicateopen"
+ open_door_sprite = "syndicate_door"
/obj/structure/closet/malf/suits/populate_contents()
new /obj/item/tank/jetpack/void(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index 1f49de3de2a..d27a430d7e9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -1,12 +1,8 @@
/obj/structure/closet/secure_closet/bar
name = "Booze cabinet"
req_access = list(ACCESS_BAR)
- icon_state = "cabinetdetective_locked"
- icon_closed = "cabinetdetective"
- icon_locked = "cabinetdetective_locked"
- icon_opened = "cabinetdetective_open"
- icon_broken = "cabinetdetective_broken"
- icon_off = "cabinetdetective_broken"
+ icon_state = "cabinet"
+ open_door_sprite = "cabinet_door"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
@@ -25,15 +21,3 @@
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-
-/obj/structure/closet/secure_closet/bar/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
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 cf1ad89b4ed..4a0818a9322 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -1,12 +1,8 @@
/obj/structure/closet/secure_closet/cargotech
name = "cargo technician's locker"
req_access = list(ACCESS_CARGO)
- icon_state = "securecargo1"
- icon_closed = "securecargo"
- icon_locked = "securecargo1"
- icon_opened = "securecargoopen"
- icon_broken = "securecargobroken"
- icon_off = "securecargooff"
+ icon_state = "cargo"
+ open_door_sprite = "mining_door"
/obj/structure/closet/secure_closet/cargotech/populate_contents()
new /obj/item/clothing/under/rank/cargotech(src)
@@ -21,12 +17,8 @@
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
req_access = list(ACCESS_QM)
- icon_state = "secureqm1"
- icon_closed = "secureqm"
- icon_locked = "secureqm1"
- icon_opened = "secureqmopen"
- icon_broken = "secureqmbroken"
- icon_off = "secureqmoff"
+ icon_state = "qm"
+ open_door_sprite = "mining_door"
/obj/structure/closet/secure_closet/quartermaster/populate_contents()
new /obj/item/clothing/under/rank/cargo(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
index 55e44163a06..17e32c7484e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
@@ -2,12 +2,8 @@
name = "chapel wardrobe"
desc = "A lockable storage unit for Nanotrasen-approved religious attire."
req_access = list(ACCESS_CHAPEL_OFFICE)
- icon_state = "chaplainsecure1"
- icon_closed = "chaplainsecure"
- icon_locked = "chaplainsecure1"
- icon_opened = "chaplainsecureopen"
- icon_broken = "chaplainsecurebroken"
- icon_off = "chaplainsecureoff"
+ icon_state = "chaplain"
+ open_door_sprite = "chaplain_door"
/obj/structure/closet/secure_closet/chaplain/populate_contents()
new /obj/item/clothing/under/rank/chaplain(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
index eaed06a2c29..e92e79deaeb 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
@@ -1,4 +1,3 @@
-
/obj/structure/closet/secure_closet/syndicate/depot
name = "depot supply closet"
desc = ""
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 ed3a1b1c143..a7ad03ee204 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -1,12 +1,8 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
req_access = list(ACCESS_CE)
- icon_state = "securece1"
- icon_closed = "securece"
- icon_locked = "securece1"
- icon_opened = "secureceopen"
- icon_broken = "securecebroken"
- icon_off = "secureceoff"
+ icon_state = "ce"
+ open_door_sprite = "white_secure_door"
/obj/structure/closet/secure_closet/engineering_chief/populate_contents()
if(prob(50))
@@ -47,12 +43,9 @@
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies locker"
req_access = list(ACCESS_ENGINE_EQUIP)
- icon_state = "secureengelec1"
- icon_closed = "secureengelec"
- icon_locked = "secureengelec1"
- icon_opened = "toolclosetopen"
- icon_broken = "secureengelecbroken"
- icon_off = "secureengelecoff"
+ icon_state = "eng_elec"
+ open_door_sprite = "eng_door"
+ icon_opened = "eng_open"
/obj/structure/closet/secure_closet/engineering_electrical/populate_contents()
new /obj/item/clothing/gloves/color/yellow(src)
@@ -72,12 +65,9 @@
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies locker"
req_access = list(ACCESS_ENGINE_EQUIP)
- icon_state = "secureengweld1"
- icon_closed = "secureengweld"
- icon_locked = "secureengweld1"
- icon_opened = "toolclosetopen"
- icon_broken = "secureengweldbroken"
- icon_off = "secureengweldoff"
+ icon_state = "eng_weld"
+ open_door_sprite = "eng_door"
+ icon_opened = "eng_open"
/obj/structure/closet/secure_closet/engineering_welding/populate_contents()
new /obj/item/clothing/head/welding(src)
@@ -91,12 +81,8 @@
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(ACCESS_ENGINE_EQUIP)
- icon_state = "secureeng1"
- icon_closed = "secureeng"
- icon_locked = "secureeng1"
- icon_opened = "secureengopen"
- icon_broken = "secureengbroken"
- icon_off = "secureengoff"
+ icon_state = "eng_secure"
+ open_door_sprite = "eng_secure_door"
/obj/structure/closet/secure_closet/engineering_personal/populate_contents()
if(prob(50))
@@ -119,12 +105,8 @@
/obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker"
req_access = list(ACCESS_ATMOSPHERICS)
- icon_state = "secureatm1"
- icon_closed = "secureatm"
- icon_locked = "secureatm1"
- icon_opened = "secureatmopen"
- icon_broken = "secureatmbroken"
- icon_off = "secureatmoff"
+ icon_state = "atmos"
+ open_door_sprite = "eng_secure_door"
/obj/structure/closet/secure_closet/atmos_personal/populate_contents()
new /obj/item/radio/headset/headset_eng(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 16d1875044e..50112fbd11b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -1,20 +1,6 @@
/obj/structure/closet/secure_closet/freezer
desc = "It's a card-locked refrigerative storage unit. This one is lead-lined."
-/obj/structure/closet/secure_closet/freezer/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- if(welded)
- overlays += "welded"
- else
- icon_state = icon_opened
-
/obj/structure/closet/secure_closet/freezer/ex_act(severity)
// IF INDIANA JONES CAN DO IT SO CAN YOU
@@ -23,7 +9,6 @@
if(!isemptylist(bombs)) // You're fucked.
..(severity)
-
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen cabinet"
req_access = list(ACCESS_KITCHEN)
@@ -53,12 +38,8 @@
/obj/structure/closet/secure_closet/freezer/meat
name = "meat fridge"
- icon_state = "fridge1"
- icon_closed = "fridge"
- icon_locked = "fridge1"
- icon_opened = "fridgeopen"
- icon_broken = "fridgebroken"
- icon_off = "fridge1"
+ icon_state = "freezer"
+ open_door_sprite = "freezer_door"
/obj/structure/closet/secure_closet/freezer/meat/populate_contents()
for(var/i in 1 to 4)
@@ -70,12 +51,8 @@
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
- icon_state = "fridge1"
- icon_closed = "fridge"
- icon_locked = "fridge1"
- icon_opened = "fridgeopen"
- icon_broken = "fridgebroken"
- icon_off = "fridge1"
+ icon_state = "freezer"
+ open_door_sprite = "freezer_door"
/obj/structure/closet/secure_closet/freezer/fridge/populate_contents()
for(var/i in 1 to 5)
@@ -90,12 +67,8 @@
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
- icon_state = "fridge1"
- icon_closed = "fridge"
- icon_locked = "fridge1"
- icon_opened = "fridgeopen"
- icon_broken = "fridgebroken"
- icon_off = "fridge1"
+ icon_state = "freezer"
+ open_door_sprite = "freezer_door"
req_access = list(ACCESS_HEADS_VAULT)
/obj/structure/closet/secure_closet/freezer/money/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index 581fe469a7e..33b5aec4919 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -3,21 +3,26 @@
req_access = list(ACCESS_ARMORY)
icon = 'icons/obj/guncabinet.dmi'
icon_state = "base"
- icon_closed = "base"
- icon_opened = "base"
- icon_locked = "base"
- icon_broken = "base"
- icon_off = "base"
+ anchored = TRUE
/obj/structure/closet/secure_closet/guncabinet/toggle()
..()
update_icon()
-/obj/structure/closet/secure_closet/guncabinet/update_icon()
- overlays.Cut()
- if(opened)
- overlays += icon(icon,"door_open")
- else
+/obj/structure/closet/secure_closet/guncabinet/take_contents()
+ ..()
+ update_icon()
+
+/obj/structure/closet/secure_closet/guncabinet/emag_act(mob/user)
+ if(!broken)
+ broken = TRUE
+ locked = FALSE
+ to_chat(user, "You break the lock on [src].")
+ update_icon()
+
+/obj/structure/closet/secure_closet/guncabinet/update_overlays()
+ cut_overlays()
+ if(!opened)
var/lazors = 0
var/shottas = 0
for(var/obj/item/gun/G in contents)
@@ -27,7 +32,7 @@
shottas++
if(lazors || shottas)
for(var/i = 0 to 2)
- var/image/gun = image(icon(src.icon))
+ var/image/gun = image(icon(icon))
if(lazors > 0 && (shottas <= 0 || prob(50)))
lazors--
@@ -39,11 +44,8 @@
gun.pixel_x = i*4
overlays += gun
- overlays += icon(src.icon,"door")
-
+ add_overlay("door")
if(broken)
- overlays += icon(src.icon,"broken")
+ add_overlay("off")
else if(locked)
- overlays += icon(src.icon,"locked")
- else
- overlays += icon(src.icon,"open")
+ add_overlay("locked")
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index 00b21ce1f58..7f7647a606b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -1,13 +1,8 @@
/obj/structure/closet/secure_closet/hydroponics
name = "botanist's locker"
req_access = list(ACCESS_HYDROPONICS)
- icon_state = "hydrosecure1"
- icon_closed = "hydrosecure"
- icon_locked = "hydrosecure1"
- icon_opened = "hydrosecureopen"
- icon_broken = "hydrosecurebroken"
- icon_off = "hydrosecureoff"
-
+ icon_state = "hydro"
+ open_door_sprite = "hydro_door"
/obj/structure/closet/secure_closet/hydroponics/populate_contents()
switch(rand(1,2))
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 e8666930aa8..632e0ade1b2 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -1,12 +1,9 @@
/obj/structure/closet/secure_closet/medical1
name = "medicine closet"
desc = "Filled with medical junk."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ icon_state = "med"
+ open_door_sprite = "med_door"
+ icon_opened = "med_open"
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/medical1/populate_contents()
@@ -28,12 +25,9 @@
/obj/structure/closet/secure_closet/medical2
name = "anesthetic locker"
desc = "Used to knock people out."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ icon_state = "med"
+ open_door_sprite = "med_door"
+ icon_opened = "med_open"
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/populate_contents()
@@ -48,12 +42,8 @@
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
req_access = list(ACCESS_SURGERY)
- icon_state = "securemed1"
- icon_closed = "securemed"
- icon_locked = "securemed1"
- icon_opened = "securemedopen"
- icon_broken = "securemedbroken"
- icon_off = "securemedoff"
+ icon_state = "med_secure"
+ open_door_sprite = "white_secure_door"
/obj/structure/closet/secure_closet/medical3/populate_contents()
if(prob(50))
@@ -78,12 +68,9 @@
/obj/structure/closet/secure_closet/exam
name = "exam room closet"
desc = "Filled with exam room materials."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ icon_state = "med"
+ open_door_sprite = "med_door"
+ icon_opened = "med_open"
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/exam/populate_contents()
@@ -127,12 +114,8 @@
/obj/structure/closet/secure_closet/psychiatrist
name = "psychiatrist's locker"
req_access = list(ACCESS_PSYCHIATRIST)
- icon_state = "securemed1"
- icon_closed = "securemed"
- icon_locked = "securemed1"
- icon_opened = "securemedopen"
- icon_broken = "securemedbroken"
- icon_off = "securemedoff"
+ icon_state = "med_secure"
+ open_door_sprite = "white_secure_door"
/obj/structure/closet/secure_closet/psychiatrist/populate_contents()
new /obj/item/clothing/suit/straight_jacket(src)
@@ -151,12 +134,8 @@
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
req_access = list(ACCESS_CMO)
- icon_state = "cmosecure1"
- icon_closed = "cmosecure"
- icon_locked = "cmosecure1"
- icon_opened = "cmosecureopen"
- icon_broken = "cmosecurebroken"
- icon_off = "cmosecureoff"
+ icon_state = "cmo"
+ open_door_sprite = "cmo_door"
/obj/structure/closet/secure_closet/CMO/populate_contents()
if(prob(50))
@@ -210,12 +189,9 @@
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
desc = "Store dangerous chemicals in here."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ icon_state = "chemical"
+ open_door_sprite = "med_door"
+ icon_opened = "med_open"
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/chemical/populate_contents()
@@ -224,42 +200,12 @@
new /obj/item/storage/box/patch_packs(src)
new /obj/item/storage/box/patch_packs(src)
-
-/obj/structure/closet/secure_closet/medical_wall
- name = "first aid closet"
- desc = "It's a secure wall-mounted storage unit for first aid supplies."
- icon_state = "medical_wall_locked"
- icon_closed = "medical_wall_unlocked"
- icon_locked = "medical_wall_locked"
- icon_opened = "medical_wall_open"
- icon_broken = "medical_wall_spark"
- icon_off = "medical_wall_off"
- anchored = 1
- density = 0
- wall_mounted = 1
- req_access = list(ACCESS_MEDICAL)
-
-/obj/structure/closet/secure_closet/medical_wall/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
/obj/structure/closet/secure_closet/paramedic
name = "paramedic EVA gear"
desc = "A locker with a Paramedic EVA suit."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ icon_state = "med"
+ open_door_sprite = "med_door"
+ icon_opened = "med_open"
req_access = list(ACCESS_PARAMEDIC)
/obj/structure/closet/secure_closet/paramedic/populate_contents()
@@ -273,12 +219,9 @@
/obj/structure/closet/secure_closet/reagents
name = "chemical storage closet"
desc = "Store dangerous chemicals in here."
- icon_state = "chemical1"
- icon_closed = "chemical"
- icon_locked = "chemical1"
- icon_opened = "medicalopen"
- icon_broken = "chemicalbroken"
- icon_off = "chemicaloff"
+ icon_state = "chemical"
+ open_door_sprite = "med_door"
+ icon_opened = "med_open"
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/reagents/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
index 94289f8df75..b5412a2ab9b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
@@ -1,12 +1,8 @@
/obj/structure/closet/secure_closet/clown
name = "clown's locker"
req_access = list(ACCESS_CLOWN)
- icon_state = "clownsecure1"
- icon_closed = "clownsecure"
- icon_locked = "clownsecure1"
- icon_opened = "clownsecureopen"
- icon_broken = "clownsecurebroken"
- icon_off = "clownsecureoff"
+ icon_state = "clown"
+ open_door_sprite = "clown_door"
/obj/structure/closet/secure_closet/clown/populate_contents()
new /obj/item/storage/backpack/clown(src)
@@ -26,12 +22,8 @@
/obj/structure/closet/secure_closet/mime
name = "mime's locker"
req_access = list(ACCESS_MIME)
- icon_state = "mimesecure1"
- icon_closed = "mimesecure"
- icon_locked = "mimesecure1"
- icon_opened = "mimesecureopen"
- icon_broken = "mimesecurebroken"
- icon_off = "mimesecureoff"
+ icon_state = "mime"
+ open_door_sprite = "mime_door"
/obj/structure/closet/secure_closet/mime/populate_contents()
new /obj/item/clothing/head/beret(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 6c9ae35553c..5e503b770d3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -21,15 +21,9 @@
new /obj/item/clothing/under/color/white( src )
new /obj/item/clothing/shoes/white( src )
-
-
/obj/structure/closet/secure_closet/personal/cabinet
- icon_state = "cabinetdetective_locked"
- icon_closed = "cabinetdetective"
- icon_locked = "cabinetdetective_locked"
- icon_opened = "cabinetdetective_open"
- icon_broken = "cabinetdetective_broken"
- icon_off = "cabinetdetective_broken"
+ icon_state = "cabinet"
+ open_door_sprite = "cabient_door"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
@@ -37,18 +31,6 @@
open_sound_volume = 25
close_sound_volume = 50
-/obj/structure/closet/secure_closet/personal/cabinet/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
/obj/structure/closet/secure_closet/personal/cabinet/populate_contents()
new /obj/item/storage/backpack/satchel/withwallet( src )
new /obj/item/radio/headset( src )
@@ -72,8 +54,9 @@
//they can open all lockers, or nobody owns this, or they own this locker
locked = !locked
if(locked)
- icon_state = icon_locked
+ add_overlay("locked")
else
+ add_overlay("unlocked")
icon_state = icon_closed
registered_name = null
desc = initial(desc)
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 07eee5bc80c..87c79dba8c0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -1,12 +1,8 @@
/obj/structure/closet/secure_closet/scientist
name = "scientist's locker"
req_access = list(ACCESS_TOX_STORAGE)
- icon_state = "secureres1"
- icon_closed = "secureres"
- icon_locked = "secureres1"
- icon_opened = "secureresopen"
- icon_broken = "secureresbroken"
- icon_off = "secureresoff"
+ icon_state = "science"
+ open_door_sprite = "white_secure_door"
/obj/structure/closet/secure_closet/scientist/populate_contents()
new /obj/item/storage/backpack/science(src)
@@ -25,12 +21,8 @@
/obj/structure/closet/secure_closet/roboticist
name = "roboticist's locker"
req_access = list(ACCESS_ROBOTICS)
- icon_state = "secureres1"
- icon_closed = "secureres"
- icon_locked = "secureres1"
- icon_opened = "secureresopen"
- icon_broken = "secureresbroken"
- icon_off = "secureresoff"
+ icon_state = "science"
+ open_door_sprite = "white_secure_door"
/obj/structure/closet/secure_closet/roboticist/populate_contents()
new /obj/item/storage/backpack(src)
@@ -47,12 +39,8 @@
/obj/structure/closet/secure_closet/RD
name = "research director's locker"
req_access = list(ACCESS_RD)
- icon_state = "rdsecure1"
- icon_closed = "rdsecure"
- icon_locked = "rdsecure1"
- icon_opened = "rdsecureopen"
- icon_broken = "rdsecurebroken"
- icon_off = "rdsecureoff"
+ icon_state = "rd"
+ open_door_sprite = "rd_door"
/obj/structure/closet/secure_closet/RD/populate_contents()
new /obj/item/clothing/suit/bio_suit/scientist(src)
@@ -77,12 +65,9 @@
/obj/structure/closet/secure_closet/research_reagents
name = "research chemical storage closet"
desc = "Store dangerous chemicals in here."
- icon_state = "rchemical1"
- icon_closed = "rchemical"
- icon_locked = "rchemical1"
- icon_opened = "medicalopen"
- icon_broken = "rchemicalbroken"
- icon_off = "rchemicaloff"
+ icon_state = "rchemical"
+ open_door_sprite = "med_door"
+ icon_opened = "med_open"
req_access = list(ACCESS_TOX_STORAGE)
/obj/structure/closet/secure_closet/research_reagents/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 0e740548289..8965c3f7361 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -2,36 +2,29 @@
name = "secure locker"
desc = "It's an immobile card-locked storage unit."
icon = 'icons/obj/closet.dmi'
- icon_state = "secure1"
- density = 1
- opened = 0
- locked = 1
- broken = 0
+ icon_state = "secure"
+ open_door_sprite = "secure_door"
+ opened = FALSE
+ locked = TRUE
can_be_emaged = TRUE
max_integrity = 250
armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80)
damage_deflection = 20
- icon_closed = "secure"
- var/icon_locked = "secure1"
- icon_opened = "secureopen"
- var/icon_broken = "securebroken"
- var/icon_off = "secureoff"
- wall_mounted = 0 //never solid (You can always pass over it)
/obj/structure/closet/secure_closet/can_open()
if(!..())
- return 0
+ return FALSE
if(locked)
- return 0
+ return FALSE
return ..()
/obj/structure/closet/secure_closet/close()
if(..())
if(broken)
- icon_state = icon_off
- return 1
+ update_icon()
+ return TRUE
else
- return 0
+ return FALSE
/obj/structure/closet/secure_closet/emp_act(severity)
for(var/obj/O in src)
@@ -78,9 +71,9 @@
if(!broken)
broken = TRUE
locked = FALSE
- icon_state = icon_off
- flick(icon_broken, src)
+ add_overlay("sparking")
to_chat(user, "You break the lock on [src].")
+ addtimer(CALLBACK(src, .proc/update_icon), 1 SECONDS)
/obj/structure/closet/secure_closet/attack_hand(mob/user)
add_fingerprint(user)
@@ -103,17 +96,19 @@
else
to_chat(usr, "This mob type can't use this verb.")
-/obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
- overlays.Cut()
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- if(welded)
- overlays += "welded"
+/obj/structure/closet/secure_closet/update_overlays() //Putting the welded stuff in update_overlays() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
+ cut_overlays()
+ if(opened)
+ add_overlay(open_door_sprite)
+ return
+ if(welded)
+ add_overlay("welded")
+ if(broken)
+ return
+ if(locked)
+ add_overlay("locked")
else
- icon_state = icon_opened
+ add_overlay("unlocked")
/obj/structure/closet/secure_closet/container_resist(mob/living/L)
var/breakout_time = 2 //2 minutes by default
@@ -141,14 +136,9 @@
//Well then break it!
desc = "It appears to be broken."
- icon_state = icon_off
- flick(icon_broken, src)
- sleep(10)
- flick(icon_broken, src)
- sleep(10)
- broken = 1
- locked = 0
- welded = 0
+ broken = TRUE
+ locked = FALSE
+ welded = FALSE
update_icon()
to_chat(usr, "You successfully break out!")
for(var/mob/O in viewers(L.loc))
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 05e7013591d..d68fbb3c7f4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -1,12 +1,8 @@
/obj/structure/closet/secure_closet/captains
name = "captain's locker"
req_access = list(ACCESS_CAPTAIN)
- icon_state = "capsecure1"
- icon_closed = "capsecure"
- icon_locked = "capsecure1"
- icon_opened = "capsecureopen"
- icon_broken = "capsecurebroken"
- icon_off = "capsecureoff"
+ icon_state = "cap"
+ open_door_sprite = "cap_door"
/obj/structure/closet/secure_closet/captains/populate_contents()
if(prob(50))
@@ -39,12 +35,8 @@
/obj/structure/closet/secure_closet/hop
name = "head of personnel's locker"
req_access = list(ACCESS_HOP)
- icon_state = "hopsecure1"
- icon_closed = "hopsecure"
- icon_locked = "hopsecure1"
- icon_opened = "hopsecureopen"
- icon_broken = "hopsecurebroken"
- icon_off = "hopsecureoff"
+ icon_state = "hop"
+ open_door_sprite = "hop_door"
/obj/structure/closet/secure_closet/hop/populate_contents()
new /obj/item/clothing/glasses/hud/skills/sunglasses(src)
@@ -65,12 +57,8 @@
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
req_access = list(ACCESS_HOP)
- icon_state = "hopsecure1"
- icon_closed = "hopsecure"
- icon_locked = "hopsecure1"
- icon_opened = "hopsecureopen"
- icon_broken = "hopsecurebroken"
- icon_off = "hopsecureoff"
+ icon_state = "hop"
+ open_door_sprite = "hop_door"
/obj/structure/closet/secure_closet/hop2/populate_contents()
new /obj/item/clothing/under/rank/head_of_personnel(src)
@@ -91,12 +79,8 @@
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
req_access = list(ACCESS_HOS)
- icon_state = "hossecure1"
- icon_closed = "hossecure"
- icon_locked = "hossecure1"
- icon_opened = "hossecureopen"
- icon_broken = "hossecurebroken"
- icon_off = "hossecureoff"
+ icon_state = "hos"
+ open_door_sprite = "hos_door"
/obj/structure/closet/secure_closet/hos/populate_contents()
if(prob(50))
@@ -131,12 +115,8 @@
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
req_access = list(ACCESS_ARMORY)
- icon_state = "wardensecure1"
- icon_closed = "wardensecure"
- icon_locked = "wardensecure1"
- icon_opened = "wardensecureopen"
- icon_broken = "wardensecurebroken"
- icon_off = "wardensecureoff"
+ icon_state = "warden"
+ open_door_sprite = "sec_door"
/obj/structure/closet/secure_closet/warden/populate_contents()
if(prob(50))
@@ -168,12 +148,8 @@
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
req_access = list(ACCESS_SECURITY)
- icon_state = "sec1"
- icon_closed = "sec"
- icon_locked = "sec1"
- icon_opened = "secopen"
- icon_broken = "secbroken"
- icon_off = "secoff"
+ icon_state = "sec"
+ open_door_sprite = "sec_door"
/obj/structure/closet/secure_closet/security/populate_contents()
if(prob(50))
@@ -198,12 +174,8 @@
/obj/structure/closet/secure_closet/brigdoc
name = "brig physician's locker"
req_access = list(ACCESS_SECURITY)
- icon_state = "securemed1"
- icon_closed = "securemed"
- icon_locked = "securemed1"
- icon_opened = "securemedopen"
- icon_broken = "securemedbroken"
- icon_off = "securemedoff"
+ icon_state = "med"
+ open_door_sprite = "med_door"
/obj/structure/closet/secure_closet/brigdoc/populate_contents()
if(prob(50))
@@ -227,12 +199,9 @@
/obj/structure/closet/secure_closet/blueshield
name = "blueshield's locker"
req_access = list(ACCESS_BLUESHIELD)
- icon_state = "bssecure1"
- icon_closed = "bssecure"
- icon_locked = "bssecure1"
- icon_opened = "bssecureopen"
- icon_broken = "bssecurebroken"
- icon_off = "bssecureoff"
+ icon_state = "bs"
+ open_door_sprite = "hop_door"
+ icon_opened = "hop_open"
/obj/structure/closet/secure_closet/blueshield/populate_contents()
new /obj/item/storage/briefcase(src)
@@ -261,12 +230,9 @@
/obj/structure/closet/secure_closet/ntrep
name = "\improper Nanotrasen Representative's locker"
req_access = list(ACCESS_NTREP)
- icon_state = "ntsecure1"
- icon_closed = "ntsecure"
- icon_locked = "ntsecure1"
- icon_opened = "ntsecureopen"
- icon_broken = "ntsecurebroken"
- icon_off = "ntsecureoff"
+ icon_state = "ntr"
+ open_door_sprite = "hop_door"
+ icon_opened = "hop_open"
/obj/structure/closet/secure_closet/ntrep/populate_contents()
new /obj/item/book/manual/faxes(src)
@@ -318,12 +284,8 @@
/obj/structure/closet/secure_closet/detective
name = "detective's cabinet"
req_access = list(ACCESS_FORENSICS_LOCKERS)
- icon_state = "cabinetdetective_locked"
- icon_closed = "cabinetdetective"
- icon_locked = "cabinetdetective_locked"
- icon_opened = "cabinetdetective_open"
- icon_broken = "cabinetdetective_broken"
- icon_off = "cabinetdetective_broken"
+ icon_state = "cabinet"
+ open_door_sprite = "cabinet_door"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
@@ -353,19 +315,6 @@
new /obj/item/taperecorder(src)
new /obj/item/storage/box/tapes(src)
-/obj/structure/closet/secure_closet/detective/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
-
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
req_access = list(ACCESS_SECURITY)
@@ -402,42 +351,11 @@
new /obj/item/clothing/head/powdered_wig (src)
new /obj/item/storage/briefcase(src)
-
-/obj/structure/closet/secure_closet/wall
- name = "wall locker"
- req_access = list(ACCESS_SECURITY)
- icon_state = "wall-locker1"
- density = 1
- icon_closed = "wall-locker"
- icon_locked = "wall-locker1"
- icon_opened = "wall-lockeropen"
- icon_broken = "wall-lockerbroken"
- icon_off = "wall-lockeroff"
-
- //too small to put a man in
- large = FALSE
-
-/obj/structure/closet/secure_closet/wall/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
/obj/structure/closet/secure_closet/magistrate
name = "\improper Magistrate's locker"
req_access = list(ACCESS_MAGISTRATE)
- icon_state = "magistratesecure1"
- icon_closed = "magistratesecure"
- icon_locked = "magistratesecure1"
- icon_opened = "magistratesecureopen"
- icon_broken = "magistratesecurebroken"
- icon_off = "magistratesecureoff"
+ icon_state = "magi"
+ open_door_sprite = "chaplain_door"
/obj/structure/closet/secure_closet/magistrate/populate_contents()
new /obj/item/book/manual/faxes(src)
@@ -460,12 +378,9 @@
/obj/structure/closet/secure_closet/iaa
name = "internal affairs locker"
req_access = list(ACCESS_LAWYER)
- icon_state = "iaasecure1"
- icon_closed = "iaasecure"
- icon_locked = "iaasecure1"
- icon_opened = "iaasecureopen"
- icon_broken = "iaasecurebroken"
- icon_off = "iaasecureoff"
+ icon_opened = "magi_open"
+ icon_state = "iaa"
+ open_door_sprite = "chaplain_door"
/obj/structure/closet/secure_closet/iaa/populate_contents()
new /obj/item/book/manual/faxes(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index b33b9fa24e4..80c12703198 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -2,9 +2,7 @@
name = "armoury closet"
desc = "Why is this here?"
icon_state = "syndicate"
- icon_closed = "syndicate"
- icon_opened = "syndicateopen"
-
+ open_door_sprite = "syndicate_door"
/obj/structure/closet/syndicate/personal
desc = "It's a storage unit for operative gear."
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index d8d3111fbe8..dce21844391 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -16,8 +16,7 @@
name = "emergency closet"
desc = "It's a storage unit for emergency breathmasks and o2 tanks."
icon_state = "emergency"
- icon_closed = "emergency"
- icon_opened = "emergencyopen"
+ open_door_sprite = "emergency_door"
/obj/structure/closet/emcloset/anchored
anchored = TRUE
@@ -62,9 +61,8 @@
/obj/structure/closet/firecloset
name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies."
- icon_state = "firecloset"
- icon_closed = "firecloset"
- icon_opened = "fireclosetopen"
+ icon_state = "fire"
+ open_door_sprite = "fire_door"
/obj/structure/closet/firecloset/populate_contents()
new /obj/item/extinguisher(src)
@@ -88,9 +86,9 @@
/obj/structure/closet/toolcloset
name = "tool closet"
desc = "It's a storage unit for tools."
- icon_state = "toolcloset"
- icon_closed = "toolcloset"
- icon_opened = "toolclosetopen"
+ icon_state = "eng_tool"
+ open_door_sprite = "eng_door"
+ icon_opened = "eng_open"
/obj/structure/closet/toolcloset/populate_contents()
if(prob(40))
@@ -131,9 +129,9 @@
/obj/structure/closet/radiation
name = "radiation suit closet"
desc = "It's a storage unit for rad-protective suits."
- icon_state = "radsuitcloset"
- icon_opened = "toolclosetopen"
- icon_closed = "radsuitcloset"
+ icon_state = "eng_rad"
+ open_door_sprite = "eng_door"
+ icon_opened = "eng_open"
/obj/structure/closet/radiation/populate_contents()
new /obj/item/geiger_counter(src)
@@ -146,9 +144,8 @@
/obj/structure/closet/bombcloset
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
- icon_state = "bombsuit"
- icon_closed = "bombsuit"
- icon_opened = "bombsuitopen"
+ icon_state = "bomb"
+ open_door_sprite = "bomb_door"
/obj/structure/closet/bombcloset/populate_contents()
new /obj/item/clothing/suit/bomb_suit( src )
@@ -160,52 +157,11 @@
/obj/structure/closet/bombclosetsecurity
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
- icon_state = "bombsuitsec"
- icon_closed = "bombsuitsec"
- icon_opened = "bombsuitsecopen"
+ icon_state = "bomb"
+ open_door_sprite = "bomb_door"
/obj/structure/closet/bombclosetsecurity/populate_contents()
new /obj/item/clothing/suit/bomb_suit/security( src )
new /obj/item/clothing/under/rank/security( src )
new /obj/item/clothing/shoes/brown( src )
new /obj/item/clothing/head/bomb_hood/security( src )
-
-/*
- * Hydrant
- */
-/obj/structure/closet/hydrant //wall mounted fire closet
- name = "fire-safety closet"
- desc = "It's a storage unit for fire-fighting supplies."
- icon_state = "hydrant"
- icon_closed = "hydrant"
- icon_opened = "hydrant_open"
- anchored = 1
- density = 0
- wall_mounted = 1
-
-/obj/structure/closet/hydrant/populate_contents()
- new /obj/item/clothing/suit/fire/firefighter(src)
- new /obj/item/clothing/mask/gas(src)
- new /obj/item/flashlight(src)
- new /obj/item/tank/internals/oxygen/red(src)
- new /obj/item/extinguisher(src)
- new /obj/item/clothing/head/hardhat/red(src)
-
-/*
- * First Aid
- */
-/obj/structure/closet/medical_wall //wall mounted medical closet
- name = "first-aid closet"
- desc = "It's wall-mounted storage unit for first aid supplies."
- icon_state = "medical_wall"
- icon_closed = "medical_wall"
- icon_opened = "medical_wall_open"
- anchored = 1
- density = 0
- wall_mounted = 1
-
-/obj/structure/closet/medical_wall/update_icon()
- if(!opened)
- icon_state = icon_closed
- else
- icon_state = icon_opened
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index d9096b01ba5..c815356b217 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -1,8 +1,9 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue Nanotrasen attire."
+ icon_opened = "generic_open"
+ open_door_sprite = "generic_door"
icon_state = "blue"
- icon_closed = "blue"
/obj/structure/closet/wardrobe/generic
// Identical to the base wardrobe, aside from containing some stuff.
@@ -22,7 +23,6 @@
/obj/structure/closet/wardrobe/red
name = "security wardrobe"
icon_state = "red"
- icon_closed = "red"
/obj/structure/closet/wardrobe/populate_contents()
new /obj/item/storage/backpack/duffel/security(src)
@@ -58,7 +58,6 @@
/obj/structure/closet/redcorp
name = "corporate security wardrobe"
icon_state = "red"
- icon_closed = "red"
/obj/structure/closet/redcorp/populate_contents()
new /obj/item/clothing/under/rank/security/corp(src)
@@ -71,7 +70,6 @@
/obj/structure/closet/wardrobe/pink
name = "pink wardrobe"
icon_state = "pink"
- icon_closed = "pink"
/obj/structure/closet/wardrobe/pink/populate_contents()
new /obj/item/clothing/under/color/pink(src)
@@ -84,7 +82,6 @@
/obj/structure/closet/wardrobe/black
name = "black wardrobe"
icon_state = "black"
- icon_closed = "black"
/obj/structure/closet/wardrobe/black/populate_contents()
new /obj/item/clothing/under/color/black(src)
@@ -105,7 +102,6 @@
/obj/structure/closet/wardrobe/green
name = "green wardrobe"
icon_state = "green"
- icon_closed = "green"
/obj/structure/closet/wardrobe/green/populate_contents()
new /obj/item/clothing/under/color/green(src)
@@ -118,7 +114,6 @@
/obj/structure/closet/wardrobe/xenos
name = "xenos wardrobe"
icon_state = "green"
- icon_closed = "green"
/obj/structure/closet/wardrobe/xenos/populate_contents()
new /obj/item/clothing/suit/unathi/mantle(src)
@@ -135,7 +130,6 @@
name = "prison wardrobe"
desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
icon_state = "orange"
- icon_closed = "orange"
/obj/structure/closet/wardrobe/orange/populate_contents()
new /obj/item/clothing/under/color/orange/prison(src)
@@ -149,7 +143,6 @@
/obj/structure/closet/wardrobe/yellow
name = "yellow wardrobe"
icon_state = "yellow"
- icon_closed = "yellow"
/obj/structure/closet/wardrobe/yellow/populate_contents()
new /obj/item/clothing/under/color/yellow(src)
@@ -162,8 +155,7 @@
/obj/structure/closet/wardrobe/atmospherics_yellow
name = "atmospherics wardrobe"
- icon_state = "atmostech"
- icon_closed = "atmostech"
+ icon_state = "atmos_wardrobe"
/obj/structure/closet/wardrobe/atmospherics_yellow/populate_contents()
new /obj/item/clothing/under/rank/atmospheric_technician(src)
@@ -186,8 +178,7 @@
/obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe"
- icon_state = "engineer"
- icon_closed = "engineer"
+ icon_state = "yellow"
/obj/structure/closet/wardrobe/engineering_yellow/populate_contents()
new /obj/item/clothing/under/rank/engineer(src)
@@ -210,7 +201,6 @@
/obj/structure/closet/wardrobe/white
name = "white wardrobe"
icon_state = "white"
- icon_closed = "white"
/obj/structure/closet/wardrobe/white/populate_contents()
new /obj/item/clothing/under/color/white(src)
@@ -223,7 +213,6 @@
/obj/structure/closet/wardrobe/medical_white
name = "medical doctor's wardrobe"
icon_state = "white"
- icon_closed = "white"
/obj/structure/closet/wardrobe/medical_white/populate_contents()
new /obj/item/clothing/under/rank/nursesuit (src)
@@ -252,7 +241,6 @@
/obj/structure/closet/wardrobe/pjs
name = "Pajama wardrobe"
icon_state = "white"
- icon_closed = "white"
/obj/structure/closet/wardrobe/pjs/populate_contents()
new /obj/item/clothing/under/pj/red(src)
@@ -268,7 +256,6 @@
/obj/structure/closet/wardrobe/toxins_white
name = "toxins wardrobe"
icon_state = "white"
- icon_closed = "white"
/obj/structure/closet/wardrobe/toxins_white/populate_contents()
new /obj/item/clothing/under/rank/scientist(src)
@@ -291,7 +278,6 @@
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
icon_state = "black"
- icon_closed = "black"
/obj/structure/closet/wardrobe/robotics_black/populate_contents()
new /obj/item/clothing/under/rank/roboticist(src)
@@ -309,7 +295,6 @@
/obj/structure/closet/wardrobe/chemistry_white
name = "chemistry wardrobe"
icon_state = "white"
- icon_closed = "white"
/obj/structure/closet/wardrobe/chemistry_white/populate_contents()
new /obj/item/clothing/under/rank/chemist(src)
@@ -333,7 +318,6 @@
/obj/structure/closet/wardrobe/genetics_white
name = "genetics wardrobe"
icon_state = "white"
- icon_closed = "white"
/obj/structure/closet/wardrobe/genetics_white/populate_contents()
new /obj/item/clothing/under/rank/geneticist(src)
@@ -351,7 +335,6 @@
/obj/structure/closet/wardrobe/virology_white
name = "virology wardrobe"
icon_state = "white"
- icon_closed = "white"
/obj/structure/closet/wardrobe/virology_white/populate_contents()
new /obj/item/clothing/under/rank/virologist(src)
@@ -373,7 +356,6 @@
/obj/structure/closet/wardrobe/medic_white
name = "medical wardrobe"
icon_state = "white"
- icon_closed = "white"
/obj/structure/closet/wardrobe/medic_white/populate_contents()
new /obj/item/clothing/under/rank/medical(src)
@@ -400,7 +382,6 @@
/obj/structure/closet/wardrobe/grey
name = "grey wardrobe"
icon_state = "grey"
- icon_closed = "grey"
/obj/structure/closet/wardrobe/grey/populate_contents()
new /obj/item/clothing/under/color/grey(src)
@@ -423,7 +404,6 @@
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"
icon_state = "mixed"
- icon_closed = "mixed"
/obj/structure/closet/wardrobe/mixed/populate_contents()
new /obj/item/clothing/under/color/blue(src)
@@ -444,7 +424,6 @@
/obj/structure/closet/wardrobe/coroner
name = "coroner wardrobe"
icon_state = "black"
- icon_closed = "black"
/obj/structure/closet/wardrobe/coroner/populate_contents()
if(prob(50))
diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm
index 4c8e415cdda..66dc2964494 100644
--- a/code/game/objects/structures/crates_lockers/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/crittercrate.dm
@@ -4,6 +4,7 @@
icon_state = "critter"
icon_opened = "critteropen"
icon_closed = "critter"
+ open_door_sprite = null
var/already_opened = 0
var/content_mob = null
var/amount = 1
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 5b5c2425708..8788c3ad3ff 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1295,8 +1295,9 @@
if(!prison_cell) return
var/obj/structure/closet/secure_closet/brig/locker = new /obj/structure/closet/secure_closet/brig(prison_cell)
- locker.opened = 0
- locker.locked = 1
+ locker.opened = FALSE
+ locker.locked = TRUE
+ locker.update_icon()
//strip their stuff and stick it in the crate
for(var/obj/item/I in M)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index dbec7e34324..775146e5c68 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -41,12 +41,8 @@
/obj/structure/closet/secure_closet/miner
name = "miner's equipment"
- icon_state = "miningsec1"
- icon_closed = "miningsec"
- icon_locked = "miningsec1"
- icon_opened = "miningsecopen"
- icon_broken = "miningsecbroken"
- icon_off = "miningsecoff"
+ icon_state = "mining"
+ open_door_sprite = "mining_door"
req_access = list(ACCESS_MINING)
/obj/structure/closet/secure_closet/miner/populate_contents()
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 761ccd7b7ee..c4d79217b0f 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/crates.dmi b/icons/obj/crates.dmi
index 9ec95b4f300..ec5cf02e71d 100644
Binary files a/icons/obj/crates.dmi and b/icons/obj/crates.dmi differ
diff --git a/icons/obj/guncabinet.dmi b/icons/obj/guncabinet.dmi
index e98f5d9ee76..5e4c055522f 100644
Binary files a/icons/obj/guncabinet.dmi and b/icons/obj/guncabinet.dmi differ
diff --git a/icons/obj/walllocker.dmi b/icons/obj/walllocker.dmi
index 3eb10b14406..89f45dc995e 100644
Binary files a/icons/obj/walllocker.dmi and b/icons/obj/walllocker.dmi differ