cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 22:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

HERE COME THE CLOSETS

Browse Source
This commit is contained in:
S34NW
2021-09-27 19:33:42 +01:00
parent eef189cb61
commit 1c867b414c
32 changed files with 157 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -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/is_wardrobe
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,11 @@
// Please dont override this unless you absolutely have to
/obj/structure/closet/Initialize(mapload)
. = ..()
icon_closed = "[icon_state]"
if(!is_wardrobe)
icon_opened = "[icon_state]_open"
else
icon_opened = "generic_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 +40,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()
@@ -50,6 +56,8 @@
// Ensure the storage cap is respected
if(++itemcount >= storage_capacity)
break
if(istype(src, /obj/structure/closet/secure_closet/guncabinet))
update_icon()
// Fix for #383 - C4 deleting fridges with corpses
/obj/structure/closet/Destroy()
@@ -95,10 +103,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 +146,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 +303,18 @@
to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
/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()
overlays.Cut()
if(opened)
return
if(welded)
overlays += "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,6 @@
desc = "A storage unit that moves and stores through the fourth dimension."
density = 0
icon_state = "bluespace"
icon_closed = "bluespace"
icon_opened = "bluespaceopen"
storage_capacity = 60
var/materials = list(MAT_METAL = 5000, MAT_PLASMA = 2500, MAT_TITANIUM = 500, MAT_BLUESPACE = 500)
@@ -392,13 +403,13 @@
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
/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"
/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 +423,4 @@
/obj/structure/closet/bluespace/close()
. = ..()
density = 0
density = FALSE

2
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
View File

@@ -3,8 +3,6 @@
desc = "Just a box..."
icon = 'icons/obj/cardboard_boxes.dmi'
icon_state = "cardboard"
icon_opened = "cardboard_open"
icon_closed = "cardboard"
resistance_flags = FLAMMABLE
max_integrity = 70
integrity_failure = 0

4
code/game/objects/structures/crates_lockers/closets/coffin.dm
View File

@@ -2,8 +2,6 @@
name = "coffin"
desc = "It's a burial receptacle for the dearly departed."
icon_state = "coffin"
icon_closed = "coffin"
icon_opened = "coffin_open"
resistance_flags = FLAMMABLE
max_integrity = 70
material_drop = /obj/item/stack/sheet/wood
@@ -21,8 +19,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

2
code/game/objects/structures/crates_lockers/closets/crittercrate.dm
View File

@@ -2,6 +2,4 @@
name = "critter crate"
desc = "A crate which can sustain life for a while."
icon_state = "critter"
icon_opened = "critteropen"
icon_closed = "critter"
material_drop = /obj/item/stack/sheet/wood

6
code/game/objects/structures/crates_lockers/closets/fitness.dm
View File

@@ -2,7 +2,7 @@
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
icon_state = "mixed"
icon_closed = "mixed"
is_wardrobe = TRUE
/obj/structure/closet/athletic_mixed/populate_contents()
new /obj/item/clothing/under/shorts/grey(src)
@@ -42,7 +42,7 @@
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_state = "red"
icon_closed = "red"
is_wardrobe = TRUE
/obj/structure/closet/lasertag/red/populate_contents()
new /obj/item/gun/energy/laser/tag/red(src)
@@ -57,7 +57,7 @@
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_state = "blue"
icon_closed = "blue"
is_wardrobe = TRUE
/obj/structure/closet/lasertag/blue/populate_contents()
new /obj/item/gun/energy/laser/tag/blue(src)

19
code/game/objects/structures/crates_lockers/closets/gimmick.dm
View File

