cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes closets/crates like boxes

Browse Source 
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
This commit is contained in:
Arokha Sieyes
2018-05-24 17:26:17 -04:00
parent 418af6376d
commit f9b409549e
29 changed files with 1595 additions and 2164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/objects/items/poi_items.dm
View File

@@ -28,14 +28,8 @@
icon_closed = "poireactor" icon_closed = "poireactor"
climbable = 0 climbable = 0
/obj/structure/closet/crate/oldreactor/New() starts_with = list(
..() /obj/item/weapon/fuel_assembly/deuterium = 6)
new /obj/item/weapon/fuel_assembly/deuterium(src)
new /obj/item/weapon/fuel_assembly/deuterium(src)
new /obj/item/weapon/fuel_assembly/deuterium(src)
new /obj/item/weapon/fuel_assembly/deuterium(src)
new /obj/item/weapon/fuel_assembly/deuterium(src)
new /obj/item/weapon/fuel_assembly/deuterium(src)
/obj/item/poi/brokenoldreactor /obj/item/poi/brokenoldreactor
icon_state = "poireactor_broken" icon_state = "poireactor_broken"
@@ -58,8 +52,8 @@
/obj/structure/largecrate/animal/crashedshuttle /obj/structure/largecrate/animal/crashedshuttle
name = "SCP" name = "SCP"
/obj/structure/largecrate/animal/crashedshuttle/New() /obj/structure/largecrate/animal/crashedshuttle/initialize()
held_type = pick(/mob/living/simple_animal/hostile/statue, /obj/item/cursed_marble) starts_with = pick(/mob/living/simple_animal/hostile/statue, /obj/item/cursed_marble)
name = pick("Spicy Crust Pizzeria", "Soap and Care Products", "Sally's Computer Parts", "Steve's Chocolate Pastries", "Smith & Christian's Plastics","Standard Containers & Packaging Co.", "Sanitary Chemical Purgation (LTD)") name = pick("Spicy Crust Pizzeria", "Soap and Care Products", "Sally's Computer Parts", "Steve's Chocolate Pastries", "Smith & Christian's Plastics","Standard Containers & Packaging Co.", "Sanitary Chemical Purgation (LTD)")
name += " delivery crate" name += " delivery crate"
..() return ..()

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

@@ -21,12 +21,13 @@
var/store_items = 1 var/store_items = 1
var/store_mobs = 1 var/store_mobs = 1
var/list/will_contain var/list/starts_with
/obj/structure/closet/initialize() /obj/structure/closet/initialize()
. = ..() . = ..()
if(will_contain) if(starts_with)
create_objects_in_loc(src, will_contain) create_objects_in_loc(src, starts_with)
starts_with = null
if(!opened) // if closed, any item at the crate's loc is put in the contents if(!opened) // if closed, any item at the crate's loc is put in the contents
var/obj/item/I var/obj/item/I

337
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
View File

@@ -14,91 +14,65 @@
var/locked = 1 var/locked = 1
var/smashed = 0 var/smashed = 0
New() starts_with = list(/obj/item/weapon/material/twohanded/fireaxe)
..()
fireaxe = new /obj/item/weapon/material/twohanded/fireaxe(src)
attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri /obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
//..() //That's very useful, Erro //..() //That's very useful, Erro
// This could stand to be put further in, made better, etc. but fuck you. Fuck whoever // This could stand to be put further in, made better, etc. but fuck you. Fuck whoever
// wrote this code. Fuck everything about this object. I hope you step on a Lego. // wrote this code. Fuck everything about this object. I hope you step on a Lego.
user.setClickCooldown(10) user.setClickCooldown(10)
// Seriously why the fuck is this even a closet aghasjdhasd I hate you // Seriously why the fuck is this even a closet aghasjdhasd I hate you
var/hasaxe = 0 //gonna come in handy later~ // FUCK YOUR TILDES. var/hasaxe = 0 //gonna come in handy later~ // FUCK YOUR TILDES.
if(fireaxe) if(fireaxe)
hasaxe = 1 hasaxe = 1
if (isrobot(usr) || src.locked) if (isrobot(usr) || src.locked)
if(istype(O, /obj/item/device/multitool)) if(istype(O, /obj/item/device/multitool))
user << "<span class='warning'>Resetting circuitry...</span>" user << "<span class='warning'>Resetting circuitry...</span>"
playsound(user, 'sound/machines/lockreset.ogg', 50, 1) playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
if(do_after(user, 20 * O.toolspeed)) if(do_after(user, 20 * O.toolspeed))
src.locked = 0 src.locked = 0
to_chat(user, "<span class = 'caution'> You disable the locking modules.</span>") to_chat(user, "<span class = 'caution'> You disable the locking modules.</span>")
update_icon()
return
else if(istype(O, /obj/item/weapon))
var/obj/item/weapon/W = O
if(src.smashed || src.localopened)
if(localopened)
localopened = 0
icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
return
else
playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time
if(W.force < 15)
to_chat(user, "<span class='notice'>The cabinet's protective glass glances off the hit.</span>")
else
src.hitstaken++
if(src.hitstaken == 4)
playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
src.smashed = 1
src.locked = 0
src.localopened = 1
update_icon() update_icon()
return return
if (istype(O, /obj/item/weapon/material/twohanded/fireaxe) && src.localopened) else if(istype(O, /obj/item/weapon))
if(!fireaxe) var/obj/item/weapon/W = O
if(O:wielded) if(src.smashed || src.localopened)
O:wielded = 0
O.update_icon()
//to_chat(user, "<span class='warning'>Unwield the axe first.</span>")
//return
fireaxe = O
user.remove_from_mob(O)
src.contents += O
to_chat(user, "<span class='notice'>You place the fire axe back in the [src.name].</span>")
update_icon()
else
if(src.smashed)
return
else
localopened = !localopened
if(localopened)
icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
else
icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
else
if(src.smashed)
return
if(istype(O, /obj/item/device/multitool))
if(localopened) if(localopened)
localopened = 0 localopened = 0
icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed) icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon() spawn(10) update_icon()
return return
else else
to_chat(user, "<span class='warning'>Resetting circuitry...</span>") playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time
playsound(user, 'sound/machines/lockenable.ogg', 50, 1) if(W.force < 15)
if(do_after(user,20 * O.toolspeed)) to_chat(user, "<span class='notice'>The cabinet's protective glass glances off the hit.</span>")
src.locked = 1 else
to_chat(user, "<span class = 'caution'> You re-enable the locking modules.</span>") src.hitstaken++
return if(src.hitstaken == 4)
playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
src.smashed = 1
src.locked = 0
src.localopened = 1
update_icon()
return
if (istype(O, /obj/item/weapon/material/twohanded/fireaxe) && src.localopened)
if(!fireaxe)
if(O:wielded)
O:wielded = 0
O.update_icon()
//to_chat(user, "<span class='warning'>Unwield the axe first.</span>")
//return
fireaxe = O
user.remove_from_mob(O)
src.contents += O
to_chat(user, "<span class='notice'>You place the fire axe back in the [src.name].</span>")
update_icon()
else
if(src.smashed)
return
else else
localopened = !localopened localopened = !localopened
if(localopened) if(localopened)
@@ -107,108 +81,129 @@
else else
icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed) icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon() spawn(10) update_icon()
else
attack_hand(mob/user as mob)
var/hasaxe = 0
if(fireaxe)
hasaxe = 1
if(src.locked)
to_chat(user, "<span class='warning'>The cabinet won't budge!</span>")
return
if(localopened)
if(fireaxe)
user.put_in_hands(fireaxe)
fireaxe = null
to_chat (user, "<span class='notice'>You take the fire axe from the [name].</span>")
src.add_fingerprint(user)
update_icon()
else
if(src.smashed)
return
else
localopened = !localopened
if(localopened)
src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
else
src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
else
localopened = !localopened //I'm pretty sure we don't need an if(src.smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri
if(localopened)
src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
else
src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
attack_tk(mob/user as mob)
if(localopened && fireaxe)
fireaxe.forceMove(loc)
to_chat(user, "<span class='notice'>You telekinetically remove the fire axe.</span>")
fireaxe = null
update_icon()
return
attack_hand(user)
verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri
set name = "Open/Close"
set category = "Object"
if (isrobot(usr) || src.locked || src.smashed)
if(src.locked)
to_chat(usr, "<span class='warning'>The cabinet won't budge!</span>")
else if(src.smashed)
to_chat(usr, "<span class='notice'>The protective glass is broken!</span>")
return
localopened = !localopened
update_icon()
verb/remove_fire_axe()
set name = "Remove Fire Axe"
set category = "Object"
if (isrobot(usr))
return
if (localopened)
if(fireaxe)
usr.put_in_hands(fireaxe)
fireaxe = null
to_chat(usr, "<span class='notice'>You take the Fire axe from the [name].</span>")
else
to_chat(usr, "<span class='notice'>The [src.name] is empty.</span>")
else
to_chat(usr, "<span class='notice'>The [src.name] is closed.</span>")
update_icon()
attack_ai(mob/user as mob)
if(src.smashed) if(src.smashed)
to_chat(user, "<span class='warning'>The security of the cabinet is compromised.</span>")
return return
else if(istype(O, /obj/item/device/multitool))
locked = !locked if(localopened)
if(locked) localopened = 0
to_chat(user, "<span class='warning'>Cabinet locked.</span>") icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
return
else else
to_chat(user, "<span class='notice'>Cabinet unlocked.</span>") to_chat(user, "<span class='warning'>Resetting circuitry...</span>")
return playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
if(do_after(user,20 * O.toolspeed))
src.locked = 1
to_chat(user, "<span class = 'caution'> You re-enable the locking modules.</span>")
return
else
localopened = !localopened
if(localopened)
icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
else
icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
var/hasaxe = 0 /obj/structure/closet/fireaxecabinet/attack_hand(mob/user as mob)
var/hasaxe = 0
if(fireaxe)
hasaxe = 1
if(src.locked)
to_chat(user, "<span class='warning'>The cabinet won't budge!</span>")
return
if(localopened)
if(fireaxe) if(fireaxe)
hasaxe = 1 user.put_in_hands(fireaxe)
icon_state = text("fireaxe[][][][]",hasaxe,src.localopened,src.hitstaken,src.smashed) fireaxe = null
to_chat (user, "<span class='notice'>You take the fire axe from the [name].</span>")
src.add_fingerprint(user)
update_icon()
else
if(src.smashed)
return
else
localopened = !localopened
if(localopened)
src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
else
src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
open() else
localopened = !localopened //I'm pretty sure we don't need an if(src.smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri
if(localopened)
src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
else
src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
spawn(10) update_icon()
/obj/structure/closet/fireaxecabinet/attack_tk(mob/user as mob)
if(localopened && fireaxe)
fireaxe.forceMove(loc)
to_chat(user, "<span class='notice'>You telekinetically remove the fire axe.</span>")
fireaxe = null
update_icon()
return
attack_hand(user)
/obj/structure/closet/fireaxecabinet/verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri
set name = "Open/Close"
set category = "Object"
if (isrobot(usr) || src.locked || src.smashed)
if(src.locked)
to_chat(usr, "<span class='warning'>The cabinet won't budge!</span>")
else if(src.smashed)
to_chat(usr, "<span class='notice'>The protective glass is broken!</span>")
return return
close() localopened = !localopened
update_icon()
/obj/structure/closet/fireaxecabinet/verb/remove_fire_axe()
set name = "Remove Fire Axe"
set category = "Object"
if (isrobot(usr))
return return
if (localopened)
if(fireaxe)
usr.put_in_hands(fireaxe)
fireaxe = null
to_chat(usr, "<span class='notice'>You take the Fire axe from the [name].</span>")
else
to_chat(usr, "<span class='notice'>The [src.name] is empty.</span>")
else
to_chat(usr, "<span class='notice'>The [src.name] is closed.</span>")
update_icon()
/obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob)
if(src.smashed)
to_chat(user, "<span class='warning'>The security of the cabinet is compromised.</span>")
return
else
locked = !locked
if(locked)
to_chat(user, "<span class='warning'>Cabinet locked.</span>")
else
to_chat(user, "<span class='notice'>Cabinet unlocked.</span>")
return
/obj/structure/closet/fireaxecabinet/update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
var/hasaxe = 0
if(fireaxe)
hasaxe = 1
icon_state = text("fireaxe[][][][]",hasaxe,src.localopened,src.hitstaken,src.smashed)
/obj/structure/closet/fireaxecabinet/open()
return
/obj/structure/closet/fireaxecabinet/close()
return

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

@@ -4,49 +4,41 @@
icon_state = "mixed" icon_state = "mixed"
icon_closed = "mixed" icon_closed = "mixed"
/obj/structure/closet/athletic_mixed/New() starts_with = list(
..() /obj/item/clothing/under/shorts/grey,
new /obj/item/clothing/under/shorts/grey(src) /obj/item/clothing/under/shorts/black,
new /obj/item/clothing/under/shorts/black(src) /obj/item/clothing/under/shorts/red,
new /obj/item/clothing/under/shorts/red(src) /obj/item/clothing/under/shorts/blue,
new /obj/item/clothing/under/shorts/blue(src) /obj/item/clothing/under/shorts/green,
new /obj/item/clothing/under/shorts/green(src) /obj/item/clothing/under/swimsuit/red,
new /obj/item/clothing/under/swimsuit/red(src) /obj/item/clothing/under/swimsuit/black,
new /obj/item/clothing/under/swimsuit/black(src) /obj/item/clothing/under/swimsuit/blue,
new /obj/item/clothing/under/swimsuit/blue(src) /obj/item/clothing/under/swimsuit/green,
new /obj/item/clothing/under/swimsuit/green(src) /obj/item/clothing/under/swimsuit/purple,
new /obj/item/clothing/under/swimsuit/purple(src) /obj/item/clothing/under/swimsuit/striped,
new /obj/item/clothing/under/swimsuit/striped(src) /obj/item/clothing/under/swimsuit/white,
new /obj/item/clothing/under/swimsuit/white(src) /obj/item/clothing/under/swimsuit/earth,
new /obj/item/clothing/under/swimsuit/earth(src) //Maybe at some point make it randomly choose swimsuits, so that it doesn't overflow as we add more. /obj/item/clothing/mask/snorkel = 2,
new /obj/item/clothing/mask/snorkel(src) /obj/item/clothing/shoes/swimmingfins = 2)
new /obj/item/clothing/mask/snorkel(src)
new /obj/item/clothing/shoes/swimmingfins(src)
new /obj/item/clothing/shoes/swimmingfins(src)
/obj/structure/closet/boxinggloves /obj/structure/closet/boxinggloves
name = "boxing gloves" name = "boxing gloves"
desc = "It's a storage unit for gloves for use in the boxing ring." desc = "It's a storage unit for gloves for use in the boxing ring."
/obj/structure/closet/boxinggloves/New() starts_with = list(
..() /obj/item/clothing/gloves/boxing/blue,
new /obj/item/clothing/gloves/boxing/blue(src) /obj/item/clothing/gloves/boxing/green,
new /obj/item/clothing/gloves/boxing/green(src) /obj/item/clothing/gloves/boxing/yellow,
new /obj/item/clothing/gloves/boxing/yellow(src) /obj/item/clothing/gloves/boxing)
new /obj/item/clothing/gloves/boxing(src)
/obj/structure/closet/masks /obj/structure/closet/masks
name = "mask closet" name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!" desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
/obj/structure/closet/masks/New() starts_with = list(
..() /obj/item/clothing/mask/luchador,
new /obj/item/clothing/mask/luchador(src) /obj/item/clothing/mask/luchador/rudos,
new /obj/item/clothing/mask/luchador/rudos(src) /obj/item/clothing/mask/luchador/tecnicos)
new /obj/item/clothing/mask/luchador/tecnicos(src)
/obj/structure/closet/lasertag/red /obj/structure/closet/lasertag/red
@@ -55,18 +47,9 @@
icon_state = "red" icon_state = "red"
icon_closed = "red" icon_closed = "red"
/obj/structure/closet/lasertag/red/New() starts_with = list(
..() /obj/item/weapon/gun/energy/lasertag/red = 5,
new /obj/item/weapon/gun/energy/lasertag/red(src) /obj/item/clothing/suit/redtag = 5)
new /obj/item/weapon/gun/energy/lasertag/red(src)
new /obj/item/weapon/gun/energy/lasertag/red(src)
new /obj/item/weapon/gun/energy/lasertag/red(src)
new /obj/item/weapon/gun/energy/lasertag/red(src)
new /obj/item/clothing/suit/redtag(src)
new /obj/item/clothing/suit/redtag(src)
new /obj/item/clothing/suit/redtag(src)
new /obj/item/clothing/suit/redtag(src)
new /obj/item/clothing/suit/redtag(src)
/obj/structure/closet/lasertag/blue /obj/structure/closet/lasertag/blue
@@ -75,15 +58,6 @@
icon_state = "blue" icon_state = "blue"
icon_closed = "blue" icon_closed = "blue"
/obj/structure/closet/lasertag/blue/New() starts_with = list(
..() /obj/item/weapon/gun/energy/lasertag/blue = 5,
new /obj/item/weapon/gun/energy/lasertag/blue(src) /obj/item/clothing/suit/bluetag = 5)
new /obj/item/weapon/gun/energy/lasertag/blue(src)
new /obj/item/weapon/gun/energy/lasertag/blue(src)
new /obj/item/weapon/gun/energy/lasertag/blue(src)
new /obj/item/weapon/gun/energy/lasertag/blue(src)
new /obj/item/clothing/suit/bluetag(src)
new /obj/item/clothing/suit/bluetag(src)
new /obj/item/clothing/suit/bluetag(src)
new /obj/item/clothing/suit/bluetag(src)
new /obj/item/clothing/suit/bluetag(src)

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