@@ -1,9 +1,7 @@
/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"
resistance_flags = FLAMMABLE
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
@@ -20,25 +18,18 @@
/obj/structure/closet/acloset
name = "strange closet"
desc = "It looks alien!"
icon_state = "acloset"
icon_closed = "acloset"
icon_opened = "aclosetopen"
icon_state = "alien"
/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"
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"
/obj/structure/closet/gimmick/russian/populate_contents()
new /obj/item/clothing/head/ushanka(src)
@@ -57,8 +48,6 @@
name = "tacticool gear closet"
desc = "It's a storage unit for Tacticool gear."
icon_state = "syndicate1"
icon_closed = "syndicate1"
icon_opened = "syndicate1open"
/obj/structure/closet/gimmick/tacticool/populate_contents()
new /obj/item/clothing/glasses/eyepatch(src)
@@ -81,8 +70,6 @@
name = "\improper Thunderdome closet"
desc = "Everything you need!"
icon_state = "syndicate"
icon_closed = "syndicate"
icon_opened = "syndicateopen"
anchored = 1
/obj/structure/closet/thunderdome/tdred
@@ -111,8 +98,6 @@
/obj/structure/closet/thunderdome/tdgreen
name = "green-team Thunderdome closet"
icon_state = "syndicate1"
icon_closed = "syndicate1"
icon_opened = "syndicate1open"
/obj/structure/closet/thunderdome/tdgreen/populate_contents()
new /obj/item/clothing/suit/armor/tdome/green(src)

10
code/game/objects/structures/crates_lockers/closets/job_closets.dm
View File

@@ -12,7 +12,7 @@
name = "formal closet"
desc = "It's a storage unit for formal clothing."
icon_state = "black"
icon_closed = "black"
is_wardrobe = TRUE
/obj/structure/closet/gmcloset/populate_contents()
new /obj/item/clothing/head/that(src)
@@ -39,7 +39,7 @@
name = "chef's closet"
desc = "It's a storage unit for foodservice garments."
icon_state = "black"
icon_closed = "black"
is_wardrobe = TRUE
/obj/structure/closet/chefcloset/populate_contents()
new /obj/item/clothing/under/waiter(src)
@@ -66,7 +66,7 @@
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
icon_state = "mixed"
icon_closed = "mixed"
is_wardrobe = TRUE
/obj/structure/closet/jcloset/populate_contents()
new /obj/item/flashlight(src)
@@ -106,7 +106,7 @@
name = "legal closet"
desc = "It's a storage unit for courtroom apparel and items."
icon_state = "blue"
icon_closed = "blue"
is_wardrobe = TRUE
/obj/structure/closet/lawcloset/populate_contents()
new /obj/item/storage/box/tapes(src)
@@ -131,7 +131,7 @@
name = "paramedic wardrobe"
desc = "It's a storage unit for paramedic equipment."
icon_state = "blue"
icon_closed = "blue"
is_wardrobe = TRUE
/obj/structure/closet/paramedic/populate_contents()

27
code/game/objects/structures/crates_lockers/closets/l3closet.dm
View File

@@ -2,29 +2,21 @@
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"
/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"
icon_state = "bio"
/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"
/obj/structure/closet/l3closet/virology/populate_contents()
new /obj/item/storage/bag/bio( src )
@@ -33,31 +25,22 @@
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"
/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"
/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"
/obj/structure/closet/l3closet/scientist/populate_contents()
new /obj/item/storage/bag/bio( src )

2
code/game/objects/structures/crates_lockers/closets/malfunction.dm
View File

@@ -2,8 +2,6 @@
/obj/structure/closet/malf/suits
desc = "It's a storage unit for operational gear."
icon_state = "syndicate"
icon_closed = "syndicate"
icon_opened = "syndicateopen"
/obj/structure/closet/malf/suits/populate_contents()
new /obj/item/tank/jetpack/void(src)

20
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
View File

@@ -1,12 +1,7 @@
/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"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
@@ -27,13 +22,8 @@
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
/obj/structure/closet/secure_closet/bar/update_icon()
if(broken)
icon_state = icon_broken
if(!opened)
icon_state = icon_closed
else
if(!opened)
if(locked)
icon_state = icon_locked
else
icon_state = icon_closed
else
icon_state = icon_opened
icon_state = icon_opened
update_overlays()