@@ -34,18 +34,9 @@
icon_closed = "syndicate1" icon_closed = "syndicate1"
icon_opened = "syndicate1open" icon_opened = "syndicate1open"
/obj/structure/closet/gimmick/russian/New() starts_with = list(
..() /obj/item/clothing/head/ushanka = 5,
new /obj/item/clothing/head/ushanka(src) /obj/item/clothing/under/soviet = 5)
new /obj/item/clothing/head/ushanka(src)
new /obj/item/clothing/head/ushanka(src)
new /obj/item/clothing/head/ushanka(src)
new /obj/item/clothing/head/ushanka(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/soviet(src)
/obj/structure/closet/gimmick/tacticool /obj/structure/closet/gimmick/tacticool
@@ -55,22 +46,15 @@
icon_closed = "syndicate1" icon_closed = "syndicate1"
icon_opened = "syndicate1open" icon_opened = "syndicate1open"
/obj/structure/closet/gimmick/tacticool/New() starts_with = list(
..() /obj/item/clothing/glasses/eyepatch,
new /obj/item/clothing/glasses/eyepatch(src) /obj/item/clothing/glasses/sunglasses,
new /obj/item/clothing/glasses/sunglasses(src) /obj/item/clothing/gloves/swat = 2,
new /obj/item/clothing/gloves/swat(src) /obj/item/clothing/head/helmet/swat = 2,
new /obj/item/clothing/gloves/swat(src) /obj/item/clothing/mask/gas = 2,
new /obj/item/clothing/head/helmet/swat(src) /obj/item/clothing/shoes/boots/swat = 2,
new /obj/item/clothing/head/helmet/swat(src) /obj/item/clothing/suit/armor/swat = 2,
new /obj/item/clothing/mask/gas(src) /obj/item/clothing/under/syndicate/tacticool = 2)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/shoes/boots/swat(src)
new /obj/item/clothing/shoes/boots/swat(src)
new /obj/item/clothing/suit/armor/swat(src)
new /obj/item/clothing/suit/armor/swat(src)
new /obj/item/clothing/under/syndicate/tacticool(src)
new /obj/item/clothing/under/syndicate/tacticool(src)
/obj/structure/closet/thunderdome /obj/structure/closet/thunderdome
@@ -81,32 +65,16 @@
icon_opened = "syndicateopen" icon_opened = "syndicateopen"
anchored = 1 anchored = 1
/obj/structure/closet/thunderdome/New()
..()
/obj/structure/closet/thunderdome/tdred /obj/structure/closet/thunderdome/tdred
name = "red-team Thunderdome closet" name = "red-team Thunderdome closet"
/obj/structure/closet/thunderdome/tdred/New() starts_with = list(
..() /obj/item/clothing/suit/armor/tdome/red = 3,
new /obj/item/clothing/suit/armor/tdome/red(src) /obj/item/weapon/melee/energy/sword = 3,
new /obj/item/clothing/suit/armor/tdome/red(src) /obj/item/weapon/gun/energy/laser = 3,
new /obj/item/clothing/suit/armor/tdome/red(src) /obj/item/weapon/melee/baton = 3,
new /obj/item/weapon/melee/energy/sword(src) /obj/item/weapon/storage/box/flashbangs = 3,
new /obj/item/weapon/melee/energy/sword(src) /obj/item/clothing/head/helmet/thunderdome = 3)
new /obj/item/weapon/melee/energy/sword(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
/obj/structure/closet/thunderdome/tdgreen /obj/structure/closet/thunderdome/tdgreen
name = "green-team Thunderdome closet" name = "green-team Thunderdome closet"
@@ -114,26 +82,13 @@
icon_closed = "syndicate1" icon_closed = "syndicate1"
icon_opened = "syndicate1open" icon_opened = "syndicate1open"
/obj/structure/closet/thunderdome/tdgreen/New() starts_with = list(
..() /obj/item/clothing/suit/armor/tdome/green = 3,
new /obj/item/clothing/suit/armor/tdome/green(src) /obj/item/weapon/melee/energy/sword = 3,
new /obj/item/clothing/suit/armor/tdome/green(src) /obj/item/weapon/gun/energy/laser = 3,
new /obj/item/clothing/suit/armor/tdome/green(src) /obj/item/weapon/melee/baton = 3,
new /obj/item/weapon/melee/energy/sword(src) /obj/item/weapon/storage/box/flashbangs = 3,
new /obj/item/weapon/melee/energy/sword(src) /obj/item/clothing/head/helmet/thunderdome = 3)
new /obj/item/weapon/melee/energy/sword(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
/obj/structure/closet/alien /obj/structure/closet/alien
name = "alien container" name = "alien container"

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

@@ -14,29 +14,22 @@
icon_state = "black" icon_state = "black"
icon_closed = "black" icon_closed = "black"
/obj/structure/closet/gmcloset/New() starts_with = list(
..() /obj/item/clothing/head/that = 2,
new /obj/item/clothing/head/that(src) /obj/item/device/radio/headset/headset_service = 2,
new /obj/item/clothing/head/that(src) /obj/item/clothing/head/pin/flower,
new /obj/item/device/radio/headset/headset_service(src) /obj/item/clothing/head/pin/flower/pink,
new /obj/item/device/radio/headset/headset_service(src) /obj/item/clothing/head/pin/flower/yellow,
new /obj/item/clothing/head/pin/flower(src) /obj/item/clothing/head/pin/flower/blue,
new /obj/item/clothing/head/pin/flower/pink(src) /obj/item/clothing/head/pin/pink,
new /obj/item/clothing/head/pin/flower/yellow(src) /obj/item/clothing/head/pin/magnetic,
new /obj/item/clothing/head/pin/flower/blue(src) /obj/item/clothing/under/sl_suit = 2,
new /obj/item/clothing/head/pin/pink(src) /obj/item/clothing/under/rank/bartender = 2,
new /obj/item/clothing/head/pin/magnetic(src) /obj/item/clothing/under/rank/bartender/skirt,
new /obj/item/clothing/under/sl_suit(src) /obj/item/clothing/under/dress/dress_saloon,
new /obj/item/clothing/under/sl_suit(src) /obj/item/clothing/accessory/wcoat = 2,
new /obj/item/clothing/under/rank/bartender(src) /obj/item/clothing/shoes/black = 2,
new /obj/item/clothing/under/rank/bartender(src) /obj/item/clothing/shoes/laceup)
new /obj/item/clothing/under/rank/bartender/skirt(src)
new /obj/item/clothing/under/dress/dress_saloon(src)
new /obj/item/clothing/accessory/wcoat(src)
new /obj/item/clothing/accessory/wcoat(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/laceup(src)
/* /*
* Chef * Chef
@@ -47,19 +40,14 @@
icon_state = "black" icon_state = "black"
icon_closed = "black" icon_closed = "black"
/obj/structure/closet/chefcloset/New() starts_with = list(
..() /obj/item/clothing/under/sundress,
new /obj/item/clothing/under/sundress(src) /obj/item/clothing/under/waiter = 2,
new /obj/item/clothing/under/waiter(src) /obj/item/device/radio/headset/headset_service = 2,
new /obj/item/clothing/under/waiter(src) /obj/item/weapon/storage/box/mousetraps = 2,
new /obj/item/device/radio/headset/headset_service(src) /obj/item/clothing/under/rank/chef,
new /obj/item/device/radio/headset/headset_service(src) /obj/item/clothing/head/chefhat,
new /obj/item/weapon/storage/box/mousetraps(src) /obj/item/weapon/storage/bag/food = 2)
new /obj/item/weapon/storage/box/mousetraps(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/clothing/head/chefhat(src)
new /obj/item/weapon/storage/bag/food(src)
new /obj/item/weapon/storage/bag/food(src)
/* /*
* Janitor * Janitor
@@ -70,24 +58,20 @@
icon_state = "mixed" icon_state = "mixed"
icon_closed = "mixed" icon_closed = "mixed"
/obj/structure/closet/jcloset/New() starts_with = list(
..() /obj/item/clothing/under/rank/janitor,
new /obj/item/clothing/under/rank/janitor(src) /obj/item/clothing/under/dress/maid/janitor,
new /obj/item/clothing/under/dress/maid/janitor(src) /obj/item/device/radio/headset/headset_service,
new /obj/item/device/radio/headset/headset_service(src) /obj/item/weapon/cartridge/janitor,
new /obj/item/weapon/cartridge/janitor(src) /obj/item/clothing/gloves/black,
new /obj/item/clothing/gloves/black(src) /obj/item/clothing/head/soft/purple,
new /obj/item/clothing/head/soft/purple(src) /obj/item/clothing/head/beret/purple,
new /obj/item/clothing/head/beret/purple(src) /obj/item/device/flashlight,
new /obj/item/device/flashlight(src) /obj/item/weapon/caution = 4,
new /obj/item/weapon/caution(src) /obj/item/device/lightreplacer,
new /obj/item/weapon/caution(src) /obj/item/weapon/storage/bag/trash,
new /obj/item/weapon/caution(src) /obj/item/weapon/storage/belt/janitor,
new /obj/item/weapon/caution(src) /obj/item/clothing/shoes/galoshes)
new /obj/item/device/lightreplacer(src)
new /obj/item/weapon/storage/bag/trash(src)
new /obj/item/weapon/storage/belt/janitor(src)
new /obj/item/clothing/shoes/galoshes(src)
/* /*
* Lawyer * Lawyer
@@ -98,43 +82,23 @@
icon_state = "blue" icon_state = "blue"
icon_closed = "blue" icon_closed = "blue"
/obj/structure/closet/lawcloset/New() starts_with = list(
..() /obj/item/clothing/under/lawyer/female = 2,
new /obj/item/clothing/under/lawyer/female(src) /obj/item/clothing/under/lawyer/black = 2,
new /obj/item/clothing/under/lawyer/female(src) /obj/item/clothing/under/lawyer/black/skirt = 2,
new /obj/item/clothing/under/lawyer/black(src) /obj/item/clothing/under/lawyer/red = 2,
new /obj/item/clothing/under/lawyer/black(src) /obj/item/clothing/under/lawyer/red/skirt = 2,
new /obj/item/clothing/under/lawyer/black/skirt(src) /obj/item/clothing/suit/storage/toggle/internalaffairs = 2,
new /obj/item/clothing/under/lawyer/black/skirt(src) /obj/item/clothing/under/lawyer/bluesuit = 2,
new /obj/item/clothing/under/lawyer/red(src) /obj/item/clothing/under/lawyer/bluesuit/skirt = 2,
new /obj/item/clothing/under/lawyer/red(src) /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 2,
new /obj/item/clothing/under/lawyer/red/skirt(src) /obj/item/clothing/under/lawyer/purpsuit = 2,
new /obj/item/clothing/under/lawyer/red/skirt(src) /obj/item/clothing/under/lawyer/purpsuit/skirt = 2,
new /obj/item/clothing/suit/storage/toggle/internalaffairs(src) /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 2,
new /obj/item/clothing/suit/storage/toggle/internalaffairs(src) /obj/item/clothing/shoes/brown = 2,
new /obj/item/clothing/under/lawyer/bluesuit(src) /obj/item/clothing/shoes/black = 2,
new /obj/item/clothing/under/lawyer/bluesuit(src) /obj/item/clothing/shoes/laceup = 2,
new /obj/item/clothing/under/lawyer/bluesuit/skirt(src) /obj/item/clothing/glasses/sunglasses/big = 2,
new /obj/item/clothing/under/lawyer/bluesuit/skirt(src) /obj/item/clothing/under/lawyer/blue = 2,
new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src) /obj/item/clothing/under/lawyer/blue/skirt = 2,
new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src) /obj/item/device/tape/random = 2)
new /obj/item/clothing/under/lawyer/purpsuit(src)
new /obj/item/clothing/under/lawyer/purpsuit(src)
new /obj/item/clothing/under/lawyer/purpsuit/skirt(src)
new /obj/item/clothing/under/lawyer/purpsuit/skirt(src)
new /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket(src)
new /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/glasses/sunglasses/big(src)
new /obj/item/clothing/glasses/sunglasses/big(src)
new /obj/item/clothing/under/lawyer/blue(src)
new /obj/item/clothing/under/lawyer/blue(src)
new /obj/item/clothing/under/lawyer/blue/skirt(src)
new /obj/item/clothing/under/lawyer/blue/skirt(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)

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

@@ -10,10 +10,9 @@
icon_closed = "bio_general" icon_closed = "bio_general"
icon_opened = "bio_generalopen" icon_opened = "bio_generalopen"
/obj/structure/closet/l3closet/general/New() starts_with = list(
..() /obj/item/clothing/suit/bio_suit/general,
new /obj/item/clothing/suit/bio_suit/general(src) /obj/item/clothing/head/bio_hood/general)
new /obj/item/clothing/head/bio_hood/general(src)
/obj/structure/closet/l3closet/virology /obj/structure/closet/l3closet/virology
@@ -21,12 +20,11 @@
icon_closed = "bio_virology" icon_closed = "bio_virology"
icon_opened = "bio_virologyopen" icon_opened = "bio_virologyopen"
/obj/structure/closet/l3closet/virology/New() starts_with = list(
..() /obj/item/clothing/suit/bio_suit/virology,
new /obj/item/clothing/suit/bio_suit/virology(src) /obj/item/clothing/head/bio_hood/virology,
new /obj/item/clothing/head/bio_hood/virology(src) /obj/item/clothing/mask/gas,
new /obj/item/clothing/mask/gas(src) /obj/item/weapon/tank/oxygen)
new /obj/item/weapon/tank/oxygen(src)
/obj/structure/closet/l3closet/security /obj/structure/closet/l3closet/security
@@ -34,27 +32,22 @@
icon_closed = "bio_security" icon_closed = "bio_security"
icon_opened = "bio_securityopen" icon_opened = "bio_securityopen"
/obj/structure/closet/l3closet/security/New() starts_with = list(
..() /obj/item/clothing/suit/bio_suit/security,
new /obj/item/clothing/suit/bio_suit/security(src) /obj/item/clothing/head/bio_hood/security,
new /obj/item/clothing/head/bio_hood/security(src) /obj/item/weapon/gun/energy/taser/xeno/sec)
new /obj/item/weapon/gun/energy/taser/xeno/sec(src)
/obj/structure/closet/l3closet/janitor /obj/structure/closet/l3closet/janitor
icon_state = "bio_janitor" icon_state = "bio_janitor"
icon_closed = "bio_janitor" icon_closed = "bio_janitor"
icon_opened = "bio_janitoropen" icon_opened = "bio_janitoropen"
/obj/structure/closet/l3closet/janitor/New() starts_with = list(
..() /obj/item/clothing/suit/bio_suit/janitor = 2,
new /obj/item/clothing/suit/bio_suit/janitor(src) /obj/item/clothing/head/bio_hood/janitor = 2,
new /obj/item/clothing/suit/bio_suit/janitor(src) /obj/item/clothing/mask/gas = 2,
new /obj/item/clothing/head/bio_hood/janitor(src) /obj/item/weapon/tank/emergency/oxygen/engi = 2)
new /obj/item/clothing/head/bio_hood/janitor(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
/obj/structure/closet/l3closet/scientist /obj/structure/closet/l3closet/scientist
@@ -62,15 +55,14 @@
icon_closed = "bio_scientist" icon_closed = "bio_scientist"
icon_opened = "bio_scientistopen" icon_opened = "bio_scientistopen"
/obj/structure/closet/l3closet/scientist/New() starts_with = list(
..() /obj/item/clothing/suit/bio_suit/scientist,
new /obj/item/clothing/suit/bio_suit/scientist(src) /obj/item/clothing/head/bio_hood/scientist)
new /obj/item/clothing/head/bio_hood/scientist(src)
/obj/structure/closet/l3closet/scientist/double/New() /obj/structure/closet/l3closet/scientist/double
..() starts_with = list(
new /obj/item/clothing/suit/bio_suit/scientist(src) /obj/item/clothing/suit/bio_suit/scientist = 2,
new /obj/item/clothing/head/bio_hood/scientist(src) /obj/item/clothing/head/bio_hood/scientist = 2)
/obj/structure/closet/l3closet/medical /obj/structure/closet/l3closet/medical
@@ -78,14 +70,7 @@
icon_closed = "bio_scientist" icon_closed = "bio_scientist"
icon_opened = "bio_scientistopen" icon_opened = "bio_scientistopen"
/obj/structure/closet/l3closet/medical/New() starts_with = list(
..() /obj/item/clothing/suit/bio_suit/general = 3,
new /obj/item/clothing/suit/bio_suit/general(src) /obj/item/clothing/head/bio_hood/general = 3,
new /obj/item/clothing/suit/bio_suit/general(src) /obj/item/clothing/mask/gas = 3)
new /obj/item/clothing/suit/bio_suit/general(src)
new /obj/item/clothing/head/bio_hood/general(src)
new /obj/item/clothing/head/bio_hood/general(src)
new /obj/item/clothing/head/bio_hood/general(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas(src)

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

@@ -4,12 +4,11 @@
icon_closed = "syndicate" icon_closed = "syndicate"
icon_opened = "syndicateopen" icon_opened = "syndicateopen"
/obj/structure/closet/malf/suits/New() starts_with = list(
..() /obj/item/weapon/tank/jetpack/void,
new /obj/item/weapon/tank/jetpack/void(src) /obj/item/clothing/mask/breath,
new /obj/item/clothing/mask/breath(src) /obj/item/clothing/head/helmet/space/void,
new /obj/item/clothing/head/helmet/space/void(src) /obj/item/clothing/suit/space/void,
new /obj/item/clothing/suit/space/void(src) /obj/item/weapon/crowbar,
new /obj/item/weapon/crowbar(src) /obj/item/weapon/cell,
new /obj/item/weapon/cell(src) /obj/item/device/multitool)
new /obj/item/device/multitool(src)

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

@@ -8,7 +8,8 @@
icon_broken = "cabinetdetective_broken" icon_broken = "cabinetdetective_broken"
icon_off = "cabinetdetective_broken" icon_off = "cabinetdetective_broken"
will_contain = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 10) starts_with = list(
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 10)
/obj/structure/closet/secure_closet/bar/update_icon() /obj/structure/closet/secure_closet/bar/update_icon()
if(broken) if(broken)

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

@@ -8,28 +8,28 @@
icon_broken = "securecargobroken" icon_broken = "securecargobroken"
icon_off = "securecargooff" icon_off = "securecargooff"
New() starts_with = list(
..() /obj/item/clothing/under/rank/cargotech,
if(prob(75)) /obj/item/clothing/under/rank/cargotech/skirt,
new /obj/item/weapon/storage/backpack(src) /obj/item/clothing/under/rank/cargotech/jeans,
else /obj/item/clothing/under/rank/cargotech/jeans/female,
new /obj/item/weapon/storage/backpack/satchel/norm(src) /obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
if(prob(25)) /obj/item/clothing/shoes/boots/winter/supply,
new /obj/item/weapon/storage/backpack/dufflebag(src) /obj/item/clothing/shoes/black,
new /obj/item/clothing/under/rank/cargotech(src) /obj/item/device/radio/headset/headset_cargo,
new /obj/item/clothing/under/rank/cargotech/skirt(src) /obj/item/device/radio/headset/headset_cargo/alt,
new /obj/item/clothing/under/rank/cargotech/jeans(src) /obj/item/clothing/gloves/black,
new /obj/item/clothing/under/rank/cargotech/jeans/female(src) /obj/item/clothing/gloves/fingerless,
new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src) /obj/item/clothing/head/soft)
new /obj/item/clothing/shoes/boots/winter/supply(src)
new /obj/item/clothing/shoes/black(src) /obj/structure/closet/secure_closet/cargotech/initialize()
new /obj/item/device/radio/headset/headset_cargo(src) if(prob(75))
new /obj/item/device/radio/headset/headset_cargo/alt(src) starts_with += /obj/item/weapon/storage/backpack
new /obj/item/clothing/gloves/black(src) else
new /obj/item/clothing/gloves/fingerless(src) starts_with += /obj/item/weapon/storage/backpack/satchel/norm
new /obj/item/clothing/head/soft(src) if(prob(25))
// new /obj/item/weapon/cartridge/quartermaster(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag
return return ..()
/obj/structure/closet/secure_closet/quartermaster /obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker" name = "quartermaster's locker"
@@ -41,32 +41,32 @@
icon_broken = "secureqmbroken" icon_broken = "secureqmbroken"
icon_off = "secureqmoff" icon_off = "secureqmoff"
New() starts_with = list(
..() /obj/item/clothing/under/rank/cargo,
if(prob(75)) /obj/item/clothing/under/rank/cargo/skirt,
new /obj/item/weapon/storage/backpack(src) /obj/item/clothing/under/rank/cargo/jeans,
else /obj/item/clothing/under/rank/cargo/jeans/female,
new /obj/item/weapon/storage/backpack/satchel/norm(src) /obj/item/clothing/shoes/brown,
if(prob(25)) /obj/item/device/radio/headset/headset_cargo,
new /obj/item/weapon/storage/backpack/dufflebag(src) /obj/item/device/radio/headset/headset_cargo/alt,
new /obj/item/clothing/under/rank/cargo(src) /obj/item/clothing/gloves/black,
new /obj/item/clothing/under/rank/cargo/skirt(src) /obj/item/clothing/gloves/fingerless,
new /obj/item/clothing/under/rank/cargo/jeans(src) /obj/item/clothing/suit/fire/firefighter,
new /obj/item/clothing/under/rank/cargo/jeans/female(src) /obj/item/weapon/tank/emergency/oxygen,
new /obj/item/clothing/shoes/brown(src) /obj/item/clothing/mask/gas,
new /obj/item/device/radio/headset/headset_cargo(src) /obj/item/clothing/glasses/meson,
new /obj/item/device/radio/headset/headset_cargo/alt(src) /obj/item/clothing/head/soft,
new /obj/item/clothing/gloves/black(src) /obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
new /obj/item/clothing/gloves/fingerless(src) /obj/item/clothing/shoes/boots/winter/supply)
// new /obj/item/weapon/cartridge/quartermaster(src)
new /obj/item/clothing/suit/fire/firefighter(src) /obj/structure/closet/secure_closet/quartermaster/initialize()
new /obj/item/weapon/tank/emergency/oxygen(src) if(prob(75))
new /obj/item/clothing/mask/gas(src) starts_with += /obj/item/weapon/storage/backpack
new /obj/item/clothing/glasses/meson(src) else
new /obj/item/clothing/head/soft(src) starts_with += /obj/item/weapon/storage/backpack/satchel/norm
new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src) if(prob(25))
new /obj/item/clothing/shoes/boots/winter/supply(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag
return return ..()
/obj/structure/closet/secure_closet/miner /obj/structure/closet/secure_closet/miner
name = "miner's equipment" name = "miner's equipment"
@@ -78,23 +78,24 @@
icon_off = "miningsecoff" icon_off = "miningsecoff"
req_access = list(access_mining) req_access = list(access_mining)
/obj/structure/closet/secure_closet/miner/New() starts_with = list(
..() /obj/item/device/radio/headset/headset_mine,
sleep(2) /obj/item/clothing/under/rank/miner,
/obj/item/clothing/gloves/black,
/obj/item/clothing/shoes/black,
/obj/item/device/analyzer,
/obj/item/weapon/storage/bag/ore,
/obj/item/device/flashlight/lantern,
/obj/item/weapon/shovel,
/obj/item/weapon/pickaxe,
/obj/item/clothing/glasses/material,
/obj/item/clothing/suit/storage/hooded/wintercoat/miner,
/obj/item/clothing/shoes/boots/winter/mining,
/obj/item/stack/marker_beacon/thirty)
/obj/structure/closet/secure_closet/miner/initialize()
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/industrial(src) starts_with += /obj/item/weapon/storage/backpack/industrial
else else
new /obj/item/weapon/storage/backpack/satchel/eng(src) starts_with += /obj/item/weapon/storage/backpack/satchel/eng
new /obj/item/device/radio/headset/headset_mine(src) return ..()
new /obj/item/clothing/under/rank/miner(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/device/analyzer(src)
new /obj/item/weapon/storage/bag/ore(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/weapon/shovel(src)
new /obj/item/weapon/pickaxe(src)
new /obj/item/clothing/glasses/material(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/miner(src)
new /obj/item/clothing/shoes/boots/winter/mining(src)
new /obj/item/stack/marker_beacon/thirty(src)

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

@@ -1,170 +1,143 @@
/obj/structure/closet/secure_closet/engineering_chief /obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker" name = "chief engineer's locker"
req_access = list(access_ce)
icon_state = "securece1" icon_state = "securece1"
icon_closed = "securece" icon_closed = "securece"
icon_locked = "securece1" icon_locked = "securece1"
icon_opened = "secureceopen" icon_opened = "secureceopen"
icon_broken = "securecebroken" icon_broken = "securecebroken"
icon_off = "secureceoff" icon_off = "secureceoff"
req_access = list(access_ce)
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/blueprints,
/obj/item/clothing/under/rank/chief_engineer,
/obj/item/clothing/under/rank/chief_engineer/skirt,
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/head/welding,
/obj/item/clothing/gloves/yellow,
/obj/item/clothing/shoes/brown,
/obj/item/weapon/cartridge/ce,
/obj/item/device/radio/headset/heads/ce,
/obj/item/device/radio/headset/heads/ce/alt,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/device/multitool,
/obj/item/weapon/storage/belt/utility/chief/full,
/obj/item/device/flash,
/obj/item/device/t_scanner/upgraded,
/obj/item/taperoll/engineering,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,
/obj/item/clothing/shoes/boots/winter/engineering,
/obj/item/weapon/tank/emergency/oxygen/engi)
New() /obj/structure/closet/secure_closet/engineering_chief/initialize()
..() if(prob(50))
if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/industrial
new /obj/item/weapon/storage/backpack/industrial(src) else
else starts_with += /obj/item/weapon/storage/backpack/satchel/eng
new /obj/item/weapon/storage/backpack/satchel/eng(src) if(prob(50))
if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
new /obj/item/weapon/storage/backpack/dufflebag/eng(src) return ..()
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/blueprints(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/weapon/cartridge/ce(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/device/radio/headset/heads/ce/alt(src)
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/multitool(src)
new /obj/item/weapon/storage/belt/utility/chief/full(src)
new /obj/item/device/flash(src)
new /obj/item/device/t_scanner/upgraded
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
return
/obj/structure/closet/secure_closet/engineering_electrical /obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies" name = "electrical supplies"
req_access = list(access_engine_equip)
icon_state = "secureengelec1" icon_state = "secureengelec1"
icon_closed = "secureengelec" icon_closed = "secureengelec"
icon_locked = "secureengelec1" icon_locked = "secureengelec1"
icon_opened = "toolclosetopen" icon_opened = "toolclosetopen"
icon_broken = "secureengelecbroken" icon_broken = "secureengelecbroken"
icon_off = "secureengelecoff" icon_off = "secureengelecoff"
req_access = list(access_engine_equip)
starts_with = list(
New() /obj/item/clothing/gloves/yellow = 2,
..() /obj/item/weapon/storage/toolbox/electrical = 3,
new /obj/item/clothing/gloves/yellow(src) /obj/item/weapon/module/power_control = 3,
new /obj/item/clothing/gloves/yellow(src) /obj/item/device/multitool = 3)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
return
/obj/structure/closet/secure_closet/engineering_welding /obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies" name = "welding supplies"
req_access = list(access_construction)
icon_state = "secureengweld1" icon_state = "secureengweld1"
icon_closed = "secureengweld" icon_closed = "secureengweld"
icon_locked = "secureengweld1" icon_locked = "secureengweld1"
icon_opened = "toolclosetopen" icon_opened = "toolclosetopen"
icon_broken = "secureengweldbroken" icon_broken = "secureengweldbroken"
icon_off = "secureengweldoff" icon_off = "secureengweldoff"
req_access = list(access_construction)
starts_with = list(
New() /obj/item/clothing/head/welding = 3,
..() /obj/item/weapon/weldingtool/largetank = 3,
new /obj/item/clothing/head/welding(src) /obj/item/weapon/weldpack = 3,
new /obj/item/clothing/head/welding(src) /obj/item/clothing/glasses/welding = 3)
new /obj/item/clothing/head/welding(src)
new /obj/item/weapon/weldingtool/largetank(src)
new /obj/item/weapon/weldingtool/largetank(src)
new /obj/item/weapon/weldingtool/largetank(src)
new /obj/item/weapon/weldpack(src)
new /obj/item/weapon/weldpack(src)
new /obj/item/weapon/weldpack(src)
new /obj/item/clothing/glasses/welding(src)
new /obj/item/clothing/glasses/welding(src)
new /obj/item/clothing/glasses/welding(src)
return
/obj/structure/closet/secure_closet/engineering_personal /obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker" name = "engineer's locker"
req_access = list(access_engine_equip)
icon_state = "secureeng1" icon_state = "secureeng1"
icon_closed = "secureeng" icon_closed = "secureeng"
icon_locked = "secureeng1" icon_locked = "secureeng1"
icon_opened = "secureengopen" icon_opened = "secureengopen"
icon_broken = "secureengbroken" icon_broken = "secureengbroken"
icon_off = "secureengoff" icon_off = "secureengoff"
req_access = list(access_engine_equip)
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/glasses/meson,
/obj/item/weapon/cartridge/engineering,
/obj/item/taperoll/engineering,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,
/obj/item/clothing/shoes/boots/winter/engineering,
/obj/item/weapon/tank/emergency/oxygen/engi)
New() /obj/structure/closet/secure_closet/engineering_personal/initialize()
..() if(prob(50))
if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/industrial
new /obj/item/weapon/storage/backpack/industrial(src) else
else starts_with += /obj/item/weapon/storage/backpack/satchel/eng
new /obj/item/weapon/storage/backpack/satchel/eng(src) if(prob(50))
if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
new /obj/item/weapon/storage/backpack/dufflebag/eng(src) return ..()
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/device/radio/headset/headset_eng/alt(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/weapon/cartridge/engineering(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
return
/obj/structure/closet/secure_closet/atmos_personal /obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker" name = "technician's locker"
req_access = list(access_atmospherics)
icon_state = "secureatm1" icon_state = "secureatm1"
icon_closed = "secureatm" icon_closed = "secureatm"
icon_locked = "secureatm1" icon_locked = "secureatm1"
icon_opened = "secureatmopen" icon_opened = "secureatmopen"
icon_broken = "secureatmbroken" icon_broken = "secureatmbroken"
icon_off = "secureatmoff" icon_off = "secureatmoff"
req_access = list(access_atmospherics)
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/clothing/suit/fire/firefighter,
/obj/item/device/flashlight,
/obj/item/weapon/extinguisher,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/weapon/cartridge/atmos,
/obj/item/taperoll/atmos,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos,
/obj/item/clothing/shoes/boots/winter/atmos,
/obj/item/weapon/tank/emergency/oxygen/engi)
New() /obj/structure/closet/secure_closet/atmos_personal/initialize()
..() if(prob(50))
if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/industrial
new /obj/item/weapon/storage/backpack/industrial(src) else
else starts_with += /obj/item/weapon/storage/backpack/satchel/eng
new /obj/item/weapon/storage/backpack/satchel/eng(src) if(prob(50))
if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
new /obj/item/weapon/storage/backpack/dufflebag/eng(src) return ..()
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/device/radio/headset/headset_eng/alt(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/cartridge/atmos(src)
new /obj/item/taperoll/atmos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
new /obj/item/clothing/shoes/boots/winter/atmos(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
return

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

@@ -16,20 +16,14 @@
name = "kitchen cabinet" name = "kitchen cabinet"
req_access = list(access_kitchen) req_access = list(access_kitchen)
New() starts_with = list(
..() /obj/item/weapon/reagent_containers/food/condiment/flour = 7,
for(var/i = 1 to 7) /obj/item/weapon/reagent_containers/food/condiment/sugar = 2)
new /obj/item/weapon/reagent_containers/food/condiment/flour(src)
for(var/i = 1 to 2)
new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
return
/obj/structure/closet/secure_closet/freezer/kitchen/mining /obj/structure/closet/secure_closet/freezer/kitchen/mining
req_access = list() req_access = list()
/obj/structure/closet/secure_closet/freezer/meat /obj/structure/closet/secure_closet/freezer/meat
name = "meat fridge" name = "meat fridge"
icon_state = "fridge1" icon_state = "fridge1"
@@ -39,13 +33,8 @@
icon_broken = "fridgebroken" icon_broken = "fridgebroken"
icon_off = "fridge1" icon_off = "fridge1"
starts_with = list(
New() /obj/item/weapon/reagent_containers/food/snacks/meat/monkey = 10)
..()
for(var/i = 1 to 10)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
return
/obj/structure/closet/secure_closet/freezer/fridge /obj/structure/closet/secure_closet/freezer/fridge
@@ -57,17 +46,10 @@
icon_broken = "fridgebroken" icon_broken = "fridgebroken"
icon_off = "fridge1" icon_off = "fridge1"
starts_with = list(
New() /obj/item/weapon/reagent_containers/food/drinks/milk = 6,
..() /obj/item/weapon/reagent_containers/food/drinks/soymilk = 4,
for(var/i = 1 to 6) /obj/item/weapon/storage/fancy/egg_box = 4)
new /obj/item/weapon/reagent_containers/food/drinks/milk(src)
for(var/i = 1 to 4)
new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src)
for(var/i = 1 to 4)
new /obj/item/weapon/storage/fancy/egg_box(src)
return
/obj/structure/closet/secure_closet/freezer/money /obj/structure/closet/secure_closet/freezer/money
@@ -81,12 +63,7 @@
req_access = list(access_heads_vault) req_access = list(access_heads_vault)
New() starts_with = list(
..() /obj/item/weapon/spacecash/c1000 = 3,
for(var/i = 1 to 3) /obj/item/weapon/spacecash/c500 = 4,
new /obj/item/weapon/spacecash/c1000(src) /obj/item/weapon/spacecash/c200 = 5)
for(var/i = 1 to 4)
new /obj/item/weapon/spacecash/c500(src)
for(var/i = 1 to 5)
new /obj/item/weapon/spacecash/c200(src)
return

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

@@ -1,6 +1,5 @@
/obj/structure/closet/secure_closet/guncabinet /obj/structure/closet/secure_closet/guncabinet
name = "gun cabinet" name = "gun cabinet"
req_one_access = list(access_armory)
icon = 'icons/obj/guncabinet.dmi' icon = 'icons/obj/guncabinet.dmi'
icon_state = "base" icon_state = "base"
icon_off ="base" icon_off ="base"
@@ -8,9 +7,10 @@
icon_locked ="base" icon_locked ="base"
icon_closed ="base" icon_closed ="base"
icon_opened = "base" icon_opened = "base"
req_one_access = list(access_armory)
/obj/structure/closet/secure_closet/guncabinet/New() /obj/structure/closet/secure_closet/guncabinet/initialize()
..() . = ..()
update_icon() update_icon()
/obj/structure/closet/secure_closet/guncabinet/toggle() /obj/structure/closet/secure_closet/guncabinet/toggle()
@@ -27,7 +27,7 @@
for (var/obj/item/weapon/gun/G in contents) for (var/obj/item/weapon/gun/G in contents)
if (istype(G, /obj/item/weapon/gun/energy)) if (istype(G, /obj/item/weapon/gun/energy))
lazors++ lazors++
if (istype(G, /obj/item/weapon/gun/projectile/)) if (istype(G, /obj/item/weapon/gun/projectile))
shottas++ shottas++
for (var/i = 0 to 2) for (var/i = 0 to 2)
if(lazors || shottas) // only make icons if we have one of the two types. if(lazors || shottas) // only make icons if we have one of the two types.

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

@@ -8,24 +8,22 @@
icon_broken = "hydrosecurebroken" icon_broken = "hydrosecurebroken"
icon_off = "hydrosecureoff" icon_off = "hydrosecureoff"
starts_with = list(
/obj/item/weapon/storage/bag/plants,
/obj/item/clothing/under/rank/hydroponics,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/radio/headset/headset_service,
/obj/item/clothing/head/greenbandana,
/obj/item/weapon/material/minihoe,
/obj/item/weapon/material/knife/machete/hatchet,
/obj/item/weapon/wirecutters/clippers,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,
/obj/item/clothing/shoes/boots/winter/hydro)
New() /obj/structure/closet/secure_closet/hydroponics/initialize()
..() if(prob(50))
switch(rand(1,2)) starts_with += /obj/item/clothing/suit/storage/apron
if(1) else
new /obj/item/clothing/suit/storage/apron(src) starts_with += /obj/item/clothing/suit/storage/apron/overalls
if(2) return ..()
new /obj/item/clothing/suit/storage/apron/overalls(src)
new /obj/item/weapon/storage/bag/plants(src)
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/head/greenbandana(src)
new /obj/item/weapon/material/minihoe(src)
new /obj/item/weapon/material/knife/machete/hatchet(src)
new /obj/item/weapon/wirecutters/clippers(src)
new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/hydro(src)
new /obj/item/clothing/shoes/boots/winter/hydro(src)
// new /obj/item/weapon/bee_net(src) //No more bees, March 2014
return

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

@@ -9,21 +9,13 @@
icon_off = "medicaloff" icon_off = "medicaloff"
req_access = list(access_medical) req_access = list(access_medical)
starts_with = list(
/obj/structure/closet/secure_closet/medical1/New() /obj/item/weapon/storage/box/autoinjectors,
..() /obj/item/weapon/storage/box/syringes,
new /obj/item/weapon/storage/box/autoinjectors(src) /obj/item/weapon/reagent_containers/dropper = 2,
new /obj/item/weapon/storage/box/syringes(src) /obj/item/weapon/reagent_containers/glass/beaker = 2,
new /obj/item/weapon/reagent_containers/dropper(src) /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
new /obj/item/weapon/reagent_containers/dropper(src) /obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2)
new /obj/item/weapon/reagent_containers/glass/beaker(src)
new /obj/item/weapon/reagent_containers/glass/beaker(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
return
/obj/structure/closet/secure_closet/medical2 /obj/structure/closet/secure_closet/medical2
@@ -37,17 +29,9 @@
icon_off = "medicaloff" icon_off = "medicaloff"
req_access = list(access_surgery) req_access = list(access_surgery)
starts_with = list(
/obj/structure/closet/secure_closet/medical2/New() /obj/item/weapon/tank/anesthetic = 3,
..() /obj/item/clothing/mask/breath/medical = 3)
new /obj/item/weapon/tank/anesthetic(src)
new /obj/item/weapon/tank/anesthetic(src)
new /obj/item/weapon/tank/anesthetic(src)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breath/medical(src)
return
/obj/structure/closet/secure_closet/medical3 /obj/structure/closet/secure_closet/medical3
@@ -60,63 +44,63 @@
icon_broken = "securemedbroken" icon_broken = "securemedbroken"
icon_off = "securemedoff" icon_off = "securemedoff"
/obj/structure/closet/secure_closet/medical3/New() starts_with = list(
..() /obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/nurse,
/obj/item/clothing/under/rank/orderly,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/shoes/white,
/obj/item/weapon/cartridge/medical,
/obj/item/device/radio/headset/headset_med,
/obj/item/device/radio/headset/headset_med/alt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/clothing/under/rank/nursesuit,
/obj/item/clothing/head/nursehat,
/obj/item/weapon/storage/box/freezer = 3)
/obj/structure/closet/secure_closet/medical3/initialize()
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/medic(src) starts_with += /obj/item/weapon/storage/backpack/medic
else else
new /obj/item/weapon/storage/backpack/satchel/med(src) starts_with += /obj/item/weapon/storage/backpack/satchel/med
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/med(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
new /obj/item/clothing/under/rank/nursesuit (src)
new /obj/item/clothing/head/nursehat (src)
switch(pick("blue", "green", "purple", "black", "navyblue")) switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue") if ("blue")
new /obj/item/clothing/under/rank/medical/scrubs(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs
new /obj/item/clothing/head/surgery/blue(src) starts_with += /obj/item/clothing/head/surgery/blue
if ("green") if ("green")
new /obj/item/clothing/under/rank/medical/scrubs/green(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
new /obj/item/clothing/head/surgery/green(src) starts_with += /obj/item/clothing/head/surgery/green
if ("purple") if ("purple")
new /obj/item/clothing/under/rank/medical/scrubs/purple(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
new /obj/item/clothing/head/surgery/purple(src) starts_with += /obj/item/clothing/head/surgery/purple
if ("black") if ("black")
new /obj/item/clothing/under/rank/medical/scrubs/black(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
new /obj/item/clothing/head/surgery/black(src) starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue") if ("navyblue")
new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
new /obj/item/clothing/head/surgery/navyblue(src) starts_with += /obj/item/clothing/head/surgery/navyblue
switch(pick("blue", "green", "purple", "black", "navyblue")) switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue") if ("blue")
new /obj/item/clothing/under/rank/medical/scrubs(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs
new /obj/item/clothing/head/surgery/blue(src) starts_with += /obj/item/clothing/head/surgery/blue
if ("green") if ("green")
new /obj/item/clothing/under/rank/medical/scrubs/green(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
new /obj/item/clothing/head/surgery/green(src) starts_with += /obj/item/clothing/head/surgery/green
if ("purple") if ("purple")
new /obj/item/clothing/under/rank/medical/scrubs/purple(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
new /obj/item/clothing/head/surgery/purple(src) starts_with += /obj/item/clothing/head/surgery/purple
if ("black") if ("black")
new /obj/item/clothing/under/rank/medical/scrubs/black(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
new /obj/item/clothing/head/surgery/black(src) starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue") if ("navyblue")
new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
new /obj/item/clothing/head/surgery/navyblue(src) starts_with += /obj/item/clothing/head/surgery/navyblue
new /obj/item/clothing/under/rank/medical(src) return ..()
new /obj/item/clothing/under/rank/nurse(src)
new /obj/item/clothing/under/rank/orderly(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/weapon/cartridge/medical(src)
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/device/radio/headset/headset_med/alt(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
new /obj/item/weapon/storage/box/freezer(src)
new /obj/item/weapon/storage/box/freezer(src)
new /obj/item/weapon/storage/box/freezer(src)
return
/obj/structure/closet/secure_closet/paramedic /obj/structure/closet/secure_closet/paramedic
name = "paramedic locker" name = "paramedic locker"
@@ -129,33 +113,30 @@
icon_off = "medicaloff" icon_off = "medicaloff"
req_access = list(access_medical_equip) req_access = list(access_medical_equip)
starts_with = list(
/obj/structure/closet/secure_closet/paramedic/New() /obj/item/weapon/storage/backpack/dufflebag/emt,
..() /obj/item/weapon/storage/box/autoinjectors,
new /obj/item/weapon/storage/backpack/dufflebag/emt(src) /obj/item/weapon/storage/box/syringes,
new /obj/item/weapon/storage/box/autoinjectors(src) /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
new /obj/item/weapon/storage/box/syringes(src) /obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src) /obj/item/weapon/storage/belt/medical/emt,
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src) /obj/item/clothing/mask/gas,
new /obj/item/weapon/storage/belt/medical/emt(src) /obj/item/clothing/suit/storage/toggle/fr_jacket,
new /obj/item/clothing/mask/gas(src) /obj/item/clothing/suit/storage/toggle/labcoat/emt,
new /obj/item/clothing/suit/storage/toggle/fr_jacket(src) /obj/item/device/radio/headset/headset_med/alt,
new /obj/item/clothing/suit/storage/toggle/labcoat/emt(src) /obj/item/weapon/cartridge/medical,
new /obj/item/device/radio/headset/headset_med/alt(src) /obj/item/weapon/storage/briefcase/inflatable,
new /obj/item/weapon/cartridge/medical(src) /obj/item/device/flashlight,
new /obj/item/weapon/storage/briefcase/inflatable(src) /obj/item/weapon/tank/emergency/oxygen/engi,
new /obj/item/device/flashlight(src) /obj/item/clothing/glasses/hud/health,
new /obj/item/weapon/tank/emergency/oxygen/engi(src) /obj/item/device/healthanalyzer,
new /obj/item/clothing/glasses/hud/health(src) /obj/item/device/radio/off,
new /obj/item/device/healthanalyzer(src) /obj/random/medical,
new /obj/item/device/radio/off(src) /obj/item/weapon/crowbar,
new /obj/random/medical(src) /obj/item/weapon/extinguisher/mini,
new /obj/item/weapon/crowbar(src) /obj/item/weapon/storage/box/freezer,
new /obj/item/weapon/extinguisher/mini(src) /obj/item/clothing/accessory/storage/white_vest,
new /obj/item/weapon/storage/box/freezer(src) /obj/item/taperoll/medical)
new /obj/item/clothing/accessory/storage/white_vest(src)
new /obj/item/taperoll/medical(src)
return
/obj/structure/closet/secure_closet/CMO /obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker" name = "chief medical officer's locker"
@@ -167,66 +148,60 @@
icon_broken = "cmosecurebroken" icon_broken = "cmosecurebroken"
icon_off = "cmosecureoff" icon_off = "cmosecureoff"
/obj/structure/closet/secure_closet/CMO/New() starts_with = list(
..() /obj/item/clothing/under/rank/chief_medical_officer,
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown ,
/obj/item/device/radio/headset/heads/cmo,
/obj/item/device/radio/headset/heads/cmo/alt,
/obj/item/device/flash,
/obj/item/weapon/reagent_containers/hypospray/vial,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/weapon/storage/box/freezer,
/obj/item/clothing/mask/gas,
/obj/item/taperoll/medical,
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/shoes/white)
/obj/structure/closet/secure_closet/CMO/initialize()
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/medic(src) starts_with += /obj/item/weapon/storage/backpack/medic
else else
new /obj/item/weapon/storage/backpack/satchel/med(src) starts_with += /obj/item/weapon/storage/backpack/satchel/med
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/med(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
new /obj/item/clothing/shoes/white(src)
switch(pick("blue", "green", "purple", "black", "navyblue")) switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue") if ("blue")
new /obj/item/clothing/under/rank/medical/scrubs(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs
new /obj/item/clothing/head/surgery/blue(src) starts_with += /obj/item/clothing/head/surgery/blue
if ("green") if ("green")
new /obj/item/clothing/under/rank/medical/scrubs/green(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
new /obj/item/clothing/head/surgery/green(src) starts_with += /obj/item/clothing/head/surgery/green
if ("purple") if ("purple")
new /obj/item/clothing/under/rank/medical/scrubs/purple(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
new /obj/item/clothing/head/surgery/purple(src) starts_with += /obj/item/clothing/head/surgery/purple
if ("black") if ("black")
new /obj/item/clothing/under/rank/medical/scrubs/black(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
new /obj/item/clothing/head/surgery/black(src) starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue") if ("navyblue")
new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
new /obj/item/clothing/head/surgery/navyblue(src) starts_with += /obj/item/clothing/head/surgery/navyblue
new /obj/item/clothing/under/rank/chief_medical_officer(src) return ..()
new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
new /obj/item/weapon/cartridge/cmo(src)
new /obj/item/clothing/gloves/sterile/latex(src)
new /obj/item/clothing/shoes/brown (src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/device/radio/headset/heads/cmo/alt(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/reagent_containers/hypospray/vial(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
new /obj/item/weapon/storage/box/freezer(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/taperoll/medical(src)
return
/obj/structure/closet/secure_closet/animal /obj/structure/closet/secure_closet/animal
name = "animal control closet" name = "animal control closet"
req_access = list(access_surgery) req_access = list(access_surgery)
starts_with = list(
/obj/structure/closet/secure_closet/animal/New() /obj/item/device/assembly/signaler,
..() /obj/item/device/radio/electropack = 3)
new /obj/item/device/assembly/signaler(src)
new /obj/item/device/radio/electropack(src)
new /obj/item/device/radio/electropack(src)
new /obj/item/device/radio/electropack(src)
return
/obj/structure/closet/secure_closet/chemical /obj/structure/closet/secure_closet/chemical
@@ -240,21 +215,15 @@
icon_off = "medicaloff" icon_off = "medicaloff"
req_access = list(access_chemistry) req_access = list(access_chemistry)
starts_with = list(
/obj/item/weapon/storage/box/pillbottles = 2,
/obj/item/weapon/storage/box/beakers,
/obj/item/weapon/storage/box/autoinjectors,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/reagent_containers/dropper = 2,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2)
/obj/structure/closet/secure_closet/chemical/New()
..()
new /obj/item/weapon/storage/box/pillbottles(src)
new /obj/item/weapon/storage/box/pillbottles(src)
new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/storage/box/autoinjectors(src)
new /obj/item/weapon/storage/box/syringes(src)
new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
return
/obj/structure/closet/secure_closet/psych /obj/structure/closet/secure_closet/psych
name = "psychiatric closet" name = "psychiatric closet"
@@ -267,25 +236,21 @@
icon_off = "medicaloff" icon_off = "medicaloff"
req_access = list(access_psychiatrist) req_access = list(access_psychiatrist)
starts_with = list(
/obj/item/clothing/under/rank/psych,
/obj/item/clothing/under/rank/psych/turtleneck,
/obj/item/clothing/suit/straight_jacket,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin,
/obj/item/weapon/reagent_containers/syringe,
/obj/item/weapon/storage/pill_bottle/citalopram,
/obj/item/weapon/reagent_containers/pill/methylphenidate,
/obj/item/weapon/clipboard,
/obj/item/weapon/folder/white,
/obj/item/device/taperecorder,
/obj/item/device/tape/random = 3,
/obj/item/device/camera,
/obj/item/toy/plushie/therapy/blue)
/obj/structure/closet/secure_closet/psych/New()
..()
new /obj/item/clothing/under/rank/psych(src)
new /obj/item/clothing/under/rank/psych/turtleneck(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
new /obj/item/weapon/reagent_containers/syringe(src)
new /obj/item/weapon/storage/pill_bottle/citalopram(src)
new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
new /obj/item/weapon/clipboard(src)
new /obj/item/weapon/folder/white(src)
new /obj/item/device/taperecorder(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/camera(src)
new /obj/item/toy/plushie/therapy/blue(src)
return
/obj/structure/closet/secure_closet/medical_wall /obj/structure/closet/secure_closet/medical_wall
name = "first aid closet" name = "first aid closet"
@@ -318,25 +283,18 @@
/obj/structure/closet/secure_closet/medical_wall/pills /obj/structure/closet/secure_closet/medical_wall/pills
name = "pill cabinet" name = "pill cabinet"
/obj/structure/closet/secure_closet/medical_wall/pills/New() starts_with = list(
..() /obj/item/weapon/storage/pill_bottle/tramadol,
new /obj/item/weapon/storage/pill_bottle/tramadol(src) /obj/item/weapon/storage/pill_bottle/antitox,
new /obj/item/weapon/storage/pill_bottle/antitox(src) /obj/item/weapon/storage/pill_bottle/carbon,
new /obj/item/weapon/storage/pill_bottle/carbon(src) /obj/random/medical/pillbottle)
new /obj/random/medical/pillbottle(src)
return
/obj/structure/closet/secure_closet/medical_wall/anesthetics /obj/structure/closet/secure_closet/medical_wall/anesthetics
name = "anesthetics wall closet" name = "anesthetics wall closet"
desc = "Used to knock people out." desc = "Used to knock people out."
req_access = list(access_surgery) req_access = list(access_surgery)
/obj/structure/closet/secure_closet/medical_wall/anesthetics/New() starts_with = list(
..() /obj/item/weapon/tank/anesthetic = 3,
new /obj/item/weapon/tank/anesthetic(src) /obj/item/clothing/mask/breath/medical = 3)
new /obj/item/weapon/tank/anesthetic(src)
new /obj/item/weapon/tank/anesthetic(src)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breath/medical(src)
return

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

@@ -4,31 +4,23 @@
req_access = list(access_all_personal_lockers) req_access = list(access_all_personal_lockers)
var/registered_name = null var/registered_name = null
/obj/structure/closet/secure_closet/personal/New() starts_with = list(
..() /obj/item/device/radio/headset)
spawn(2)
if(prob(50))
new /obj/item/weapon/storage/backpack(src)
else
new /obj/item/weapon/storage/backpack/satchel/norm(src)
new /obj/item/device/radio/headset( src )
return
/obj/structure/closet/secure_closet/personal/initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack
else
starts_with += /obj/item/weapon/storage/backpack/satchel/norm
return ..()
/obj/structure/closet/secure_closet/personal/patient /obj/structure/closet/secure_closet/personal/patient
name = "patient's closet" name = "patient's closet"
/obj/structure/closet/secure_closet/personal/patient/New() starts_with = list(
..() /obj/item/clothing/under/medigown,
spawn(4) /obj/item/clothing/under/color/white,
// Not really the best way to do this, but it's better than "contents = list()"! /obj/item/clothing/shoes/white)
for(var/atom/movable/AM in contents)
qdel(AM)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/color/white( src )
new /obj/item/clothing/shoes/white( src )
return
/obj/structure/closet/secure_closet/personal/cabinet /obj/structure/closet/secure_closet/personal/cabinet
@@ -39,6 +31,11 @@
icon_broken = "cabinetdetective_broken" icon_broken = "cabinetdetective_broken"
icon_off = "cabinetdetective_broken" icon_off = "cabinetdetective_broken"
starts_with = list(
/obj/item/weapon/storage/backpack/satchel/withwallet,
/obj/item/device/radio/headset
)
/obj/structure/closet/secure_closet/personal/cabinet/update_icon() /obj/structure/closet/secure_closet/personal/cabinet/update_icon()
if(broken) if(broken)
icon_state = icon_broken icon_state = icon_broken
@@ -51,20 +48,11 @@
else else
icon_state = icon_opened icon_state = icon_opened
/obj/structure/closet/secure_closet/personal/cabinet/New()
..()
spawn(4)
// Not really the best way to do this, but it's better than "contents = list()"!
for(var/atom/movable/AM in contents)
qdel(AM)
new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
new /obj/item/device/radio/headset( src )
return
/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (src.opened) if (src.opened)
if (istype(W, /obj/item/weapon/grab)) if (istype(W, /obj/item/weapon/grab))
src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet var/obj/item/weapon/grab/G = W
src.MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
user.drop_item() user.drop_item()
if (W) W.forceMove(src.loc) if (W) W.forceMove(src.loc)
else if(W.GetID()) else if(W.GetID())

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

@@ -1,60 +1,56 @@
/obj/structure/closet/secure_closet/scientist /obj/structure/closet/secure_closet/scientist
name = "scientist's locker" name = "scientist's locker"
req_access = list(access_tox_storage)
icon_state = "secureres1" icon_state = "secureres1"
icon_closed = "secureres" icon_closed = "secureres"
icon_locked = "secureres1" icon_locked = "secureres1"
icon_opened = "secureresopen" icon_opened = "secureresopen"
icon_broken = "secureresbroken" icon_broken = "secureresbroken"
icon_off = "secureresoff" icon_off = "secureresoff"
req_access = list(access_tox_storage)
New() starts_with = list(
..() /obj/item/clothing/under/rank/scientist,
new /obj/item/clothing/under/rank/scientist(src) /obj/item/clothing/suit/storage/toggle/labcoat,
//new /obj/item/clothing/suit/labcoat/science(src) /obj/item/clothing/shoes/white,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/device/radio/headset/headset_sci,
new /obj/item/clothing/shoes/white(src) /obj/item/weapon/tank/air,
// new /obj/item/weapon/cartridge/signal/science(src) /obj/item/clothing/mask/gas,
new /obj/item/device/radio/headset/headset_sci(src) /obj/item/clothing/suit/storage/hooded/wintercoat/science,
new /obj/item/weapon/tank/air(src) /obj/item/clothing/shoes/boots/winter/science)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/toxins(src)
return
/obj/structure/closet/secure_closet/scientist/initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/toxins
return ..()
/obj/structure/closet/secure_closet/RD /obj/structure/closet/secure_closet/RD
name = "research director's locker" name = "research director's locker"
req_access = list(access_rd)
icon_state = "rdsecure1" icon_state = "rdsecure1"
icon_closed = "rdsecure" icon_closed = "rdsecure"
icon_locked = "rdsecure1" icon_locked = "rdsecure1"
icon_opened = "rdsecureopen" icon_opened = "rdsecureopen"
icon_broken = "rdsecurebroken" icon_broken = "rdsecurebroken"
icon_off = "rdsecureoff" icon_off = "rdsecureoff"
req_access = list(access_rd)
New() starts_with = list(
..() /obj/item/clothing/suit/bio_suit/scientist,
new /obj/item/clothing/suit/bio_suit/scientist(src) /obj/item/clothing/head/bio_hood/scientist,
new /obj/item/clothing/head/bio_hood/scientist(src) /obj/item/clothing/under/rank/research_director,
new /obj/item/clothing/under/rank/research_director(src) /obj/item/clothing/under/rank/research_director/rdalt,
new /obj/item/clothing/under/rank/research_director/rdalt(src) /obj/item/clothing/under/rank/research_director/dress_rd,
new /obj/item/clothing/under/rank/research_director/dress_rd(src) /obj/item/clothing/suit/storage/toggle/labcoat,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/weapon/cartridge/rd,
new /obj/item/weapon/cartridge/rd(src) /obj/item/clothing/shoes/white,
new /obj/item/clothing/shoes/white(src) /obj/item/clothing/shoes/leather,
new /obj/item/clothing/shoes/leather(src) /obj/item/clothing/gloves/sterile/latex,
new /obj/item/clothing/gloves/sterile/latex(src) /obj/item/device/radio/headset/heads/rd,
new /obj/item/device/radio/headset/heads/rd(src) /obj/item/device/radio/headset/heads/rd/alt,
new /obj/item/device/radio/headset/heads/rd/alt(src) /obj/item/weapon/tank/air,
new /obj/item/weapon/tank/air(src) /obj/item/clothing/mask/gas,
new /obj/item/clothing/mask/gas(src) /obj/item/device/flash,
new /obj/item/device/flash(src) /obj/item/clothing/suit/storage/hooded/wintercoat/science,
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src) /obj/item/clothing/shoes/boots/winter/science)
new /obj/item/clothing/shoes/boots/winter/science(src)
return

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

@@ -1,300 +1,273 @@
/obj/structure/closet/secure_closet/captains /obj/structure/closet/secure_closet/captains
name = "colony director's locker" name = "colony director's locker"
req_access = list(access_captain)
icon_state = "capsecure1" icon_state = "capsecure1"
icon_closed = "capsecure" icon_closed = "capsecure"
icon_locked = "capsecure1" icon_locked = "capsecure1"
icon_opened = "capsecureopen" icon_opened = "capsecureopen"
icon_broken = "capsecurebroken" icon_broken = "capsecurebroken"
icon_off = "capsecureoff" icon_off = "capsecureoff"
req_access = list(access_captain)
New() starts_with = list(
..() /obj/item/weapon/storage/backpack/dufflebag/captain,
new /obj/item/weapon/storage/backpack/dufflebag/captain(src) /obj/item/clothing/head/helmet,
new /obj/item/clothing/head/helmet(src) /obj/item/clothing/suit/storage/vest,
new /obj/item/clothing/suit/storage/vest(src) /obj/item/weapon/cartridge/captain,
new /obj/item/weapon/cartridge/captain(src) /obj/item/weapon/storage/lockbox/medal,
new /obj/item/weapon/storage/lockbox/medal(src) /obj/item/device/radio/headset/heads/captain,
new /obj/item/device/radio/headset/heads/captain(src) /obj/item/device/radio/headset/heads/captain/alt,
new /obj/item/device/radio/headset/heads/captain/alt(src) /obj/item/weapon/gun/energy/gun,
new /obj/item/weapon/gun/energy/gun(src) /obj/item/weapon/melee/telebaton,
new /obj/item/weapon/melee/telebaton(src) /obj/item/device/flash,
new /obj/item/device/flash(src) /obj/item/weapon/storage/box/ids)
new /obj/item/weapon/storage/box/ids(src)
return
/obj/structure/closet/secure_closet/hop /obj/structure/closet/secure_closet/hop
name = "head of personnel's locker" name = "head of personnel's locker"
req_access = list(access_hop)
icon_state = "hopsecure1" icon_state = "hopsecure1"
icon_closed = "hopsecure" icon_closed = "hopsecure"
icon_locked = "hopsecure1" icon_locked = "hopsecure1"
icon_opened = "hopsecureopen" icon_opened = "hopsecureopen"
icon_broken = "hopsecurebroken" icon_broken = "hopsecurebroken"
icon_off = "hopsecureoff" icon_off = "hopsecureoff"
req_access = list(access_hop)
New() starts_with = list(
..() /obj/item/clothing/suit/storage/vest,
new /obj/item/clothing/suit/storage/vest(src) /obj/item/clothing/head/helmet,
new /obj/item/clothing/head/helmet(src) /obj/item/weapon/cartridge/hop,
new /obj/item/weapon/cartridge/hop(src) /obj/item/device/radio/headset/heads/hop,
new /obj/item/device/radio/headset/heads/hop(src) /obj/item/device/radio/headset/heads/hop/alt,
new /obj/item/device/radio/headset/heads/hop/alt(src) /obj/item/weapon/storage/box/ids = 2,
new /obj/item/weapon/storage/box/ids(src) /obj/item/weapon/gun/energy/gun,
new /obj/item/weapon/storage/box/ids( src ) /obj/item/weapon/gun/projectile/sec/flash,
new /obj/item/weapon/gun/energy/gun(src) /obj/item/device/flash)
new /obj/item/weapon/gun/projectile/sec/flash(src)
new /obj/item/device/flash(src)
return
/obj/structure/closet/secure_closet/hop2 /obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire" name = "head of personnel's attire"
req_access = list(access_hop)
icon_state = "hopsecure1" icon_state = "hopsecure1"
icon_closed = "hopsecure" icon_closed = "hopsecure"
icon_locked = "hopsecure1" icon_locked = "hopsecure1"
icon_opened = "hopsecureopen" icon_opened = "hopsecureopen"
icon_broken = "hopsecurebroken" icon_broken = "hopsecurebroken"
icon_off = "hopsecureoff" icon_off = "hopsecureoff"
req_access = list(access_hop)
New() starts_with = list(
..() /obj/item/clothing/under/rank/head_of_personnel,
new /obj/item/clothing/under/rank/head_of_personnel(src) /obj/item/clothing/under/dress/dress_hop,
new /obj/item/clothing/under/dress/dress_hop(src) /obj/item/clothing/under/dress/dress_hr,
new /obj/item/clothing/under/dress/dress_hr(src) /obj/item/clothing/under/lawyer/female,
new /obj/item/clothing/under/lawyer/female(src) /obj/item/clothing/under/lawyer/black,
new /obj/item/clothing/under/lawyer/black(src) /obj/item/clothing/under/lawyer/black/skirt,
new /obj/item/clothing/under/lawyer/black/skirt(src) /obj/item/clothing/under/lawyer/red,
new /obj/item/clothing/under/lawyer/red(src) /obj/item/clothing/under/lawyer/red/skirt,
new /obj/item/clothing/under/lawyer/red/skirt(src) /obj/item/clothing/under/lawyer/oldman,
new /obj/item/clothing/under/lawyer/oldman(src) /obj/item/clothing/shoes/brown,
new /obj/item/clothing/shoes/brown(src) /obj/item/clothing/shoes/black,
new /obj/item/clothing/shoes/black(src) /obj/item/clothing/shoes/leather,
new /obj/item/clothing/shoes/leather(src) /obj/item/clothing/shoes/white,
new /obj/item/clothing/shoes/white(src) /obj/item/clothing/under/rank/head_of_personnel_whimsy,
new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src) /obj/item/clothing/head/caphat/hop,
new /obj/item/clothing/head/caphat/hop(src) /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit,
new /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit(src) /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt,
new /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt(src) /obj/item/clothing/glasses/sunglasses)
new /obj/item/clothing/glasses/sunglasses(src)
return
/obj/structure/closet/secure_closet/hos /obj/structure/closet/secure_closet/hos
name = "head of security's locker" name = "head of security's locker"
req_access = list(access_hos)
icon_state = "hossecure1" icon_state = "hossecure1"
icon_closed = "hossecure" icon_closed = "hossecure"
icon_locked = "hossecure1" icon_locked = "hossecure1"
icon_opened = "hossecureopen" icon_opened = "hossecureopen"
icon_broken = "hossecurebroken" icon_broken = "hossecurebroken"
icon_off = "hossecureoff" icon_off = "hossecureoff"
req_access = list(access_hos)
storage_capacity = 2.5 * MOB_MEDIUM storage_capacity = 2.5 * MOB_MEDIUM
New() starts_with = list(
..() /obj/item/clothing/head/helmet/HoS,
if(prob(50)) /obj/item/clothing/head/helmet/HoS/hat,
new /obj/item/weapon/storage/backpack/security(src) /obj/item/clothing/suit/storage/vest/hos,
else /obj/item/clothing/under/rank/head_of_security/jensen,
new /obj/item/weapon/storage/backpack/satchel/sec(src) /obj/item/clothing/under/rank/head_of_security/corp,
if(prob(50)) /obj/item/clothing/suit/storage/vest/hoscoat/jensen,
new /obj/item/weapon/storage/backpack/dufflebag/sec(src) /obj/item/clothing/suit/storage/vest/hoscoat,
new /obj/item/clothing/head/helmet/HoS(src) /obj/item/clothing/head/helmet/dermal,
new /obj/item/clothing/head/helmet/HoS/hat(src) /obj/item/weapon/cartridge/hos,
new /obj/item/clothing/suit/storage/vest/hos(src) /obj/item/device/radio/headset/heads/hos,
new /obj/item/clothing/under/rank/head_of_security/jensen(src) /obj/item/device/radio/headset/heads/hos/alt,
new /obj/item/clothing/under/rank/head_of_security/corp(src) /obj/item/clothing/glasses/sunglasses/sechud,
new /obj/item/clothing/suit/storage/vest/hoscoat/jensen(src) /obj/item/taperoll/police,
new /obj/item/clothing/suit/storage/vest/hoscoat(src) /obj/item/weapon/shield/riot,
new /obj/item/clothing/head/helmet/dermal(src) /obj/item/weapon/shield/riot/tele,
new /obj/item/weapon/cartridge/hos(src) /obj/item/weapon/storage/box/holobadge/hos,
new /obj/item/device/radio/headset/heads/hos(src) /obj/item/clothing/accessory/badge/holo/hos,
new /obj/item/device/radio/headset/heads/hos/alt(src) /obj/item/weapon/reagent_containers/spray/pepper,
new /obj/item/clothing/glasses/sunglasses/sechud(src) /obj/item/weapon/crowbar/red,
new /obj/item/taperoll/police(src) /obj/item/weapon/storage/box/flashbangs,
new /obj/item/weapon/shield/riot(src) /obj/item/weapon/storage/belt/security,
new /obj/item/weapon/shield/riot/tele(src) /obj/item/device/flash,
new /obj/item/weapon/storage/box/holobadge/hos(src) /obj/item/weapon/melee/baton/loaded,
new /obj/item/clothing/accessory/badge/holo/hos(src) /obj/item/weapon/gun/energy/gun,
new /obj/item/weapon/reagent_containers/spray/pepper(src) /obj/item/weapon/cell/device/weapon,
new /obj/item/weapon/crowbar/red(src) /obj/item/clothing/accessory/holster/waist,
new /obj/item/weapon/storage/box/flashbangs(src) /obj/item/weapon/melee/telebaton,
new /obj/item/weapon/storage/belt/security(src) /obj/item/clothing/head/beret/sec/corporate/hos,
new /obj/item/device/flash(src) /obj/item/clothing/suit/storage/hooded/wintercoat/security,
new /obj/item/weapon/melee/baton/loaded(src) /obj/item/clothing/shoes/boots/winter/security,
new /obj/item/weapon/gun/energy/gun(src) /obj/item/device/flashlight/maglight,
new /obj/item/weapon/cell/device/weapon(src) /obj/item/clothing/mask/gas/half)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/weapon/melee/telebaton(src)
new /obj/item/clothing/head/beret/sec/corporate/hos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/shoes/boots/winter/security(src)
new /obj/item/device/flashlight/maglight(src)
new /obj/item/clothing/mask/gas/half(src)
return
/obj/structure/closet/secure_closet/hos/initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
return ..()
/obj/structure/closet/secure_closet/warden /obj/structure/closet/secure_closet/warden
name = "warden's locker" name = "warden's locker"
req_access = list(access_armory)
icon_state = "wardensecure1" icon_state = "wardensecure1"
icon_closed = "wardensecure" icon_closed = "wardensecure"
icon_locked = "wardensecure1" icon_locked = "wardensecure1"
icon_opened = "wardensecureopen" icon_opened = "wardensecureopen"
icon_broken = "wardensecurebroken" icon_broken = "wardensecurebroken"
icon_off = "wardensecureoff" icon_off = "wardensecureoff"
req_access = list(access_armory)
starts_with = list(
/obj/item/clothing/suit/storage/vest/warden,
/obj/item/clothing/under/rank/warden,
/obj/item/clothing/under/rank/warden/corp,
/obj/item/clothing/suit/storage/vest/wardencoat,
/obj/item/clothing/suit/storage/vest/wardencoat/alt,
/obj/item/clothing/head/helmet/dermal,
/obj/item/clothing/head/helmet/warden,
/obj/item/clothing/head/helmet/warden/hat,
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/belt/security,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/storage/box/holobadge,
/obj/item/clothing/head/beret/sec/corporate/warden,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/device/megaphone,
/obj/item/clothing/mask/gas/half)
New() /obj/structure/closet/secure_closet/warden/initialize()
..() if(prob(50))
if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/security
new /obj/item/weapon/storage/backpack/security(src) else
else starts_with += /obj/item/weapon/storage/backpack/satchel/sec
new /obj/item/weapon/storage/backpack/satchel/sec(src) if(prob(50))
if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
new /obj/item/weapon/storage/backpack/dufflebag/sec(src) return ..()
new /obj/item/clothing/suit/storage/vest/warden(src)
new /obj/item/clothing/under/rank/warden(src)
new /obj/item/clothing/under/rank/warden/corp(src)
new /obj/item/clothing/suit/storage/vest/wardencoat(src)
new /obj/item/clothing/suit/storage/vest/wardencoat/alt(src)
new /obj/item/clothing/head/helmet/dermal(src)
new /obj/item/clothing/head/helmet/warden(src)
new /obj/item/clothing/head/helmet/warden/hat(src)
new /obj/item/weapon/cartridge/security(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/taperoll/police(src)
new /obj/item/clothing/accessory/badge/holo/warden(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/cell/device/weapon(src)
new /obj/item/weapon/storage/box/holobadge(src)
new /obj/item/clothing/head/beret/sec/corporate/warden(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/shoes/boots/winter/security(src)
new /obj/item/device/flashlight/maglight(src)
new /obj/item/device/megaphone(src)
new /obj/item/clothing/mask/gas/half(src)
return
/obj/structure/closet/secure_closet/security /obj/structure/closet/secure_closet/security
name = "security officer's locker" name = "security officer's locker"
req_access = list(access_brig)
icon_state = "sec1" icon_state = "sec1"
icon_closed = "sec" icon_closed = "sec"
icon_locked = "sec1" icon_locked = "sec1"
icon_opened = "secopen" icon_opened = "secopen"
icon_broken = "secbroken" icon_broken = "secbroken"
icon_off = "secoff" icon_off = "secoff"
req_access = list(access_brig)
New() starts_with = list(
..() /obj/item/clothing/suit/storage/vest/officer,
if(prob(50)) /obj/item/clothing/head/helmet,
new /obj/item/weapon/storage/backpack/security(src) /obj/item/weapon/cartridge/security,
else /obj/item/device/radio/headset/headset_sec,
new /obj/item/weapon/storage/backpack/satchel/sec(src) /obj/item/device/radio/headset/headset_sec/alt,
if(prob(50)) /obj/item/weapon/storage/belt/security,
new /obj/item/weapon/storage/backpack/dufflebag/sec(src) /obj/item/device/flash,
new /obj/item/clothing/suit/storage/vest/officer(src) /obj/item/weapon/reagent_containers/spray/pepper,
new /obj/item/clothing/head/helmet(src) /obj/item/weapon/grenade/flashbang,
new /obj/item/weapon/cartridge/security(src) /obj/item/weapon/melee/baton/loaded,
new /obj/item/device/radio/headset/headset_sec(src) /obj/item/clothing/glasses/sunglasses/sechud,
new /obj/item/device/radio/headset/headset_sec/alt(src) /obj/item/taperoll/police,
new /obj/item/weapon/storage/belt/security(src) /obj/item/device/hailer,
new /obj/item/device/flash(src) /obj/item/device/flashlight/flare,
new /obj/item/weapon/reagent_containers/spray/pepper(src) /obj/item/clothing/accessory/storage/black_vest,
new /obj/item/weapon/grenade/flashbang(src) /obj/item/clothing/head/soft/sec/corp,
new /obj/item/weapon/melee/baton/loaded(src) /obj/item/clothing/under/rank/security/corp,
new /obj/item/clothing/glasses/sunglasses/sechud(src) /obj/item/ammo_magazine/m45/rubber,
new /obj/item/taperoll/police(src) /obj/item/weapon/gun/energy/taser,
new /obj/item/device/hailer(src) /obj/item/weapon/cell/device/weapon,
new /obj/item/device/flashlight/flare(src) /obj/item/clothing/suit/storage/hooded/wintercoat/security,
new /obj/item/clothing/accessory/storage/black_vest(src) /obj/item/clothing/shoes/boots/winter/security,
new /obj/item/clothing/head/soft/sec/corp(src) /obj/item/device/flashlight/maglight)
new /obj/item/clothing/under/rank/security/corp(src)
new /obj/item/ammo_magazine/m45/rubber(src)
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/weapon/cell/device/weapon(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/shoes/boots/winter/security(src)
new /obj/item/device/flashlight/maglight(src)
return
/obj/structure/closet/secure_closet/security/initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
return ..()
/obj/structure/closet/secure_closet/security/cargo /obj/structure/closet/secure_closet/security/cargo/initialize()
starts_with += /obj/item/clothing/accessory/armband/cargo
starts_with += /obj/item/device/encryptionkey/headset_cargo
return ..()
New() /obj/structure/closet/secure_closet/security/engine/initialize()
..() starts_with += /obj/item/clothing/accessory/armband/engine
new /obj/item/clothing/accessory/armband/cargo(src) starts_with += /obj/item/device/encryptionkey/headset_eng
new /obj/item/device/encryptionkey/headset_cargo(src) return ..()
return
/obj/structure/closet/secure_closet/security/engine /obj/structure/closet/secure_closet/security/science/initialize()
starts_with += /obj/item/clothing/accessory/armband/science
starts_with += /obj/item/device/encryptionkey/headset_sci
return ..()
New() /obj/structure/closet/secure_closet/security/med/initialize()
..() starts_with += /obj/item/clothing/accessory/armband/medblue
new /obj/item/clothing/accessory/armband/engine(src) starts_with += /obj/item/device/encryptionkey/headset_med
new /obj/item/device/encryptionkey/headset_eng(src) return ..()
return
/obj/structure/closet/secure_closet/security/science
New()
..()
new /obj/item/clothing/accessory/armband/science(src)
new /obj/item/device/encryptionkey/headset_sci(src)
return
/obj/structure/closet/secure_closet/security/med
New()
..()
new /obj/item/clothing/accessory/armband/medblue(src)
new /obj/item/device/encryptionkey/headset_med(src)
return
/obj/structure/closet/secure_closet/detective /obj/structure/closet/secure_closet/detective
name = "detective's cabinet" name = "detective's cabinet"
req_access = list(access_forensics_lockers)
icon_state = "cabinetdetective_locked" icon_state = "cabinetdetective_locked"
icon_closed = "cabinetdetective" icon_closed = "cabinetdetective"
icon_locked = "cabinetdetective_locked" icon_locked = "cabinetdetective_locked"
icon_opened = "cabinetdetective_open" icon_opened = "cabinetdetective_open"
icon_broken = "cabinetdetective_broken" icon_broken = "cabinetdetective_broken"
icon_off = "cabinetdetective_broken" icon_off = "cabinetdetective_broken"
req_access = list(access_forensics_lockers)
New() starts_with = list(
..() /obj/item/clothing/accessory/badge/holo/detective,
new /obj/item/clothing/accessory/badge/holo/detective(src) /obj/item/clothing/gloves/black,
new /obj/item/clothing/gloves/black(src) /obj/item/gunbox,
new /obj/item/gunbox(src) /obj/item/weapon/storage/belt/detective,
new /obj/item/weapon/storage/belt/detective(src) /obj/item/weapon/storage/box/evidence,
new /obj/item/weapon/storage/box/evidence(src) /obj/item/device/radio/headset/headset_sec,
new /obj/item/device/radio/headset/headset_sec(src) /obj/item/device/radio/headset/headset_sec/alt,
new /obj/item/device/radio/headset/headset_sec/alt(src) /obj/item/clothing/suit/storage/vest/detective,
new /obj/item/clothing/suit/storage/vest/detective(src) /obj/item/taperoll/police,
new /obj/item/taperoll/police(src) /obj/item/clothing/accessory/holster/armpit,
new /obj/item/clothing/accessory/holster/armpit(src) /obj/item/device/flashlight/maglight,
new /obj/item/device/flashlight/maglight(src) /obj/item/weapon/reagent_containers/food/drinks/flask/detflask,
new /obj/item/weapon/reagent_containers/food/drinks/flask/detflask(src) /obj/item/weapon/storage/briefcase/crimekit,
new /obj/item/weapon/storage/briefcase/crimekit(src) /obj/item/device/taperecorder,
new /obj/item/device/taperecorder(src) /obj/item/device/tape/random = 3)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
return
/obj/structure/closet/secure_closet/detective/update_icon() /obj/structure/closet/secure_closet/detective/update_icon()
if(broken) if(broken)
@@ -308,16 +281,13 @@
else else
icon_state = icon_opened icon_state = icon_opened
/obj/structure/closet/secure_closet/injection /obj/structure/closet/secure_closet/injection
name = "lethal injections locker" name = "lethal injections locker"
req_access = list(access_captain) req_access = list(access_captain)
starts_with = list(
New() /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral = 2)
..()
new /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral(src)
new /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral(src)
return
GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/brig) GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/brig)
@@ -327,40 +297,34 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
anchored = 1 anchored = 1
var/id = null var/id = null
New() starts_with = list(
..() /obj/item/clothing/under/color/orange,
new /obj/item/clothing/under/color/orange( src ) /obj/item/clothing/shoes/orange)
new /obj/item/clothing/shoes/orange( src )
return
/obj/structure/closet/secure_closet/courtroom /obj/structure/closet/secure_closet/courtroom
name = "courtroom locker" name = "courtroom locker"
req_access = list(access_lawyer) req_access = list(access_lawyer)
New() starts_with = list(
..() /obj/item/clothing/shoes/brown,
new /obj/item/clothing/shoes/brown(src) /obj/item/weapon/paper/Court = 3,
new /obj/item/weapon/paper/Court (src) /obj/item/weapon/pen,
new /obj/item/weapon/paper/Court (src) /obj/item/clothing/suit/judgerobe,
new /obj/item/weapon/paper/Court (src) /obj/item/clothing/head/powdered_wig,
new /obj/item/weapon/pen (src) /obj/item/weapon/storage/briefcase)
new /obj/item/clothing/suit/judgerobe (src)
new /obj/item/clothing/head/powdered_wig (src)
new /obj/item/weapon/storage/briefcase(src)
return
/obj/structure/closet/secure_closet/wall /obj/structure/closet/secure_closet/wall
name = "wall locker" name = "wall locker"
req_access = list(access_security)
icon_state = "wall-locker1" icon_state = "wall-locker1"
density = 1
icon_closed = "wall-locker" icon_closed = "wall-locker"
icon_locked = "wall-locker1" icon_locked = "wall-locker1"
icon_opened = "wall-lockeropen" icon_opened = "wall-lockeropen"
icon_broken = "wall-lockerbroken" icon_broken = "wall-lockerbroken"
icon_off = "wall-lockeroff" icon_off = "wall-lockeroff"
req_access = list(access_security)
density = 1
//too small to put a man in //too small to put a man in
large = 0 large = 0

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

@@ -5,77 +5,57 @@
icon_closed = "syndicate" icon_closed = "syndicate"
icon_opened = "syndicateopen" icon_opened = "syndicateopen"
/obj/structure/closet/syndicate/personal /obj/structure/closet/syndicate/personal
desc = "It's a storage unit for operative gear." desc = "It's a storage unit for operative gear."
/obj/structure/closet/syndicate/personal/New() starts_with = list(
..() /obj/item/weapon/tank/jetpack/oxygen,
new /obj/item/weapon/tank/jetpack/oxygen(src) /obj/item/clothing/mask/gas/syndicate,
new /obj/item/clothing/mask/gas/syndicate(src) /obj/item/clothing/under/syndicate,
new /obj/item/clothing/under/syndicate(src) /obj/item/clothing/head/helmet/space/void/merc,
new /obj/item/clothing/head/helmet/space/void/merc(src) /obj/item/clothing/suit/space/void/merc,
new /obj/item/clothing/suit/space/void/merc(src) /obj/item/weapon/crowbar/red,
new /obj/item/weapon/crowbar/red(src) /obj/item/weapon/cell/high,
new /obj/item/weapon/cell/high(src) /obj/item/weapon/card/id/syndicate,
new /obj/item/weapon/card/id/syndicate(src) /obj/item/device/multitool,
new /obj/item/device/multitool(src) /obj/item/weapon/shield/energy,
new /obj/item/weapon/shield/energy(src) /obj/item/clothing/shoes/magboots)
new /obj/item/clothing/shoes/magboots(src)
/obj/structure/closet/syndicate/suit /obj/structure/closet/syndicate/suit
desc = "It's a storage unit for voidsuits." desc = "It's a storage unit for voidsuits."
/obj/structure/closet/syndicate/suit/New() starts_with = list(
..() /obj/item/weapon/tank/jetpack/oxygen,
new /obj/item/weapon/tank/jetpack/oxygen(src) /obj/item/clothing/shoes/magboots,
new /obj/item/clothing/shoes/magboots(src) /obj/item/clothing/suit/space/void/merc,
new /obj/item/clothing/suit/space/void/merc(src) /obj/item/clothing/mask/gas/syndicate,
new /obj/item/clothing/mask/gas/syndicate(src) /obj/item/clothing/head/helmet/space/void/merc)
new /obj/item/clothing/head/helmet/space/void/merc(src)
/obj/structure/closet/syndicate/nuclear /obj/structure/closet/syndicate/nuclear
desc = "It's a storage unit for nuclear-operative gear." desc = "It's a storage unit for nuclear-operative gear."
/obj/structure/closet/syndicate/nuclear/New() starts_with = list(
..() /obj/item/ammo_magazine/m10mm = 5,
/obj/item/weapon/storage/box/handcuffs,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/gun/energy/gun = 5,
/obj/item/weapon/pinpointer/nukeop = 5,
/obj/item/device/pda/syndicate,
/obj/item/device/radio/uplink)
new /obj/item/ammo_magazine/m10mm(src) /obj/structure/closet/syndicate/resources
new /obj/item/ammo_magazine/m10mm(src)
new /obj/item/ammo_magazine/m10mm(src)
new /obj/item/ammo_magazine/m10mm(src)
new /obj/item/ammo_magazine/m10mm(src)
new /obj/item/weapon/storage/box/handcuffs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/device/pda/syndicate(src)
new /obj/item/device/radio/uplink(src)
//U.hidden_uplink.uses = 40
return
/obj/structure/closet/syndicate/resources/
desc = "An old, dusty locker." desc = "An old, dusty locker."
New() /obj/structure/closet/syndicate/resources/initialize()
..() . = ..()
if(!contents.len)
var/common_min = 30 //Minimum amount of minerals in the stack for common minerals var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
var/rare_min = 5 //Minimum HONK of HONK in the stack HONK HONK rare minerals var/rare_min = 5 //Minimum HONK of HONK in the stack HONK HONK rare minerals
var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
var/pickednum = rand(1, 50) var/pickednum = rand(1, 50)
//Sad trombone //Sad trombone
@@ -120,13 +100,11 @@
if(pickednum == 50) if(pickednum == 50)
new /obj/item/weapon/tank/jetpack/carbondioxide(src) new /obj/item/weapon/tank/jetpack/carbondioxide(src)
return
/obj/structure/closet/syndicate/resources/everything /obj/structure/closet/syndicate/resources/everything
desc = "It's an emergency storage closet for repairs." desc = "It's an emergency storage closet for repairs."
New() /obj/structure/closet/syndicate/resources/everything/initialize()
var/list/resources = list( var/list/resources = list(
/obj/item/stack/material/steel, /obj/item/stack/material/steel,
/obj/item/stack/material/glass, /obj/item/stack/material/glass,
/obj/item/stack/material/gold, /obj/item/stack/material/gold,
@@ -136,12 +114,11 @@
/obj/item/stack/material/diamond, /obj/item/stack/material/diamond,
/obj/item/stack/material/plasteel, /obj/item/stack/material/plasteel,
/obj/item/stack/rods /obj/item/stack/rods
) )
for(var/i = 0, i<2, i++)
for(var/res in resources)
var/obj/item/stack/R = new res(src)
R.amount = R.max_amount
for(var/i = 0, i<2, i++) return ..()
for(var/res in resources)
var/obj/item/stack/R = new res(src)
R.amount = R.max_amount
return

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

@@ -14,48 +14,46 @@
*/ */
/obj/structure/closet/emcloset /obj/structure/closet/emcloset
name = "emergency closet" name = "emergency closet"
desc = "It's a storage unit for emergency breathmasks and o2 tanks." desc = "It's a storage unit for emergency breathmasks and O2 tanks."
icon_state = "emergency" icon_state = "emergency"
icon_closed = "emergency" icon_closed = "emergency"
icon_opened = "emergencyopen" icon_opened = "emergencyopen"
/obj/structure/closet/emcloset/New() /obj/structure/closet/emcloset/initialize()
..()
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10))) switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
if ("small") if ("small")
new /obj/item/weapon/tank/emergency/oxygen(src) starts_with = list(
new /obj/item/weapon/tank/emergency/oxygen(src) /obj/item/weapon/tank/emergency/oxygen = 2,
new /obj/item/clothing/mask/breath(src) /obj/item/clothing/mask/breath = 2,
new /obj/item/clothing/mask/breath(src) /obj/item/clothing/suit/space/emergency,
new /obj/item/clothing/suit/space/emergency(src) /obj/item/clothing/head/helmet/space/emergency)
new /obj/item/clothing/head/helmet/space/emergency(src)
if ("aid") if ("aid")
new /obj/item/weapon/tank/emergency/oxygen(src) starts_with = list(
new /obj/item/weapon/storage/toolbox/emergency(src) /obj/item/weapon/tank/emergency/oxygen,
new /obj/item/clothing/mask/breath(src) /obj/item/weapon/storage/toolbox/emergency,
new /obj/item/weapon/storage/firstaid/o2(src) /obj/item/clothing/mask/breath,
new /obj/item/clothing/suit/space/emergency(src) /obj/item/weapon/storage/firstaid/o2,
new /obj/item/clothing/head/helmet/space/emergency(src) /obj/item/clothing/suit/space/emergency,
/obj/item/clothing/head/helmet/space/emergency)
if ("tank") if ("tank")
new /obj/item/weapon/tank/emergency/oxygen/engi(src) starts_with = list(
new /obj/item/clothing/mask/breath(src) /obj/item/weapon/tank/emergency/oxygen/engi = 2,
new /obj/item/weapon/tank/emergency/oxygen/engi(src) /obj/item/clothing/mask/breath = 2)
new /obj/item/clothing/mask/breath(src)
if ("both") if ("both")
new /obj/item/weapon/storage/toolbox/emergency(src) starts_with = list(
new /obj/item/weapon/tank/emergency/oxygen/engi(src) /obj/item/weapon/storage/toolbox/emergency,
new /obj/item/clothing/mask/breath(src) /obj/item/weapon/tank/emergency/oxygen/engi,
new /obj/item/weapon/storage/firstaid/o2(src) /obj/item/clothing/mask/breath,
new /obj/item/clothing/suit/space/emergency(src) /obj/item/weapon/storage/firstaid/o2,
new /obj/item/clothing/suit/space/emergency(src) /obj/item/clothing/suit/space/emergency = 2,
new /obj/item/clothing/head/helmet/space/emergency(src) /obj/item/clothing/head/helmet/space/emergency = 2)
new /obj/item/clothing/head/helmet/space/emergency(src)
/obj/structure/closet/emcloset/legacy/New() return ..()
..()
new /obj/item/weapon/tank/oxygen(src) /obj/structure/closet/emcloset/legacy
new /obj/item/clothing/mask/gas(src) starts_with = list(
/obj/item/weapon/tank/oxygen,
/obj/item/clothing/mask/gas)
/* /*
* Fire Closet * Fire Closet
@@ -67,35 +65,30 @@
icon_closed = "firecloset" icon_closed = "firecloset"
icon_opened = "fireclosetopen" icon_opened = "fireclosetopen"
/obj/structure/closet/firecloset/New() starts_with = list(
..() /obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/weapon/tank/oxygen/red,
/obj/item/weapon/extinguisher,
/obj/item/clothing/head/hardhat/red)
new /obj/item/clothing/suit/fire/firefighter(src) /obj/structure/closet/firecloset/full
new /obj/item/clothing/mask/gas(src) starts_with = list(
new /obj/item/weapon/tank/oxygen/red(src) /obj/item/clothing/suit/fire/firefighter,
new /obj/item/weapon/extinguisher(src) /obj/item/clothing/mask/gas,
new /obj/item/clothing/head/hardhat/red(src) /obj/item/device/flashlight,
/obj/item/weapon/tank/oxygen/red,
/obj/item/weapon/extinguisher,
/obj/item/clothing/head/hardhat/red)
/obj/structure/closet/firecloset/full/New() /obj/structure/closet/firecloset/full/double
..() starts_with = list(
sleep(4) /obj/item/clothing/suit/fire/firefighter = 2,
contents = list() /obj/item/clothing/mask/gas = 2,
/obj/item/device/flashlight = 2,
new /obj/item/clothing/suit/fire/firefighter(src) /obj/item/weapon/tank/oxygen/red = 2,
new /obj/item/clothing/mask/gas(src) /obj/item/weapon/extinguisher = 2,
new /obj/item/device/flashlight(src) /obj/item/clothing/head/hardhat/red = 2)
new /obj/item/weapon/tank/oxygen/red(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
/obj/structure/closet/firecloset/full/double/New()
..()
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/tank/oxygen/red(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
/obj/structure/closet/firecloset/update_icon() /obj/structure/closet/firecloset/update_icon()
if(!opened) if(!opened)
@@ -103,7 +96,6 @@
else else
icon_state = icon_opened icon_state = icon_opened
/* /*
* Tool Closet * Tool Closet
*/ */
@@ -114,39 +106,40 @@
icon_closed = "toolcloset" icon_closed = "toolcloset"
icon_opened = "toolclosetopen" icon_opened = "toolclosetopen"
/obj/structure/closet/toolcloset/New() /obj/structure/closet/toolcloset/initialize()
..() starts_with = list()
if(prob(40)) if(prob(40))
new /obj/item/clothing/suit/storage/hazardvest(src) starts_with += /obj/item/clothing/suit/storage/hazardvest
if(prob(70)) if(prob(70))
new /obj/item/device/flashlight(src) starts_with += /obj/item/device/flashlight
if(prob(70)) if(prob(70))
new /obj/item/weapon/screwdriver(src) starts_with += /obj/item/weapon/screwdriver
if(prob(70)) if(prob(70))
new /obj/item/weapon/wrench(src) starts_with += /obj/item/weapon/wrench
if(prob(70)) if(prob(70))
new /obj/item/weapon/weldingtool(src) starts_with += /obj/item/weapon/weldingtool
if(prob(70)) if(prob(70))
new /obj/item/weapon/crowbar(src) starts_with += /obj/item/weapon/crowbar
if(prob(70)) if(prob(70))
new /obj/item/weapon/wirecutters(src) starts_with += /obj/item/weapon/wirecutters
if(prob(70)) if(prob(70))
new /obj/item/device/t_scanner(src) starts_with += /obj/item/device/t_scanner
if(prob(20)) if(prob(20))
new /obj/item/weapon/storage/belt/utility(src) starts_with += /obj/item/weapon/storage/belt/utility
if(prob(30)) if(prob(30))
new /obj/item/stack/cable_coil/random(src) starts_with += /obj/item/stack/cable_coil/random
if(prob(30)) if(prob(30))
new /obj/item/stack/cable_coil/random(src) starts_with += /obj/item/stack/cable_coil/random
if(prob(30)) if(prob(30))
new /obj/item/stack/cable_coil/random(src) starts_with += /obj/item/stack/cable_coil/random
if(prob(20)) if(prob(20))
new /obj/item/device/multitool(src) starts_with += /obj/item/device/multitool
if(prob(5)) if(prob(5))
new /obj/item/clothing/gloves/yellow(src) starts_with += /obj/item/clothing/gloves/yellow
if(prob(40)) if(prob(40))
new /obj/item/clothing/head/hardhat(src) starts_with += /obj/item/clothing/head/hardhat
return ..()
/* /*
* Radiation Closet * Radiation Closet
@@ -158,14 +151,9 @@
icon_opened = "toolclosetopen" icon_opened = "toolclosetopen"
icon_closed = "radsuitcloset" icon_closed = "radsuitcloset"
/obj/structure/closet/radiation/New() starts_with = list(
..() /obj/item/clothing/suit/radiation = 4,
new /obj/item/clothing/suit/radiation(src) /obj/item/device/geiger = 2)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/device/geiger(src)
new /obj/item/device/geiger(src)
/* /*
* Bombsuit closet * Bombsuit closet
@@ -177,19 +165,18 @@
icon_closed = "bombsuit" icon_closed = "bombsuit"
icon_opened = "bombsuitopen" icon_opened = "bombsuitopen"
/obj/structure/closet/bombcloset/New() starts_with = list(
..() /obj/item/clothing/suit/bomb_suit,
new /obj/item/clothing/suit/bomb_suit( src ) /obj/item/clothing/under/color/black,
new /obj/item/clothing/under/color/black( src ) /obj/item/clothing/shoes/black,
new /obj/item/clothing/shoes/black( src ) /obj/item/clothing/head/bomb_hood)
new /obj/item/clothing/head/bomb_hood( src )
/obj/structure/closet/bombcloset/double/New() // Makes two suits. /obj/structure/closet/bombcloset/double
..() starts_with = list(
new /obj/item/clothing/suit/bomb_suit( src ) /obj/item/clothing/suit/bomb_suit = 2,
new /obj/item/clothing/under/color/black( src ) /obj/item/clothing/under/color/black = 2,
new /obj/item/clothing/shoes/black( src ) /obj/item/clothing/shoes/black = 2,
new /obj/item/clothing/head/bomb_hood( src ) /obj/item/clothing/head/bomb_hood = 2)
/obj/structure/closet/bombclosetsecurity /obj/structure/closet/bombclosetsecurity
name = "\improper EOD closet" name = "\improper EOD closet"
@@ -198,12 +185,11 @@
icon_closed = "bombsuitsec" icon_closed = "bombsuitsec"
icon_opened = "bombsuitsecopen" icon_opened = "bombsuitsecopen"
/obj/structure/closet/bombclosetsecurity/New() starts_with = list(
..() /obj/item/clothing/suit/bomb_suit/security,
new /obj/item/clothing/suit/bomb_suit/security( src ) /obj/item/clothing/under/rank/security,
new /obj/item/clothing/under/rank/security( src ) /obj/item/clothing/shoes/brown,
new /obj/item/clothing/shoes/brown( src ) /obj/item/clothing/head/bomb_hood/security)
new /obj/item/clothing/head/bomb_hood/security( src )
/* /*
* Hydrant * Hydrant
@@ -220,14 +206,13 @@
density = 0 density = 0
wall_mounted = 1 wall_mounted = 1
/obj/structure/closet/hydrant/New() starts_with = list(
..() /obj/item/clothing/suit/fire/firefighter,
new /obj/item/clothing/suit/fire/firefighter(src) /obj/item/clothing/mask/gas,
new /obj/item/clothing/mask/gas(src) /obj/item/device/flashlight,
new /obj/item/device/flashlight(src) /obj/item/weapon/tank/oxygen/red,
new /obj/item/weapon/tank/oxygen/red(src) /obj/item/weapon/extinguisher,
new /obj/item/weapon/extinguisher(src) /obj/item/clothing/head/hardhat/red)
new /obj/item/clothing/head/hardhat/red(src)
/* /*
* First Aid * First Aid

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

@@ -9,54 +9,34 @@
icon_state = "red" icon_state = "red"
icon_closed = "red" icon_closed = "red"
/obj/structure/closet/wardrobe/red/New() starts_with = list(
..() /obj/item/clothing/under/rank/security = 3,
if(prob(50)) /obj/item/clothing/under/rank/security2 = 3,
new /obj/item/weapon/storage/backpack/security(src) /obj/item/clothing/under/rank/security/skirt = 2,
else /obj/item/clothing/shoes/boots/jackboots = 3,
new /obj/item/weapon/storage/backpack/satchel/sec(src) /obj/item/clothing/head/soft/sec = 3,
if(prob(50)) /obj/item/clothing/head/beret/sec = 3,
new /obj/item/weapon/storage/backpack/security(src) /obj/item/clothing/head/beret/sec/corporate/officer = 3,
else /obj/item/clothing/mask/bandana/red = 3,
new /obj/item/weapon/storage/backpack/satchel/sec(src) /obj/item/clothing/suit/storage/hooded/wintercoat/security = 3,
if(prob(50)) /obj/item/clothing/accessory/armband = 3,
new /obj/item/weapon/storage/backpack/security(src) /obj/item/clothing/accessory/holster/waist = 3)
else
new /obj/item/weapon/storage/backpack/satchel/sec(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/beret/sec(src)
new /obj/item/clothing/head/beret/sec(src)
new /obj/item/clothing/head/beret/sec(src)
new /obj/item/clothing/head/beret/sec/corporate/officer(src)
new /obj/item/clothing/head/beret/sec/corporate/officer(src)
new /obj/item/clothing/head/beret/sec/corporate/officer(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/accessory/armband(src)
new /obj/item/clothing/accessory/armband(src)
new /obj/item/clothing/accessory/armband(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/clothing/accessory/holster/waist(src)
return
/obj/structure/closet/wardrobe/red/initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
return ..()
/obj/structure/closet/wardrobe/detective /obj/structure/closet/wardrobe/detective
name = "detective wardrobe" name = "detective wardrobe"
@@ -64,78 +44,44 @@
icon_closed = "cabinet_closed" icon_closed = "cabinet_closed"
icon_opened = "cabinet_open" icon_opened = "cabinet_open"
/obj/structure/closet/wardrobe/detective/New() starts_with = list(
..() /obj/item/clothing/head/det = 2,
new /obj/item/clothing/head/det(src) /obj/item/clothing/head/det/grey = 2,
new /obj/item/clothing/head/det(src) /obj/item/clothing/shoes/brown = 2,
new /obj/item/clothing/head/det/grey(src) /obj/item/clothing/shoes/laceup = 2,
new /obj/item/clothing/head/det/grey(src) /obj/item/clothing/under/det = 2,
new /obj/item/clothing/shoes/brown(src) /obj/item/clothing/under/det/waistcoat = 2,
new /obj/item/clothing/shoes/brown(src) /obj/item/clothing/under/det/grey = 2,
new /obj/item/clothing/shoes/laceup(src) /obj/item/clothing/under/det/grey/waistcoat = 2,
new /obj/item/clothing/shoes/laceup(src) /obj/item/clothing/under/det/black = 2,
new /obj/item/clothing/under/det(src) /obj/item/clothing/under/det/skirt,
new /obj/item/clothing/under/det(src) /obj/item/clothing/under/det/corporate = 2,
new /obj/item/clothing/under/det/waistcoat(src) /obj/item/clothing/suit/storage/det_trench = 2,
new /obj/item/clothing/under/det/waistcoat(src) /obj/item/clothing/suit/storage/det_trench/grey = 2,
new /obj/item/clothing/under/det/grey(src) /obj/item/clothing/suit/storage/forensics/blue = 2,
new /obj/item/clothing/under/det/grey(src) /obj/item/clothing/suit/storage/forensics/red = 2)
new /obj/item/clothing/under/det/grey/waistcoat(src)
new /obj/item/clothing/under/det/grey/waistcoat(src)
new /obj/item/clothing/under/det/black(src)
new /obj/item/clothing/under/det/black(src)
new /obj/item/clothing/under/det/skirt(src)
new /obj/item/clothing/under/det/corporate(src)
new /obj/item/clothing/under/det/corporate(src)
new /obj/item/clothing/suit/storage/det_trench(src)
new /obj/item/clothing/suit/storage/det_trench(src)
new /obj/item/clothing/suit/storage/det_trench/grey(src)
new /obj/item/clothing/suit/storage/det_trench/grey(src)
new /obj/item/clothing/suit/storage/forensics/blue(src)
new /obj/item/clothing/suit/storage/forensics/blue(src)
new /obj/item/clothing/suit/storage/forensics/red(src)
new /obj/item/clothing/suit/storage/forensics/red(src)
return
/obj/structure/closet/wardrobe/pink /obj/structure/closet/wardrobe/pink
name = "pink wardrobe" name = "pink wardrobe"
icon_state = "pink" icon_state = "pink"
icon_closed = "pink" icon_closed = "pink"
/obj/structure/closet/wardrobe/pink/New() starts_with = list(
..() /obj/item/clothing/under/color/pink = 3,
new /obj/item/clothing/under/color/pink(src) /obj/item/clothing/shoes/brown = 3)
new /obj/item/clothing/under/color/pink(src)
new /obj/item/clothing/under/color/pink(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/brown(src)
return
/obj/structure/closet/wardrobe/black /obj/structure/closet/wardrobe/black
name = "black wardrobe" name = "black wardrobe"
icon_state = "black" icon_state = "black"
icon_closed = "black" icon_closed = "black"
/obj/structure/closet/wardrobe/black/New() starts_with = list(
..() /obj/item/clothing/under/color/black = 3,
new /obj/item/clothing/under/color/black(src) /obj/item/clothing/shoes/black = 3,
new /obj/item/clothing/under/color/black(src) /obj/item/clothing/head/that = 3,
new /obj/item/clothing/under/color/black(src) /obj/item/clothing/head/soft/black = 3,
new /obj/item/clothing/shoes/black(src) /obj/item/clothing/mask/bandana = 3,
new /obj/item/clothing/shoes/black(src) /obj/item/weapon/storage/backpack/messenger/black)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/head/that(src)
new /obj/item/clothing/head/that(src)
new /obj/item/clothing/head/that(src)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/mask/bandana(src)
new /obj/item/clothing/mask/bandana(src)
new /obj/item/clothing/mask/bandana(src)
new /obj/item/weapon/storage/backpack/messenger/black(src)
return
/obj/structure/closet/wardrobe/chaplain_black /obj/structure/closet/wardrobe/chaplain_black
@@ -144,21 +90,18 @@
icon_state = "black" icon_state = "black"
icon_closed = "black" icon_closed = "black"
/obj/structure/closet/wardrobe/chaplain_black/New() starts_with = list(
..() /obj/item/clothing/under/rank/chaplain,
new /obj/item/clothing/under/rank/chaplain(src) /obj/item/clothing/shoes/black,
new /obj/item/clothing/shoes/black(src) /obj/item/clothing/suit/nun,
new /obj/item/clothing/suit/nun(src) /obj/item/clothing/head/nun_hood,
new /obj/item/clothing/head/nun_hood(src) /obj/item/clothing/suit/storage/hooded/chaplain_hoodie,
new /obj/item/clothing/suit/storage/hooded/chaplain_hoodie(src) /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout,
new /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout(src) /obj/item/clothing/suit/holidaypriest,
new /obj/item/clothing/suit/holidaypriest(src) /obj/item/clothing/under/wedding/bride_white,
new /obj/item/clothing/under/wedding/bride_white(src) /obj/item/weapon/storage/backpack/cultpack,
new /obj/item/weapon/storage/backpack/cultpack (src) /obj/item/weapon/storage/fancy/candle_box = 2,
new /obj/item/weapon/storage/fancy/candle_box(src) /obj/item/weapon/deck/tarot)
new /obj/item/weapon/storage/fancy/candle_box(src)
new /obj/item/weapon/deck/tarot(src)
return
/obj/structure/closet/wardrobe/green /obj/structure/closet/wardrobe/green
@@ -166,40 +109,24 @@
icon_state = "green" icon_state = "green"
icon_closed = "green" icon_closed = "green"
/obj/structure/closet/wardrobe/green/New() starts_with = list(
..() /obj/item/clothing/under/color/green = 3,
new /obj/item/clothing/under/color/green(src) /obj/item/clothing/shoes/green = 3,
new /obj/item/clothing/under/color/green(src) /obj/item/clothing/head/soft/green = 3,
new /obj/item/clothing/under/color/green(src) /obj/item/clothing/mask/bandana/green = 3)
new /obj/item/clothing/shoes/green(src)
new /obj/item/clothing/shoes/green(src)
new /obj/item/clothing/shoes/green(src)
new /obj/item/clothing/head/soft/green(src)
new /obj/item/clothing/head/soft/green(src)
new /obj/item/clothing/head/soft/green(src)
new /obj/item/clothing/mask/bandana/green(src)
new /obj/item/clothing/mask/bandana/green(src)
new /obj/item/clothing/mask/bandana/green(src)
return
/obj/structure/closet/wardrobe/xenos /obj/structure/closet/wardrobe/xenos
name = "xenos wardrobe" name = "xenos wardrobe"
icon_state = "green" icon_state = "green"
icon_closed = "green" icon_closed = "green"
/obj/structure/closet/wardrobe/xenos/New() starts_with = list(
..() /obj/item/clothing/suit/unathi/mantle,
new /obj/item/clothing/suit/unathi/mantle(src) /obj/item/clothing/suit/unathi/robe,
new /obj/item/clothing/suit/unathi/robe(src) /obj/item/clothing/shoes/sandal = 2,
new /obj/item/clothing/shoes/sandal(src) /obj/item/clothing/shoes/footwraps = 2,
new /obj/item/clothing/shoes/sandal(src) /obj/item/clothing/shoes/boots/winter = 2,
new /obj/item/clothing/shoes/footwraps(src) /obj/item/clothing/suit/storage/hooded/wintercoat = 2)
new /obj/item/clothing/shoes/footwraps(src)
new /obj/item/clothing/shoes/boots/winter(src)
new /obj/item/clothing/shoes/boots/winter(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat(src)
return
/obj/structure/closet/wardrobe/orange /obj/structure/closet/wardrobe/orange
@@ -208,15 +135,9 @@
icon_state = "orange" icon_state = "orange"
icon_closed = "orange" icon_closed = "orange"
/obj/structure/closet/wardrobe/orange/New() starts_with = list(
..() /obj/item/clothing/under/color/orange = 3,
new /obj/item/clothing/under/color/orange(src) /obj/item/clothing/shoes/orange = 3)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
return
/obj/structure/closet/wardrobe/yellow /obj/structure/closet/wardrobe/yellow
@@ -224,21 +145,11 @@
icon_state = "yellow" icon_state = "yellow"
icon_closed = "yellow" icon_closed = "yellow"
/obj/structure/closet/wardrobe/yellow/New() starts_with = list(
..() /obj/item/clothing/under/color/yellow = 3,
new /obj/item/clothing/under/color/yellow(src) /obj/item/clothing/shoes/yellow = 3,
new /obj/item/clothing/under/color/yellow(src) /obj/item/clothing/head/soft/yellow = 3,
new /obj/item/clothing/under/color/yellow(src) /obj/item/clothing/mask/bandana/gold = 3)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/head/soft/yellow(src)
new /obj/item/clothing/head/soft/yellow(src)
new /obj/item/clothing/head/soft/yellow(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
return
/obj/structure/closet/wardrobe/atmospherics_yellow /obj/structure/closet/wardrobe/atmospherics_yellow
@@ -246,69 +157,31 @@
icon_state = "yellow" icon_state = "yellow"
icon_closed = "yellow" icon_closed = "yellow"
/obj/structure/closet/wardrobe/atmospherics_yellow/New() starts_with = list(
..() /obj/item/clothing/under/rank/atmospheric_technician = 3,
new /obj/item/clothing/under/rank/atmospheric_technician(src) /obj/item/clothing/under/rank/atmospheric_technician/skirt = 3,
new /obj/item/clothing/under/rank/atmospheric_technician(src) /obj/item/clothing/shoes/black = 3,
new /obj/item/clothing/under/rank/atmospheric_technician(src) /obj/item/clothing/head/hardhat/red = 3,
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src) /obj/item/clothing/head/beret/engineering = 3,
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src) /obj/item/clothing/mask/bandana/gold = 3,
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src) /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos = 3,
new /obj/item/clothing/shoes/black(src) /obj/item/clothing/shoes/boots/winter/atmos = 3)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/clothing/head/beret/engineering(src)
new /obj/item/clothing/head/beret/engineering(src)
new /obj/item/clothing/head/beret/engineering(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
new /obj/item/clothing/shoes/boots/winter/atmos(src)
new /obj/item/clothing/shoes/boots/winter/atmos(src)
new /obj/item/clothing/shoes/boots/winter/atmos(src)
return
/obj/structure/closet/wardrobe/engineering_yellow /obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe" name = "engineering wardrobe"
icon_state = "yellow" icon_state = "yellow"
icon_closed = "yellow" icon_closed = "yellow"
/obj/structure/closet/wardrobe/engineering_yellow/New() starts_with = list(
..() /obj/item/clothing/under/rank/engineer = 3,
new /obj/item/clothing/under/rank/engineer(src) /obj/item/clothing/under/rank/engineer/skirt = 3,
new /obj/item/clothing/under/rank/engineer(src) /obj/item/clothing/shoes/orange = 3,
new /obj/item/clothing/under/rank/engineer(src) /obj/item/clothing/head/hardhat = 3,
new /obj/item/clothing/under/rank/engineer/skirt(src) /obj/item/clothing/head/beret/engineering = 3,
new /obj/item/clothing/under/rank/engineer/skirt(src) /obj/item/clothing/mask/bandana/gold = 3,
new /obj/item/clothing/under/rank/engineer/skirt(src) /obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 3,
new /obj/item/clothing/shoes/orange(src) /obj/item/clothing/shoes/boots/winter/engineering = 3,
new /obj/item/clothing/shoes/orange(src) /obj/item/clothing/shoes/boots/workboots = 3)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/head/hardhat(src)
new /obj/item/clothing/head/hardhat(src)
new /obj/item/clothing/head/hardhat(src)
new /obj/item/clothing/head/beret/engineering(src)
new /obj/item/clothing/head/beret/engineering(src)
new /obj/item/clothing/head/beret/engineering(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/clothing/shoes/boots/workboots(src)
new /obj/item/clothing/shoes/boots/workboots(src)
new /obj/item/clothing/shoes/boots/workboots(src)
return
/obj/structure/closet/wardrobe/white /obj/structure/closet/wardrobe/white
@@ -316,18 +189,10 @@
icon_state = "white" icon_state = "white"
icon_closed = "white" icon_closed = "white"
/obj/structure/closet/wardrobe/white/New() starts_with = list(
..() /obj/item/clothing/under/color/white = 3,
new /obj/item/clothing/under/color/white(src) /obj/item/clothing/shoes/white = 3,
new /obj/item/clothing/under/color/white(src) /obj/item/clothing/head/soft/mime = 3)
new /obj/item/clothing/under/color/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head/soft/mime(src)
return
/obj/structure/closet/wardrobe/pjs /obj/structure/closet/wardrobe/pjs
@@ -335,17 +200,11 @@
icon_state = "white" icon_state = "white"
icon_closed = "white" icon_closed = "white"
/obj/structure/closet/wardrobe/pjs/New() starts_with = list(
..() /obj/item/clothing/under/pj/red = 2,
new /obj/item/clothing/under/pj/red(src) /obj/item/clothing/under/pj/blue = 2,
new /obj/item/clothing/under/pj/red(src) /obj/item/clothing/shoes/white = 2,
new /obj/item/clothing/under/pj/blue(src) /obj/item/clothing/shoes/slippers = 2)
new /obj/item/clothing/under/pj/blue(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/slippers(src)
new /obj/item/clothing/shoes/slippers(src)
return
/obj/structure/closet/wardrobe/science_white /obj/structure/closet/wardrobe/science_white
@@ -353,60 +212,50 @@
icon_state = "white" icon_state = "white"
icon_closed = "white" icon_closed = "white"
/obj/structure/closet/wardrobe/science_white/New() starts_with = list(
..() /obj/item/clothing/under/rank/scientist = 3,
new /obj/item/clothing/under/rank/scientist(src) /obj/item/clothing/under/rank/scientist/skirt = 2,
new /obj/item/clothing/under/rank/scientist(src) /obj/item/clothing/suit/storage/toggle/labcoat = 3,
new /obj/item/clothing/under/rank/scientist(src) /obj/item/clothing/shoes/white = 3,
new /obj/item/clothing/under/rank/scientist/skirt(src) /obj/item/clothing/shoes/slippers = 3,
new /obj/item/clothing/under/rank/scientist/skirt(src) /obj/item/clothing/suit/storage/hooded/wintercoat/science,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/clothing/shoes/boots/winter/science,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/weapon/storage/backpack/toxins,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/weapon/storage/backpack/satchel/tox)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src) /obj/structure/closet/wardrobe/science_white/initialize()
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/slippers(src)
new /obj/item/clothing/shoes/slippers(src)
new /obj/item/clothing/shoes/slippers(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else else
new /obj/item/weapon/storage/backpack/satchel/tox(src) starts_with += /obj/item/weapon/storage/backpack/satchel/tox
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else else
new /obj/item/weapon/storage/backpack/satchel/tox(src) starts_with += /obj/item/weapon/storage/backpack/satchel/tox
return ..()
/obj/structure/closet/wardrobe/robotics_black /obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe" name = "robotics wardrobe"
icon_state = "black" icon_state = "black"
icon_closed = "black" icon_closed = "black"
/obj/structure/closet/wardrobe/robotics_black/New() starts_with = list(
..() /obj/item/clothing/under/rank/roboticist = 2,
new /obj/item/clothing/under/rank/roboticist(src) /obj/item/clothing/suit/storage/toggle/labcoat = 2,
new /obj/item/clothing/under/rank/roboticist(src) /obj/item/clothing/shoes/black = 2,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/clothing/gloves/black = 2,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/weapon/storage/backpack/toxins,
new /obj/item/clothing/shoes/black(src) /obj/item/weapon/storage/backpack/satchel/tox)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/gloves/black(src) /obj/structure/closet/wardrobe/robotics_black/initialize()
new /obj/item/clothing/gloves/black(src)
new /obj/item/weapon/storage/backpack/toxins(src)
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else else
new /obj/item/weapon/storage/backpack/satchel/tox(src) starts_with += /obj/item/weapon/storage/backpack/satchel/tox
new /obj/item/weapon/storage/backpack/satchel/tox(src)
if(prob(50)) return ..()
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
return
/obj/structure/closet/wardrobe/chemistry_white /obj/structure/closet/wardrobe/chemistry_white
@@ -414,23 +263,14 @@
icon_state = "white" icon_state = "white"
icon_closed = "white" icon_closed = "white"
/obj/structure/closet/wardrobe/chemistry_white/New() starts_with = list(
..() /obj/item/clothing/under/rank/chemist = 2,
new /obj/item/clothing/under/rank/chemist(src) /obj/item/clothing/under/rank/chemist/skirt = 2,
new /obj/item/clothing/under/rank/chemist(src) /obj/item/clothing/shoes/white = 2,
new /obj/item/clothing/under/rank/chemist/skirt(src) /obj/item/clothing/suit/storage/toggle/labcoat/chemist = 2,
new /obj/item/clothing/under/rank/chemist/skirt(src) /obj/item/weapon/storage/backpack/chemistry = 2,
new /obj/item/clothing/shoes/white(src) /obj/item/weapon/storage/backpack/satchel/chem = 2,
new /obj/item/clothing/shoes/white(src) /obj/item/weapon/storage/bag/chemistry = 2,)
new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
new /obj/item/weapon/storage/backpack/chemistry(src)
new /obj/item/weapon/storage/backpack/chemistry(src)
new /obj/item/weapon/storage/backpack/satchel/chem(src)
new /obj/item/weapon/storage/backpack/satchel/chem(src)
new /obj/item/weapon/storage/bag/chemistry(src)
new /obj/item/weapon/storage/bag/chemistry(src)
return
/obj/structure/closet/wardrobe/genetics_white /obj/structure/closet/wardrobe/genetics_white
@@ -438,21 +278,13 @@
icon_state = "white" icon_state = "white"
icon_closed = "white" icon_closed = "white"
/obj/structure/closet/wardrobe/genetics_white/New() starts_with = list(
..() /obj/item/clothing/under/rank/geneticist = 2,
new /obj/item/clothing/under/rank/geneticist(src) /obj/item/clothing/under/rank/geneticist/skirt = 2,
new /obj/item/clothing/under/rank/geneticist(src) /obj/item/clothing/shoes/white = 2,
new /obj/item/clothing/under/rank/geneticist/skirt(src) /obj/item/clothing/suit/storage/toggle/labcoat/genetics = 2,
new /obj/item/clothing/under/rank/geneticist/skirt(src) /obj/item/weapon/storage/backpack/genetics = 2,
new /obj/item/clothing/shoes/white(src) /obj/item/weapon/storage/backpack/satchel/gen = 2)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
new /obj/item/weapon/storage/backpack/genetics(src)
new /obj/item/weapon/storage/backpack/genetics(src)
new /obj/item/weapon/storage/backpack/satchel/gen(src)
new /obj/item/weapon/storage/backpack/satchel/gen(src)
return
/obj/structure/closet/wardrobe/virology_white /obj/structure/closet/wardrobe/virology_white
@@ -460,23 +292,14 @@
icon_state = "white" icon_state = "white"
icon_closed = "white" icon_closed = "white"
/obj/structure/closet/wardrobe/virology_white/New() starts_with = list(
..() /obj/item/clothing/under/rank/virologist = 2,
new /obj/item/clothing/under/rank/virologist(src) /obj/item/clothing/under/rank/virologist/skirt = 2,
new /obj/item/clothing/under/rank/virologist(src) /obj/item/clothing/shoes/white = 2,
new /obj/item/clothing/under/rank/virologist/skirt(src) /obj/item/clothing/suit/storage/toggle/labcoat/virologist = 2,
new /obj/item/clothing/under/rank/virologist/skirt(src) /obj/item/clothing/mask/surgical = 2,
new /obj/item/clothing/shoes/white(src) /obj/item/weapon/storage/backpack/virology = 2,
new /obj/item/clothing/shoes/white(src) /obj/item/weapon/storage/backpack/satchel/vir = 2)
new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/weapon/storage/backpack/virology(src)
new /obj/item/weapon/storage/backpack/virology(src)
new /obj/item/weapon/storage/backpack/satchel/vir(src)
new /obj/item/weapon/storage/backpack/satchel/vir(src)
return
/obj/structure/closet/wardrobe/medic_white /obj/structure/closet/wardrobe/medic_white
@@ -484,33 +307,24 @@
icon_state = "white" icon_state = "white"
icon_closed = "white" icon_closed = "white"
/obj/structure/closet/wardrobe/medic_white/New() starts_with = list(
..() /obj/item/clothing/under/rank/medical = 2,
new /obj/item/clothing/under/rank/medical(src) /obj/item/clothing/under/rank/medical/skirt = 2,
new /obj/item/clothing/under/rank/medical(src) /obj/item/clothing/under/rank/medical/scrubs,
new /obj/item/clothing/under/rank/medical/skirt(src) /obj/item/clothing/under/rank/medical/scrubs/green,
new /obj/item/clothing/under/rank/medical/skirt(src) /obj/item/clothing/under/rank/medical/scrubs/purple,
new /obj/item/clothing/under/rank/medical/scrubs(src) /obj/item/clothing/under/rank/medical/scrubs/black,
new /obj/item/clothing/under/rank/medical/scrubs/green(src) /obj/item/clothing/under/rank/medical/scrubs/navyblue,
new /obj/item/clothing/under/rank/medical/scrubs/purple(src) /obj/item/clothing/head/surgery/navyblue,
new /obj/item/clothing/under/rank/medical/scrubs/black(src) /obj/item/clothing/head/surgery/purple,
new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) /obj/item/clothing/head/surgery/blue,
new /obj/item/clothing/head/surgery/navyblue(src) /obj/item/clothing/head/surgery/green,
new /obj/item/clothing/head/surgery/purple(src) /obj/item/clothing/head/surgery/black,
new /obj/item/clothing/head/surgery/blue(src) /obj/item/clothing/shoes/white = 2,
new /obj/item/clothing/head/surgery/green(src) /obj/item/clothing/suit/storage/toggle/labcoat = 2,
new /obj/item/clothing/head/surgery/black(src) /obj/item/clothing/mask/surgical = 2,
new /obj/item/clothing/shoes/white(src) /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 2,
new /obj/item/clothing/shoes/white(src) /obj/item/clothing/shoes/boots/winter/medical = 2)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
return
/obj/structure/closet/wardrobe/medic_gown /obj/structure/closet/wardrobe/medic_gown
@@ -518,13 +332,8 @@
icon_state = "white" icon_state = "white"
icon_closed = "white" icon_closed = "white"
/obj/structure/closet/wardrobe/medic_gown/New() starts_with = list(
..() /obj/item/clothing/under/medigown = 4)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
return
/obj/structure/closet/wardrobe/grey /obj/structure/closet/wardrobe/grey
@@ -532,18 +341,10 @@
icon_state = "grey" icon_state = "grey"
icon_closed = "grey" icon_closed = "grey"
/obj/structure/closet/wardrobe/grey/New() starts_with = list(
..() /obj/item/clothing/under/color/grey = 3,
new /obj/item/clothing/under/color/grey(src) /obj/item/clothing/shoes/black = 3,
new /obj/item/clothing/under/color/grey(src) /obj/item/clothing/head/soft/grey = 3)
new /obj/item/clothing/under/color/grey(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft/grey(src)
return
/obj/structure/closet/wardrobe/mixed /obj/structure/closet/wardrobe/mixed
@@ -551,38 +352,37 @@
icon_state = "mixed" icon_state = "mixed"
icon_closed = "mixed" icon_closed = "mixed"
/obj/structure/closet/wardrobe/mixed/New() starts_with = list(
..() /obj/item/clothing/under/color/blue,
new /obj/item/clothing/under/color/blue(src) /obj/item/clothing/under/color/yellow,
new /obj/item/clothing/under/color/yellow(src) /obj/item/clothing/under/color/green,
new /obj/item/clothing/under/color/green(src) /obj/item/clothing/under/color/pink,
new /obj/item/clothing/under/color/pink(src) /obj/item/clothing/under/skirt/outfit/plaid_blue,
new /obj/item/clothing/under/skirt/outfit/plaid_blue(src) /obj/item/clothing/under/skirt/outfit/plaid_red,
new /obj/item/clothing/under/skirt/outfit/plaid_red(src) /obj/item/clothing/under/skirt/outfit/plaid_purple,
new /obj/item/clothing/under/skirt/outfit/plaid_purple(src) /obj/item/clothing/shoes/blue,
new /obj/item/clothing/shoes/blue(src) /obj/item/clothing/shoes/yellow,
new /obj/item/clothing/shoes/yellow(src) /obj/item/clothing/shoes/green,
new /obj/item/clothing/shoes/green(src) /obj/item/clothing/shoes/purple,
new /obj/item/clothing/shoes/purple(src) /obj/item/clothing/shoes/red,
new /obj/item/clothing/shoes/red(src) /obj/item/clothing/shoes/leather,
new /obj/item/clothing/shoes/leather(src) /obj/item/clothing/under/pants/classicjeans,
new /obj/item/clothing/under/pants/classicjeans(src) /obj/item/clothing/under/pants/mustangjeans,
new /obj/item/clothing/under/pants/mustangjeans(src) /obj/item/clothing/under/pants/blackjeans,
new /obj/item/clothing/under/pants/blackjeans(src) /obj/item/clothing/under/pants/youngfolksjeans,
new /obj/item/clothing/under/pants/youngfolksjeans(src) /obj/item/clothing/under/pants/white,
new /obj/item/clothing/under/pants/white(src) /obj/item/clothing/under/pants/red,
new /obj/item/clothing/under/pants/red(src) /obj/item/clothing/under/pants/black,
new /obj/item/clothing/under/pants/black(src) /obj/item/clothing/under/pants/tan,
new /obj/item/clothing/under/pants/tan(src) /obj/item/clothing/under/pants/track,
new /obj/item/clothing/under/pants/track(src) /obj/item/clothing/suit/storage/toggle/track,
new /obj/item/clothing/suit/storage/toggle/track(src) /obj/item/clothing/under/pants,
new /obj/item/clothing/under/pants(src) /obj/item/clothing/under/pants/khaki,
new /obj/item/clothing/under/pants/khaki(src) /obj/item/clothing/mask/bandana/blue,
new /obj/item/clothing/mask/bandana/blue(src) /obj/item/clothing/mask/bandana/blue,
new /obj/item/clothing/mask/bandana/blue(src) /obj/item/clothing/accessory/hawaii,
new /obj/item/clothing/accessory/hawaii(src) /obj/item/clothing/accessory/hawaii/random)
new /obj/item/clothing/accessory/hawaii/random(src)
return
/obj/structure/closet/wardrobe/tactical /obj/structure/closet/wardrobe/tactical
name = "tactical equipment" name = "tactical equipment"
@@ -590,24 +390,26 @@
icon_closed = "syndicate1" icon_closed = "syndicate1"
icon_opened = "syndicate1open" icon_opened = "syndicate1open"
/obj/structure/closet/wardrobe/tactical/New() starts_with = list(
..() /obj/item/clothing/under/tactical,
new /obj/item/clothing/under/tactical(src) /obj/item/clothing/suit/armor/tactical,
new /obj/item/clothing/suit/armor/tactical(src) /obj/item/clothing/head/helmet/tactical,
new /obj/item/clothing/head/helmet/tactical(src) /obj/item/clothing/mask/balaclava/tactical,
new /obj/item/clothing/mask/balaclava/tactical(src) /obj/item/clothing/mask/balaclava,
new /obj/item/clothing/mask/balaclava(src) /obj/item/clothing/glasses/sunglasses/sechud/tactical,
new /obj/item/clothing/glasses/sunglasses/sechud/tactical(src) /obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/gloves/black,
/obj/item/clothing/under/pants/camo)
/obj/structure/closet/wardrobe/tactical/initialize()
if(prob(25)) if(prob(25))
new /obj/item/weapon/storage/belt/security/tactical/bandolier(src) starts_with += /obj/item/weapon/storage/belt/security/tactical/bandolier
else else
new /obj/item/weapon/storage/belt/security/tactical(src) starts_with += /obj/item/weapon/storage/belt/security/tactical
if(prob(10)) if(prob(10))
new /obj/item/clothing/mask/bandana/skull(src) starts_with += /obj/item/clothing/mask/bandana/skull
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/gloves/black(src) return ..()
new /obj/item/clothing/under/pants/camo(src)
return
/obj/structure/closet/wardrobe/ert /obj/structure/closet/wardrobe/ert
name = "emergency response team equipment" name = "emergency response team equipment"
@@ -615,52 +417,47 @@
icon_closed = "syndicate1" icon_closed = "syndicate1"
icon_opened = "syndicate1open" icon_opened = "syndicate1open"
/obj/structure/closet/wardrobe/ert/New() starts_with = list(
..() /obj/item/clothing/under/rank/centcom,
new /obj/item/clothing/under/rank/centcom(src) /obj/item/clothing/under/ert,
new /obj/item/clothing/under/ert(src) /obj/item/clothing/under/syndicate/combat,
new /obj/item/clothing/under/syndicate/combat(src) /obj/item/device/radio/headset/ert/alt,
new /obj/item/device/radio/headset/ert/alt(src) /obj/item/clothing/glasses/sunglasses,
new /obj/item/clothing/glasses/sunglasses(src) /obj/item/clothing/shoes/boots/swat,
new /obj/item/clothing/shoes/boots/swat(src) /obj/item/clothing/gloves/swat,
new /obj/item/clothing/gloves/swat(src) /obj/item/clothing/mask/balaclava/tactical,
new /obj/item/clothing/mask/balaclava/tactical(src) /obj/item/clothing/mask/balaclava,
new /obj/item/clothing/mask/balaclava(src) /obj/item/clothing/mask/bandana/skull = 2)
new /obj/item/clothing/mask/bandana/skull(src)
new /obj/item/clothing/mask/bandana/skull(src)
return
/obj/structure/closet/wardrobe/suit /obj/structure/closet/wardrobe/suit
name = "suit locker" name = "suit locker"
icon_state = "mixed" icon_state = "mixed"
icon_closed = "mixed" icon_closed = "mixed"
/obj/structure/closet/wardrobe/suit/New() starts_with = list(
..() /obj/item/clothing/under/assistantformal,
new /obj/item/clothing/under/assistantformal(src) /obj/item/clothing/under/suit_jacket/charcoal,
new /obj/item/clothing/under/suit_jacket/charcoal(src) /obj/item/clothing/under/suit_jacket/charcoal/skirt,
new /obj/item/clothing/under/suit_jacket/charcoal/skirt(src) /obj/item/clothing/under/suit_jacket/navy,
new /obj/item/clothing/under/suit_jacket/navy(src) /obj/item/clothing/under/suit_jacket/navy/skirt,
new /obj/item/clothing/under/suit_jacket/navy/skirt(src) /obj/item/clothing/under/suit_jacket/burgundy,
new /obj/item/clothing/under/suit_jacket/burgundy(src) /obj/item/clothing/under/suit_jacket/burgundy/skirt,
new /obj/item/clothing/under/suit_jacket/burgundy/skirt(src) /obj/item/clothing/under/suit_jacket/checkered,
new /obj/item/clothing/under/suit_jacket/checkered(src) /obj/item/clothing/under/suit_jacket/checkered/skirt,
new /obj/item/clothing/under/suit_jacket/checkered/skirt(src) /obj/item/clothing/under/suit_jacket/tan,
new /obj/item/clothing/under/suit_jacket/tan(src) /obj/item/clothing/under/suit_jacket/tan/skirt,
new /obj/item/clothing/under/suit_jacket/tan/skirt(src) /obj/item/clothing/under/sl_suit,
new /obj/item/clothing/under/sl_suit(src) /obj/item/clothing/under/suit_jacket,
new /obj/item/clothing/under/suit_jacket(src) /obj/item/clothing/under/suit_jacket/female,
new /obj/item/clothing/under/suit_jacket/female(src) /obj/item/clothing/under/suit_jacket/female/skirt,
new /obj/item/clothing/under/suit_jacket/female/skirt(src) /obj/item/clothing/under/suit_jacket/really_black,
new /obj/item/clothing/under/suit_jacket/really_black(src) /obj/item/clothing/under/suit_jacket/really_black/skirt,
new /obj/item/clothing/under/suit_jacket/really_black/skirt(src) /obj/item/clothing/under/suit_jacket/red,
new /obj/item/clothing/under/suit_jacket/red(src) /obj/item/clothing/under/suit_jacket/red/skirt,
new /obj/item/clothing/under/suit_jacket/red/skirt(src) /obj/item/clothing/under/scratch,
new /obj/item/clothing/under/scratch(src) /obj/item/clothing/under/scratch/skirt,
new /obj/item/clothing/under/scratch/skirt(src) /obj/item/weapon/storage/backpack/satchel = 2)
new /obj/item/weapon/storage/backpack/satchel(src)
new /obj/item/weapon/storage/backpack/satchel(src)
return
/obj/structure/closet/wardrobe/captain /obj/structure/closet/wardrobe/captain
name = "colony director's wardrobe" name = "colony director's wardrobe"
@@ -668,24 +465,22 @@
icon_closed = "cabinet_closed" icon_closed = "cabinet_closed"
icon_opened = "cabinet_open" icon_opened = "cabinet_open"
/obj/structure/closet/wardrobe/captain/New() starts_with = list(
..() /obj/item/weapon/storage/backpack/captain,
new /obj/item/weapon/storage/backpack/captain(src) /obj/item/clothing/suit/captunic,
new /obj/item/clothing/suit/captunic(src) /obj/item/clothing/suit/captunic/capjacket,
new /obj/item/clothing/suit/captunic/capjacket(src) /obj/item/clothing/head/caphat/cap,
new /obj/item/clothing/head/caphat/cap(src) /obj/item/clothing/under/rank/captain,
new /obj/item/clothing/under/rank/captain(src) /obj/item/clothing/shoes/brown,
new /obj/item/clothing/shoes/brown(src) /obj/item/clothing/gloves/captain,
new /obj/item/clothing/gloves/captain(src) /obj/item/clothing/under/dress/dress_cap,
new /obj/item/clothing/under/dress/dress_cap(src) /obj/item/weapon/storage/backpack/satchel/cap,
new /obj/item/weapon/storage/backpack/satchel/cap(src) /obj/item/clothing/head/caphat/formal,
new /obj/item/clothing/head/caphat/formal(src) /obj/item/clothing/under/captainformal,
new /obj/item/clothing/under/captainformal(src) /obj/item/clothing/suit/storage/hooded/wintercoat/captain,
new /obj/item/clothing/suit/storage/hooded/wintercoat/captain(src) /obj/item/clothing/shoes/boots/winter/command,
new /obj/item/clothing/shoes/boots/winter/command(src) /obj/item/clothing/head/beret/centcom/captain,
new /obj/item/clothing/head/beret/centcom/captain(src) /obj/item/clothing/under/gimmick/rank/captain/suit,
new /obj/item/clothing/under/gimmick/rank/captain/suit(src) /obj/item/clothing/under/gimmick/rank/captain/suit/skirt,
new /obj/item/clothing/under/gimmick/rank/captain/suit/skirt(src) /obj/item/clothing/glasses/sunglasses,
new /obj/item/clothing/glasses/sunglasses(src) /obj/item/clothing/head/caphat)
new /obj/item/clothing/head/caphat(src)
return

90
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -287,42 +287,18 @@
icon_opened = "engi_crateopen" icon_opened = "engi_crateopen"
icon_closed = "engi_crate" icon_closed = "engi_crate"
/obj/structure/closet/crate/rcd/New() starts_with = list(
..() /obj/item/weapon/rcd_ammo = 3,
new /obj/item/weapon/rcd_ammo(src) /obj/item/weapon/rcd)
new /obj/item/weapon/rcd_ammo(src)
new /obj/item/weapon/rcd_ammo(src)
new /obj/item/weapon/rcd(src)
/obj/structure/closet/crate/solar /obj/structure/closet/crate/solar
name = "solar pack crate" name = "solar pack crate"
/obj/structure/closet/crate/solar/New() starts_with = list(
..() /obj/item/solar_assembly = 21,
new /obj/item/solar_assembly(src) /obj/item/weapon/circuitboard/solar_control,
new /obj/item/solar_assembly(src) /obj/item/weapon/tracker_electronics,
new /obj/item/solar_assembly(src) /obj/item/weapon/paper/solar)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/weapon/circuitboard/solar_control(src)
new /obj/item/weapon/tracker_electronics(src)
new /obj/item/weapon/paper/solar(src)
/obj/structure/closet/crate/freezer /obj/structure/closet/crate/freezer
name = "freezer" name = "freezer"
@@ -366,13 +342,9 @@
name = "emergency rations" name = "emergency rations"
desc = "A crate of emergency rations." desc = "A crate of emergency rations."
starts_with = list(
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 4)
/obj/structure/closet/crate/freezer/rations/New()
..()
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
/obj/structure/closet/crate/bin /obj/structure/closet/crate/bin
name = "large bin" name = "large bin"
@@ -381,6 +353,7 @@
icon_opened = "largebinopen" icon_opened = "largebinopen"
icon_closed = "largebin" icon_closed = "largebin"
/obj/structure/closet/crate/radiation /obj/structure/closet/crate/radiation
name = "radioactive gear crate" name = "radioactive gear crate"
desc = "A crate with a radiation sign on it." desc = "A crate with a radiation sign on it."
@@ -388,16 +361,10 @@
icon_opened = "radiationopen" icon_opened = "radiationopen"
icon_closed = "radiation" icon_closed = "radiation"
/obj/structure/closet/crate/radiation/New() starts_with = list(
..() /obj/item/clothing/suit/radiation = 4,
new /obj/item/clothing/suit/radiation(src) /obj/item/clothing/head/radiation = 4)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
/obj/structure/closet/crate/secure/weapon /obj/structure/closet/crate/secure/weapon
name = "weapons crate" name = "weapons crate"
@@ -406,6 +373,7 @@
icon_opened = "weaponcrateopen" icon_opened = "weaponcrateopen"
icon_closed = "weaponcrate" icon_closed = "weaponcrate"
/obj/structure/closet/crate/secure/phoron /obj/structure/closet/crate/secure/phoron
name = "phoron crate" name = "phoron crate"
desc = "A secure phoron crate." desc = "A secure phoron crate."
@@ -413,6 +381,7 @@
icon_opened = "phoroncrateopen" icon_opened = "phoroncrateopen"
icon_closed = "phoroncrate" icon_closed = "phoroncrate"
/obj/structure/closet/crate/secure/gear /obj/structure/closet/crate/secure/gear
name = "gear crate" name = "gear crate"
desc = "A secure gear crate." desc = "A secure gear crate."
@@ -420,6 +389,7 @@
icon_opened = "secgearcrateopen" icon_opened = "secgearcrateopen"
icon_closed = "secgearcrate" icon_closed = "secgearcrate"
/obj/structure/closet/crate/secure/hydrosec /obj/structure/closet/crate/secure/hydrosec
name = "secure hydroponics crate" name = "secure hydroponics crate"
desc = "A crate with a lock on it, painted in the scheme of the station's botanists." desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
@@ -427,6 +397,7 @@
icon_opened = "hydrosecurecrateopen" icon_opened = "hydrosecurecrateopen"
icon_closed = "hydrosecurecrate" icon_closed = "hydrosecurecrate"
/obj/structure/closet/crate/secure/engineering /obj/structure/closet/crate/secure/engineering
desc = "A crate with a lock on it, painted in the scheme of the station's engineers." desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
name = "secure engineering crate" name = "secure engineering crate"
@@ -434,6 +405,7 @@
icon_opened = "engi_secure_crateopen" icon_opened = "engi_secure_crateopen"
icon_closed = "engi_secure_crate" icon_closed = "engi_secure_crate"
/obj/structure/closet/crate/secure/science /obj/structure/closet/crate/secure/science
name = "secure science crate" name = "secure science crate"
desc = "A crate with a lock on it, painted in the scheme of the station's scientists." desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
@@ -441,6 +413,7 @@
icon_opened = "scisecurecrateopen" icon_opened = "scisecurecrateopen"
icon_closed = "scisecurecrate" icon_closed = "scisecurecrate"
/obj/structure/closet/crate/secure/bin /obj/structure/closet/crate/secure/bin
name = "secure bin" name = "secure bin"
desc = "A secure bin." desc = "A secure bin."
@@ -452,6 +425,7 @@
sparks = "largebinsparks" sparks = "largebinsparks"
emag = "largebinemag" emag = "largebinemag"
/obj/structure/closet/crate/large /obj/structure/closet/crate/large
name = "large crate" name = "large crate"
desc = "A hefty metal crate." desc = "A hefty metal crate."
@@ -460,6 +434,7 @@
icon_opened = "largemetalopen" icon_opened = "largemetalopen"
icon_closed = "largemetal" icon_closed = "largemetal"
/obj/structure/closet/crate/large/close() /obj/structure/closet/crate/large/close()
. = ..() . = ..()
if (.)//we can hold up to one large item if (.)//we can hold up to one large item
@@ -478,6 +453,7 @@
break break
return return
/obj/structure/closet/crate/secure/large /obj/structure/closet/crate/secure/large
name = "large crate" name = "large crate"
desc = "A hefty metal crate with an electronic locking system." desc = "A hefty metal crate with an electronic locking system."
@@ -488,6 +464,7 @@
redlight = "largemetalr" redlight = "largemetalr"
greenlight = "largemetalg" greenlight = "largemetalg"
/obj/structure/closet/crate/secure/large/close() /obj/structure/closet/crate/secure/large/close()
. = ..() . = ..()
if (.)//we can hold up to one large item if (.)//we can hold up to one large item
@@ -506,6 +483,7 @@
break break
return return
//fluff variant //fluff variant
/obj/structure/closet/crate/secure/large/reinforced /obj/structure/closet/crate/secure/large/reinforced
desc = "A hefty, reinforced metal crate with an electronic locking system." desc = "A hefty, reinforced metal crate with an electronic locking system."
@@ -537,16 +515,8 @@
icon_opened = "hydrocrateopen" icon_opened = "hydrocrateopen"
icon_closed = "hydrocrate" icon_closed = "hydrocrate"
/obj/structure/closet/crate/hydroponics/prespawned
//This exists so the prespawned hydro crates spawn with their contents.
New() /obj/structure/closet/crate/hydroponics/prespawned
..() starts_with = list(
new /obj/item/weapon/reagent_containers/spray/plantbgone(src) /obj/item/weapon/reagent_containers/spray/plantbgone = 2,
new /obj/item/weapon/reagent_containers/spray/plantbgone(src) /obj/item/weapon/material/minihoe)
new /obj/item/weapon/material/minihoe(src)
// new /obj/item/weapon/weedspray(src)
// new /obj/item/weapon/weedspray(src)
// new /obj/item/weapon/pestspray(src)
// new /obj/item/weapon/pestspray(src)
// new /obj/item/weapon/pestspray(src)

26
code/game/objects/structures/crates_lockers/largecrate.dm
View File

@@ -4,9 +4,13 @@
icon = 'icons/obj/storage.dmi' icon = 'icons/obj/storage.dmi'
icon_state = "densecrate" icon_state = "densecrate"
density = 1 density = 1
var/list/starts_with
/obj/structure/largecrate/initialize() /obj/structure/largecrate/initialize()
. = ..() . = ..()
if(starts_with)
create_objects_in_loc(src, starts_with)
starts_with = null
for(var/obj/I in src.loc) for(var/obj/I in src.loc)
if(I.density || I.anchored || I == src || !I.simulated) if(I.density || I.anchored || I == src || !I.simulated)
continue continue
@@ -50,38 +54,30 @@
/obj/structure/largecrate/animal /obj/structure/largecrate/animal
icon_state = "mulecrate" icon_state = "mulecrate"
var/held_count = 1
var/held_type
/obj/structure/largecrate/animal/New()
..()
for(var/i = 1;i<=held_count;i++)
new held_type(src)
/obj/structure/largecrate/animal/mulebot /obj/structure/largecrate/animal/mulebot
name = "Mulebot crate" name = "Mulebot crate"
held_type = /mob/living/bot/mulebot starts_with = list(/mob/living/bot/mulebot)
/obj/structure/largecrate/animal/corgi /obj/structure/largecrate/animal/corgi
name = "corgi carrier" name = "corgi carrier"
held_type = /mob/living/simple_animal/corgi starts_with = list(/mob/living/simple_animal/corgi)
/obj/structure/largecrate/animal/cow /obj/structure/largecrate/animal/cow
name = "cow crate" name = "cow crate"
held_type = /mob/living/simple_animal/cow starts_with = list(/mob/living/simple_animal/cow)
/obj/structure/largecrate/animal/goat /obj/structure/largecrate/animal/goat
name = "goat crate" name = "goat crate"
held_type = /mob/living/simple_animal/retaliate/goat starts_with = list(/mob/living/simple_animal/retaliate/goat)
/obj/structure/largecrate/animal/cat /obj/structure/largecrate/animal/cat
name = "cat carrier" name = "cat carrier"
held_type = /mob/living/simple_animal/cat starts_with = list(/mob/living/simple_animal/cat)
/obj/structure/largecrate/animal/cat/bones /obj/structure/largecrate/animal/cat/bones
held_type = /mob/living/simple_animal/cat/fluff/bones starts_with = list(/mob/living/simple_animal/cat/fluff/bones)
/obj/structure/largecrate/animal/chick /obj/structure/largecrate/animal/chick
name = "chicken crate" name = "chicken crate"
held_count = 5 starts_with = list(/mob/living/simple_animal/chick = 5)
held_type = /mob/living/simple_animal/chick

56
code/modules/xenoarcheaology/misc.dm
View File

@@ -41,8 +41,8 @@
/obj/structure/bookcase/manuals/xenoarchaeology /obj/structure/bookcase/manuals/xenoarchaeology
name = "Xenoarchaeology Manuals bookcase" name = "Xenoarchaeology Manuals bookcase"
/obj/structure/bookcase/manuals/xenoarchaeology/New() /obj/structure/bookcase/manuals/xenoarchaeology/initialize()
..() . = ..()
new /obj/item/weapon/book/manual/excavation(src) new /obj/item/weapon/book/manual/excavation(src)
new /obj/item/weapon/book/manual/mass_spectrometry(src) new /obj/item/weapon/book/manual/mass_spectrometry(src)
new /obj/item/weapon/book/manual/materials_chemistry_analysis(src) new /obj/item/weapon/book/manual/materials_chemistry_analysis(src)
@@ -53,23 +53,22 @@
/obj/structure/closet/secure_closet/xenoarchaeologist /obj/structure/closet/secure_closet/xenoarchaeologist
name = "Xenoarchaeologist Locker" name = "Xenoarchaeologist Locker"
req_access = list(access_tox_storage)
icon_state = "secureres1" icon_state = "secureres1"
icon_closed = "secureres" icon_closed = "secureres"
icon_locked = "secureres1" icon_locked = "secureres1"
icon_opened = "secureresopen" icon_opened = "secureresopen"
icon_broken = "secureresbroken" icon_broken = "secureresbroken"
icon_off = "secureresoff" icon_off = "secureresoff"
req_access = list(access_tox_storage)
/obj/structure/closet/secure_closet/xenoarchaeologist/New() starts_with = list(
..() /obj/item/clothing/under/rank/scientist,
new /obj/item/clothing/under/rank/scientist(src) /obj/item/clothing/suit/storage/toggle/labcoat,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/clothing/shoes/white,
new /obj/item/clothing/shoes/white(src) /obj/item/clothing/glasses/science,
new /obj/item/clothing/glasses/science(src) /obj/item/device/radio/headset/headset_sci,
new /obj/item/device/radio/headset/headset_sci(src) /obj/item/weapon/storage/belt/archaeology,
new /obj/item/weapon/storage/belt/archaeology(src) /obj/item/weapon/storage/excavation)
new /obj/item/weapon/storage/excavation(src)
/obj/structure/closet/excavation /obj/structure/closet/excavation
name = "Excavation tools" name = "Excavation tools"
@@ -77,23 +76,22 @@
icon_closed = "toolcloset" icon_closed = "toolcloset"
icon_opened = "toolclosetopen" icon_opened = "toolclosetopen"
/obj/structure/closet/excavation/New() starts_with = list(
..() /obj/item/weapon/storage/belt/archaeology,
new /obj/item/weapon/storage/belt/archaeology(src) /obj/item/weapon/storage/excavation,
new /obj/item/weapon/storage/excavation(src) /obj/item/device/flashlight/lantern,
new /obj/item/device/flashlight/lantern(src) /obj/item/device/ano_scanner,
new /obj/item/device/ano_scanner(src) /obj/item/device/depth_scanner,
new /obj/item/device/depth_scanner(src) /obj/item/device/core_sampler,
new /obj/item/device/core_sampler(src) /obj/item/device/gps,
new /obj/item/device/gps(src) /obj/item/device/beacon_locator,
new /obj/item/device/beacon_locator(src) /obj/item/device/radio/beacon,
new /obj/item/device/radio/beacon(src) /obj/item/clothing/glasses/meson,
new /obj/item/clothing/glasses/meson(src) /obj/item/weapon/pickaxe,
new /obj/item/weapon/pickaxe(src) /obj/item/device/measuring_tape,
new /obj/item/device/measuring_tape(src) /obj/item/weapon/pickaxe/hand,
new /obj/item/weapon/pickaxe/hand(src) /obj/item/weapon/storage/bag/fossils,
new /obj/item/weapon/storage/bag/fossils(src) /obj/item/weapon/hand_labeler)
new /obj/item/weapon/hand_labeler(src)
/obj/machinery/alarm/isolation /obj/machinery/alarm/isolation
req_one_access = list(access_research, access_atmospherics, access_engine_equip) req_one_access = list(access_research, access_atmospherics, access_engine_equip)

38
maps/southern_cross/structures/closets/engineering.dm
View File

@@ -5,33 +5,33 @@
/obj/structure/closet/secure_closet/engineering_chief_wardrobe /obj/structure/closet/secure_closet/engineering_chief_wardrobe
name = "chief engineer's wardrobe" name = "chief engineer's wardrobe"
req_access = list(access_ce)
icon_state = "securece1" icon_state = "securece1"
icon_closed = "securece" icon_closed = "securece"
icon_locked = "securece1" icon_locked = "securece1"
icon_opened = "secureceopen" icon_opened = "secureceopen"
icon_broken = "securecebroken" icon_broken = "securecebroken"
icon_off = "secureceoff" icon_off = "secureceoff"
req_access = list(access_ce)
starts_with = list(
/obj/item/clothing/under/rank/chief_engineer,
/obj/item/clothing/under/rank/chief_engineer/skirt,
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/shoes/brown,
/obj/item/weapon/cartridge/ce,
/obj/item/device/radio/headset/heads/ce,
/obj/item/device/radio/headset/heads/ce/alt,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/taperoll/engineering,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering)
/obj/structure/closet/secure_closet/engineering_chief_wardrobe/New() /obj/structure/closet/secure_closet/engineering_chief_wardrobe/initialize()
..()
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/industrial(src) starts_with += /obj/item/weapon/storage/backpack/industrial
else else
new /obj/item/weapon/storage/backpack/satchel/eng(src) starts_with += /obj/item/weapon/storage/backpack/satchel/eng
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/eng(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
new /obj/item/clothing/under/rank/chief_engineer(src) return ..()
new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/weapon/cartridge/ce(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/device/radio/headset/heads/ce/alt(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
return

55
maps/southern_cross/structures/closets/medical.dm
View File

@@ -5,46 +5,47 @@
/obj/structure/closet/secure_closet/CMO_wardrobe /obj/structure/closet/secure_closet/CMO_wardrobe
name = "chief medical officer's locker" name = "chief medical officer's locker"
req_access = list(access_cmo)
icon_state = "cmosecure1" icon_state = "cmosecure1"
icon_closed = "cmosecure" icon_closed = "cmosecure"
icon_locked = "cmosecure1" icon_locked = "cmosecure1"
icon_opened = "cmosecureopen" icon_opened = "cmosecureopen"
icon_broken = "cmosecurebroken" icon_broken = "cmosecurebroken"
icon_off = "cmosecureoff" icon_off = "cmosecureoff"
req_access = list(access_cmo)
/obj/structure/closet/secure_closet/CMO_wardrobe/New() starts_with = list(
..() /obj/item/clothing/under/rank/chief_medical_officer,
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,
/obj/item/device/radio/headset/heads/cmo,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/shoes/white)
/obj/structure/closet/secure_closet/CMO_wardrobe/initialize()
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/medic(src) starts_with += /obj/item/weapon/storage/backpack/medic
else else
new /obj/item/weapon/storage/backpack/satchel/med(src) starts_with += /obj/item/weapon/storage/backpack/satchel/med
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/med(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
new /obj/item/clothing/shoes/white(src)
switch(pick("blue", "green", "purple", "black", "navyblue")) switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue") if ("blue")
new /obj/item/clothing/under/rank/medical/scrubs(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs
new /obj/item/clothing/head/surgery/blue(src) starts_with += /obj/item/clothing/head/surgery/blue
if ("green") if ("green")
new /obj/item/clothing/under/rank/medical/scrubs/green(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
new /obj/item/clothing/head/surgery/green(src) starts_with += /obj/item/clothing/head/surgery/green
if ("purple") if ("purple")
new /obj/item/clothing/under/rank/medical/scrubs/purple(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
new /obj/item/clothing/head/surgery/purple(src) starts_with += /obj/item/clothing/head/surgery/purple
if ("black") if ("black")
new /obj/item/clothing/under/rank/medical/scrubs/black(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
new /obj/item/clothing/head/surgery/black(src) starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue") if ("navyblue")
new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
new /obj/item/clothing/head/surgery/navyblue(src) starts_with += /obj/item/clothing/head/surgery/navyblue
new /obj/item/clothing/under/rank/chief_medical_officer(src) return ..()
new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
new /obj/item/weapon/cartridge/cmo(src)
new /obj/item/clothing/gloves/sterile/latex(src)
new /obj/item/clothing/shoes/brown (src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
return

193
maps/southern_cross/structures/closets/misc.dm
View File

@@ -4,41 +4,33 @@
name = "emergency weapon cabinet" name = "emergency weapon cabinet"
req_one_access = list(access_armory,access_captain) req_one_access = list(access_armory,access_captain)
/obj/structure/closet/secure_closet/guncabinet/sidearm/New() starts_with = list(
..() /obj/item/weapon/gun/energy/gun = 4)
for(var/i = 1 to 4)
new /obj/item/weapon/gun/energy/gun(src)
return
/obj/structure/closet/secure_closet/guncabinet/rifle /obj/structure/closet/secure_closet/guncabinet/rifle
name = "rifle cabinet" name = "rifle cabinet"
req_one_access = list(access_explorer,access_brig) req_one_access = list(access_explorer,access_brig)
/obj/structure/closet/secure_closet/guncabinet/rifle/New() starts_with = list(
..() /obj/item/ammo_magazine/clip/c762/hunter = 9,
for(var/i = 1 to 9) /obj/item/weapon/gun/projectile/shotgun/pump/rifle = 2)
new /obj/item/ammo_magazine/clip/c762/hunter(src)
/obj/structure/closet/secure_closet/guncabinet/rifle/initialize()
if(prob(85)) if(prob(85))
new /obj/item/weapon/gun/projectile/shotgun/pump/rifle(src) starts_with += /obj/item/weapon/gun/projectile/shotgun/pump/rifle
else else
new /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever(src) starts_with += /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
new /obj/item/weapon/gun/projectile/shotgun/pump/rifle(src) return ..()
new /obj/item/weapon/gun/projectile/shotgun/pump/rifle(src)
return
/obj/structure/closet/secure_closet/guncabinet/phase /obj/structure/closet/secure_closet/guncabinet/phase
name = "phase pistol cabinet" name = "phase pistol cabinet"
req_one_access = list(access_explorer,access_brig) req_one_access = list(access_explorer,access_brig)
/obj/structure/closet/secure_closet/guncabinet/phase/New() starts_with = list(
..() /obj/item/weapon/gun/energy/phasegun = 2,
new /obj/item/weapon/gun/energy/phasegun(src) /obj/item/weapon/cell/device/weapon = 2,
new /obj/item/weapon/gun/energy/phasegun(src) /obj/item/clothing/accessory/permit/gun/planetside)
// One spare cell per gun
new /obj/item/weapon/cell/device/weapon(src)
new /obj/item/weapon/cell/device/weapon(src)
// One spare gun permit per locker
new /obj/item/clothing/accessory/permit/gun/planetside(src)
//Explorer Lockers //Explorer Lockers
@@ -46,30 +38,31 @@
name = "explorer locker" name = "explorer locker"
req_access = list(access_explorer) req_access = list(access_explorer)
/obj/structure/closet/secure_closet/explorer/New() starts_with = list(
..() /obj/item/clothing/under/explorer,
/obj/item/clothing/suit/storage/hooded/explorer,
/obj/item/clothing/mask/gas/explorer,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
/obj/item/device/radio/headset/explorer,
/obj/item/device/flashlight,
/obj/item/device/gps/explorer,
/obj/item/weapon/storage/box/flare,
/obj/item/device/geiger,
/obj/item/weapon/cell/device,
/obj/item/device/radio,
/obj/item/stack/marker_beacon/thirty)
/obj/structure/closet/secure_closet/explorer/initialize()
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack(src) starts_with += /obj/item/weapon/storage/backpack
else else
new /obj/item/weapon/storage/backpack/satchel/norm(src) starts_with += /obj/item/weapon/storage/backpack/satchel/norm
if(prob(75)) if(prob(75))
new /obj/item/weapon/material/knife/tacknife/survival(src) starts_with += /obj/item/weapon/material/knife/tacknife/survival
else else
new /obj/item/weapon/material/knife/machete(src) starts_with += /obj/item/weapon/material/knife/machete
new /obj/item/clothing/under/explorer(src) return ..()
new /obj/item/clothing/suit/storage/hooded/explorer(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/clothing/shoes/boots/winter/explorer(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/device/radio/headset/explorer(src)
new /obj/item/device/flashlight(src)
new /obj/item/device/gps/explorer(src)
new /obj/item/weapon/storage/box/flare(src)
new /obj/item/device/geiger(src)
new /obj/item/weapon/cell/device(src)
new /obj/item/device/radio(src)
new /obj/item/stack/marker_beacon/thirty(src)
return
//SAR Lockers //SAR Lockers
@@ -84,35 +77,32 @@
icon_off = "medicaloff" icon_off = "medicaloff"
req_access = list(access_medical_equip) req_access = list(access_medical_equip)
starts_with = list(
/obj/structure/closet/secure_closet/sar/New() /obj/item/weapon/storage/backpack/dufflebag/emt,
..() /obj/item/weapon/storage/box/autoinjectors,
new /obj/item/weapon/storage/backpack/dufflebag/emt(src) /obj/item/weapon/storage/box/syringes,
new /obj/item/weapon/storage/box/autoinjectors(src) /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
new /obj/item/weapon/storage/box/syringes(src) /obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src) /obj/item/weapon/storage/belt/medical/emt,
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src) /obj/item/clothing/mask/gas,
new /obj/item/weapon/storage/belt/medical/emt(src) /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
new /obj/item/clothing/mask/gas(src) /obj/item/clothing/shoes/boots/winter/explorer,
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar(src) /obj/item/device/radio/headset/sar,
new /obj/item/clothing/shoes/boots/winter/explorer(src) /obj/item/weapon/cartridge/medical,
new /obj/item/device/radio/headset/sar(src) /obj/item/device/flashlight,
new /obj/item/weapon/cartridge/medical(src) /obj/item/weapon/tank/emergency/oxygen/engi,
new /obj/item/device/flashlight(src) /obj/item/clothing/glasses/hud/health,
new /obj/item/weapon/tank/emergency/oxygen/engi(src) /obj/item/device/healthanalyzer,
new /obj/item/clothing/glasses/hud/health(src) /obj/item/device/radio/off,
new /obj/item/device/healthanalyzer(src) /obj/random/medical,
new /obj/item/device/radio/off(src) /obj/item/weapon/crowbar,
new /obj/random/medical(src) /obj/item/weapon/extinguisher/mini,
new /obj/item/weapon/crowbar(src) /obj/item/weapon/storage/box/freezer,
new /obj/item/weapon/extinguisher/mini(src) /obj/item/clothing/accessory/storage/white_vest,
new /obj/item/weapon/storage/box/freezer(src) /obj/item/taperoll/medical,
new /obj/item/clothing/accessory/storage/white_vest(src) /obj/item/device/gps,
new /obj/item/taperoll/medical(src) /obj/item/device/geiger,
new /obj/item/device/gps(src) /obj/item/bodybag/cryobag)
new /obj/item/device/geiger(src)
new /obj/item/bodybag/cryobag(src)
return
//Pilot Locker //Pilot Locker
@@ -120,28 +110,29 @@
name = "pilot locker" name = "pilot locker"
req_access = list(access_pilot) req_access = list(access_pilot)
/obj/structure/closet/secure_closet/pilot/New() starts_with = list(
..() /obj/item/weapon/storage/backpack/parachute,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/clothing/head/pilot,
/obj/item/clothing/under/rank/pilot1,
/obj/item/clothing/suit/storage/toggle/bomber/pilot,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/shoes/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/device/radio/headset/pilot/alt,
/obj/item/device/flashlight,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/storage/box/flare,
/obj/item/weapon/cell/device,
/obj/item/device/radio)
/obj/structure/closet/secure_closet/pilot/initialize()
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack(src) starts_with += /obj/item/weapon/storage/backpack
else else
new /obj/item/weapon/storage/backpack/satchel/norm(src) starts_with += /obj/item/weapon/storage/backpack/satchel/norm
new /obj/item/weapon/storage/backpack/parachute(src) return ..()
new /obj/item/weapon/material/knife/tacknife/survival(src)
new /obj/item/clothing/head/pilot(src)
new /obj/item/clothing/under/rank/pilot1(src)
new /obj/item/clothing/suit/storage/toggle/bomber/pilot(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/device/radio/headset/pilot/alt(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
new /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle(src)
new /obj/item/weapon/storage/box/flare(src)
new /obj/item/weapon/cell/device(src)
new /obj/item/device/radio(src)
return
//Exotic Seeds Crate //Exotic Seeds Crate
@@ -149,14 +140,10 @@
name = "exotic seeds crate" name = "exotic seeds crate"
desc = "All you need to destroy that pesky planet." desc = "All you need to destroy that pesky planet."
/obj/structure/closet/crate/hydroponics/exotic/New() starts_with = list(
..() /obj/item/seeds/random = 6,
for(var/i = 1 to 6) /obj/item/seeds/replicapod = 2,
new /obj/item/seeds/random(src) /obj/item/seeds/ambrosiavulgarisseed = 2,
new /obj/item/seeds/kudzuseed(src) /obj/item/seeds/kudzuseed,
new /obj/item/seeds/replicapod(src) /obj/item/seeds/libertymycelium,
new /obj/item/seeds/replicapod(src) /obj/item/seeds/reishimycelium)
new /obj/item/seeds/ambrosiavulgarisseed(src)
new /obj/item/seeds/ambrosiavulgarisseed(src)
new /obj/item/seeds/libertymycelium(src)
new /obj/item/seeds/reishimycelium(src)

24
maps/southern_cross/structures/closets/research.dm
View File

@@ -5,23 +5,21 @@
/obj/structure/closet/secure_closet/RD_wardrobe /obj/structure/closet/secure_closet/RD_wardrobe
name = "research director's locker" name = "research director's locker"
req_access = list(access_rd)
icon_state = "rdsecure1" icon_state = "rdsecure1"
icon_closed = "rdsecure" icon_closed = "rdsecure"
icon_locked = "rdsecure1" icon_locked = "rdsecure1"
icon_opened = "rdsecureopen" icon_opened = "rdsecureopen"
icon_broken = "rdsecurebroken" icon_broken = "rdsecurebroken"
icon_off = "rdsecureoff" icon_off = "rdsecureoff"
req_access = list(access_rd)
/obj/structure/closet/secure_closet/RD_wardrobe/New() starts_with = list(
..() /obj/item/clothing/under/rank/research_director,
new /obj/item/clothing/under/rank/research_director(src) /obj/item/clothing/under/rank/research_director/rdalt,
new /obj/item/clothing/under/rank/research_director/rdalt(src) /obj/item/clothing/under/rank/research_director/dress_rd,
new /obj/item/clothing/under/rank/research_director/dress_rd(src) /obj/item/clothing/suit/storage/toggle/labcoat,
new /obj/item/clothing/suit/storage/toggle/labcoat(src) /obj/item/weapon/cartridge/rd,
new /obj/item/weapon/cartridge/rd(src) /obj/item/clothing/shoes/white,
new /obj/item/clothing/shoes/white(src) /obj/item/clothing/shoes/leather,
new /obj/item/clothing/shoes/leather(src) /obj/item/clothing/gloves/sterile/latex,
new /obj/item/clothing/gloves/sterile/latex(src) /obj/item/device/radio/headset/heads/rd)
new /obj/item/device/radio/headset/heads/rd(src)
return

39
maps/southern_cross/structures/closets/security.dm
View File

@@ -5,32 +5,33 @@
/obj/structure/closet/secure_closet/hos_wardrobe /obj/structure/closet/secure_closet/hos_wardrobe
name = "head of security's locker" name = "head of security's locker"
req_access = list(access_hos)
icon_state = "hossecure1" icon_state = "hossecure1"
icon_closed = "hossecure" icon_closed = "hossecure"
icon_locked = "hossecure1" icon_locked = "hossecure1"
icon_opened = "hossecureopen" icon_opened = "hossecureopen"
icon_broken = "hossecurebroken" icon_broken = "hossecurebroken"
icon_off = "hossecureoff" icon_off = "hossecureoff"
req_access = list(access_hos)
/obj/structure/closet/secure_closet/hos_wardrobe/New() starts_with = list(
..() /obj/item/clothing/under/rank/head_of_security/jensen,
/obj/item/clothing/under/rank/head_of_security/corp,
/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
/obj/item/clothing/suit/storage/vest/hoscoat,
/obj/item/weapon/cartridge/hos,
/obj/item/device/radio/headset/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/weapon/storage/box/holobadge/hos,
/obj/item/clothing/accessory/badge/holo/hos,
/obj/item/clothing/accessory/holster/waist,
/obj/item/clothing/head/beret/sec/corporate/hos,
/obj/item/clothing/mask/gas/half)
/obj/structure/closet/secure_closet/hos_wardrobe/initialize()
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/security(src) starts_with += /obj/item/weapon/storage/backpack/security
else else
new /obj/item/weapon/storage/backpack/satchel/sec(src) starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50)) if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sec(src) starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
new /obj/item/clothing/under/rank/head_of_security/jensen(src) return ..()
new /obj/item/clothing/under/rank/head_of_security/corp(src)
new /obj/item/clothing/suit/storage/vest/hoscoat/jensen(src)
new /obj/item/clothing/suit/storage/vest/hoscoat(src)
new /obj/item/weapon/cartridge/hos(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/weapon/storage/box/holobadge/hos(src)
new /obj/item/clothing/accessory/badge/holo/hos(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/clothing/head/beret/sec/corporate/hos(src)
new /obj/item/clothing/mask/gas/half(src)
return