14
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View File

@@ -1,12 +1,7 @@
/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"
/obj/structure/closet/secure_closet/cargotech/populate_contents()
new /obj/item/clothing/under/rank/cargotech(src)
@@ -21,12 +16,7 @@
/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"
/obj/structure/closet/secure_closet/quartermaster/populate_contents()
new /obj/item/clothing/under/rank/cargo(src)

7
code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
View File

@@ -2,12 +2,7 @@
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"
/obj/structure/closet/secure_closet/chaplain/populate_contents()
new /obj/item/clothing/under/rank/chaplain(src)

1
code/game/objects/structures/crates_lockers/closets/secure/depot.dm
View File

@@ -1,4 +1,3 @@
/obj/structure/closet/secure_closet/syndicate/depot
name = "depot supply closet"
desc = ""

35
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View File

@@ -1,12 +1,7 @@
/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"
/obj/structure/closet/secure_closet/engineering_chief/populate_contents()
if(prob(50))
@@ -46,12 +41,7 @@
/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"
/obj/structure/closet/secure_closet/engineering_electrical/populate_contents()
new /obj/item/clothing/gloves/color/yellow(src)
@@ -71,12 +61,7 @@
/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"
/obj/structure/closet/secure_closet/engineering_welding/populate_contents()
new /obj/item/clothing/head/welding(src)
@@ -90,12 +75,7 @@
/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"
/obj/structure/closet/secure_closet/engineering_personal/populate_contents()
if(prob(50))
@@ -118,12 +98,7 @@
/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"
/obj/structure/closet/secure_closet/atmos_personal/populate_contents()
new /obj/item/radio/headset/headset_eng(src)

38
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
View File

@@ -2,19 +2,11 @@
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
if(!opened)
icon_state = icon_closed
else
if(!opened)
if(locked)
icon_state = icon_locked
else
icon_state = icon_closed
if(welded)
overlays += "welded"
else
icon_state = icon_opened
icon_state = icon_opened
update_overlays()
/obj/structure/closet/secure_closet/freezer/ex_act(severity)
// IF INDIANA JONES CAN DO IT SO CAN YOU
@@ -23,7 +15,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 +44,7 @@
/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"
/obj/structure/closet/secure_closet/freezer/meat/populate_contents()
for(var/i in 1 to 4)
@@ -70,12 +56,7 @@
/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"
/obj/structure/closet/secure_closet/freezer/fridge/populate_contents()
for(var/i in 1 to 5)
@@ -90,12 +71,7 @@
/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"
req_access = list(ACCESS_HEADS_VAULT)
/obj/structure/closet/secure_closet/freezer/money/populate_contents()

29
code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
View File

@@ -3,21 +3,22 @@
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()
/obj/structure/closet/secure_closet/guncabinet/emag_act(mob/user)
if(!broken)
broken = TRUE
locked = FALSE
to_chat(user, "<span class='notice'>You break the lock on [src].</span>")
update_icon()
/obj/structure/closet/secure_closet/guncabinet/update_overlays()
overlays.Cut()
if(opened)
overlays += icon(icon,"door_open")
else
if(!opened)
var/lazors = 0
var/shottas = 0
for(var/obj/item/gun/G in contents)
@@ -27,7 +28,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 +40,9 @@
gun.pixel_x = i*4
overlays += gun
overlays += icon(src.icon,"door")
overlays += "door"
if(broken)
overlays += icon(src.icon,"broken")
overlays += "off"
else if(locked)
overlays += icon(src.icon,"locked")
else
overlays += icon(src.icon,"open")
overlays += "locked"

8
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
View File

@@ -1,13 +1,7 @@
/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"
/obj/structure/closet/secure_closet/hydroponics/populate_contents()
switch(rand(1,2))

90
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -1,12 +1,7 @@
/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"
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/medical1/populate_contents()
@@ -28,12 +23,7 @@
/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"
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/populate_contents()
@@ -48,12 +38,7 @@
/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"
/obj/structure/closet/secure_closet/medical3/populate_contents()
if(prob(50))
@@ -78,12 +63,7 @@
/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"
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/exam/populate_contents()
@@ -127,12 +107,7 @@
/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"
/obj/structure/closet/secure_closet/psychiatrist/populate_contents()
new /obj/item/clothing/suit/straight_jacket(src)
@@ -150,12 +125,7 @@
/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"
/obj/structure/closet/secure_closet/CMO/populate_contents()
if(prob(50))
@@ -207,12 +177,7 @@
/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"
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/chemical/populate_contents()
@@ -221,42 +186,10 @@
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"
req_access = list(ACCESS_PARAMEDIC)
/obj/structure/closet/secure_closet/paramedic/populate_contents()
@@ -270,12 +203,7 @@
/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"
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/reagents/populate_contents()

14
code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
View File

@@ -1,12 +1,7 @@
/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"
/obj/structure/closet/secure_closet/clown/populate_contents()
new /obj/item/storage/backpack/clown(src)
@@ -26,12 +21,7 @@
/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"
/obj/structure/closet/secure_closet/mime/populate_contents()
new /obj/item/clothing/head/beret(src)

23
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
View File

@@ -24,12 +24,7 @@
/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"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
@@ -38,16 +33,11 @@
close_sound_volume = 50
/obj/structure/closet/secure_closet/personal/cabinet/update_icon()
if(broken)
icon_state = icon_broken
if(!opened)
icon_state = icon_closed
else
if(!opened)
if(locked)
icon_state = icon_locked
else
icon_state = icon_closed
else
icon_state = icon_opened
icon_state = icon_opened
update_overlays()
/obj/structure/closet/secure_closet/personal/cabinet/populate_contents()
new /obj/item/storage/backpack/satchel/withwallet( src )
@@ -72,8 +62,9 @@
//they can open all lockers, or nobody owns this, or they own this locker
locked = !locked
if(locked)
icon_state = icon_locked
overlays += "locked"
else
overlays += "unlocked"
icon_state = icon_closed
registered_name = null
desc = initial(desc)

28
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
View File

@@ -1,12 +1,7 @@
/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"
/obj/structure/closet/secure_closet/scientist/populate_contents()
new /obj/item/storage/backpack/science(src)
@@ -25,12 +20,7 @@
/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"
/obj/structure/closet/secure_closet/roboticist/populate_contents()
new /obj/item/storage/backpack(src)
@@ -47,12 +37,7 @@
/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"
/obj/structure/closet/secure_closet/RD/populate_contents()
new /obj/item/clothing/suit/bio_suit/scientist(src)
@@ -77,12 +62,7 @@
/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"
req_access = list(ACCESS_TOX_STORAGE)
/obj/structure/closet/secure_closet/research_reagents/populate_contents()

68
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
View File

@@ -2,36 +2,30 @@
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"
density = TRUE
opened = FALSE
locked = TRUE
broken = FALSE
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 +72,9 @@
if(!broken)
broken = TRUE
locked = FALSE
icon_state = icon_off
flick(icon_broken, src)
overlays += "sparking"
to_chat(user, "<span class='notice'>You break the lock on [src].</span>")
addtimer(CALLBACK(src, .proc/update_icon), 1 SECONDS)
/obj/structure/closet/secure_closet/attack_hand(mob/user)
add_fingerprint(user)
@@ -103,17 +97,26 @@
else
to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
/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()
/obj/structure/closet/secure_closet/update_icon()
if(!opened)
if(locked)
icon_state = icon_locked
else
icon_state = icon_closed
if(welded)
overlays += "welded"
icon_state = icon_closed
update_overlays()
return
icon_state = icon_opened
update_overlays()
/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)
overlays.Cut()
if(opened)
return
if(welded)
overlays += "welded"
if(broken)
return
if(locked)
overlays += "locked"
else
icon_state = icon_opened
overlays += "unlocked"
/obj/structure/closet/secure_closet/container_resist(mob/living/L)
var/breakout_time = 2 //2 minutes by default
@@ -141,14 +144,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, "<span class='warning'>You successfully break out!</span>")
for(var/mob/O in viewers(L.loc))

117
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -1,12 +1,7 @@
/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"
/obj/structure/closet/secure_closet/captains/populate_contents()
if(prob(50))
@@ -39,12 +34,7 @@
/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"
/obj/structure/closet/secure_closet/hop/populate_contents()
new /obj/item/clothing/glasses/hud/skills/sunglasses(src)
@@ -65,12 +55,7 @@
/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"
/obj/structure/closet/secure_closet/hop2/populate_contents()
new /obj/item/clothing/under/rank/head_of_personnel(src)
@@ -91,12 +76,7 @@
/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"
/obj/structure/closet/secure_closet/hos/populate_contents()
if(prob(50))
@@ -130,12 +110,7 @@
/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"
/obj/structure/closet/secure_closet/warden/populate_contents()
if(prob(50))
@@ -167,12 +142,7 @@
/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"
/obj/structure/closet/secure_closet/security/populate_contents()
if(prob(50))
@@ -197,12 +167,7 @@
/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"
/obj/structure/closet/secure_closet/brigdoc/populate_contents()
if(prob(50))
@@ -226,12 +191,7 @@
/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"
/obj/structure/closet/secure_closet/blueshield/populate_contents()
new /obj/item/storage/briefcase(src)
@@ -260,12 +220,7 @@
/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"
/obj/structure/closet/secure_closet/ntrep/populate_contents()
new /obj/item/book/manual/faxes(src)
@@ -317,12 +272,7 @@
/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"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
@@ -352,19 +302,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)
@@ -401,42 +338,10 @@
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"
/obj/structure/closet/secure_closet/magistrate/populate_contents()
new /obj/item/book/manual/faxes(src)

3
code/game/objects/structures/crates_lockers/closets/syndicate.dm
View File

@@ -2,9 +2,6 @@
name = "armoury closet"
desc = "Why is this here?"
icon_state = "syndicate"
icon_closed = "syndicate"
icon_opened = "syndicateopen"
/obj/structure/closet/syndicate/personal
desc = "It's a storage unit for operative gear."

62
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
View File

@@ -16,8 +16,6 @@
name = "emergency closet"
desc = "It's a storage unit for emergency breathmasks and o2 tanks."
icon_state = "emergency"
icon_closed = "emergency"
icon_opened = "emergencyopen"
/obj/structure/closet/emcloset/anchored
anchored = TRUE
@@ -62,9 +60,7 @@
/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"
/obj/structure/closet/firecloset/populate_contents()
new /obj/item/extinguisher(src)
@@ -88,9 +84,7 @@
/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"
/obj/structure/closet/toolcloset/populate_contents()
if(prob(40))
@@ -131,9 +125,7 @@
/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"
/obj/structure/closet/radiation/populate_contents()
new /obj/item/geiger_counter(src)
@@ -146,9 +138,7 @@
/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"
/obj/structure/closet/bombcloset/populate_contents()
new /obj/item/clothing/suit/bomb_suit( src )
@@ -160,52 +150,10 @@
/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"
/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

28
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -1,8 +1,8 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue Nanotrasen attire."
is_wardrobe = TRUE
icon_state = "blue"
icon_closed = "blue"
/obj/structure/closet/wardrobe/generic
// Identical to the base wardrobe, aside from containing some stuff.
@@ -22,7 +22,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 +57,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 +69,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 +81,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 +101,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 +113,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 +129,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 +142,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 +154,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 +177,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 +200,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 +212,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 +240,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 +255,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 +277,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 +294,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 +317,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 +334,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 +355,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 +381,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 +403,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 +423,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))