Initial Commit

code/game/objects/structures/crates_lockers/closets.dm

@@ -0,0 +1,287 @@
+/obj/structure/closet
+	name = "closet"
+	desc = "It's a basic storage unit."
+	icon = 'icons/obj/closet.dmi'
+	icon_state = "closed"
+	density = 1
+	flags = FPRINT
+	var/icon_closed = "closed"
+	var/icon_opened = "open"
+	var/opened = 0
+	var/welded = 0
+	var/wall_mounted = 0 //never solid (You can always pass over it)
+	var/health = 100
+	var/lastbang
+	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate
+							  //then open it in a populated area to crash clients.
+
+/obj/structure/closet/New()
+	..()
+	spawn(1)
+		if(!opened)		// if closed, any item at the crate's loc is put in the contents
+			for(var/obj/item/I in src.loc)
+				if(I.density || I.anchored || I == src) continue
+				I.loc = src
+
+/obj/structure/closet/alter_health()
+	return get_turf(src)
+
+/obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group || (height==0 || wall_mounted)) return 1
+	return (!density)
+
+/obj/structure/closet/proc/can_open()
+	if(src.welded)
+		return 0
+	return 1
+
+/obj/structure/closet/proc/can_close()
+	for(var/obj/structure/closet/closet in get_turf(src))
+		if(closet != src)
+			return 0
+	return 1
+
+/obj/structure/closet/proc/dump_contents()
+	//Cham Projector Exception
+	for(var/obj/effect/dummy/chameleon/AD in src)
+		AD.loc = src.loc
+
+	for(var/obj/I in src)
+		I.loc = src.loc
+
+	for(var/mob/M in src)
+		M.loc = src.loc
+		if(M.client)
+			M.client.eye = M.client.mob
+			M.client.perspective = MOB_PERSPECTIVE
+
+/obj/structure/closet/proc/open()
+	if(src.opened)
+		return 0
+
+	if(!src.can_open())
+		return 0
+
+	src.dump_contents()
+
+	src.icon_state = src.icon_opened
+	src.opened = 1
+	if(istype(src, /obj/structure/closet/body_bag))
+		playsound(src.loc, 'sound/items/zip.ogg', 15, 1, -3)
+	else
+		playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+	density = 0
+	return 1
+
+/obj/structure/closet/proc/close()
+	if(!src.opened)
+		return 0
+	if(!src.can_close())
+		return 0
+
+	var/itemcount = 0
+
+	//Cham Projector Exception
+	for(var/obj/effect/dummy/chameleon/AD in src.loc)
+		if(itemcount >= storage_capacity)
+			break
+		AD.loc = src
+		itemcount++
+
+	for(var/obj/item/I in src.loc)
+		if(itemcount >= storage_capacity)
+			break
+		if(!I.anchored)
+			I.loc = src
+			itemcount++
+
+	for(var/mob/M in src.loc)
+		if(itemcount >= storage_capacity)
+			break
+		if(istype (M, /mob/dead/observer))
+			continue
+		if(M.buckled)
+			continue
+
+		if(M.client)
+			M.client.perspective = EYE_PERSPECTIVE
+			M.client.eye = src
+
+		M.loc = src
+		itemcount++
+
+	src.icon_state = src.icon_closed
+	src.opened = 0
+	if(istype(src, /obj/structure/closet/body_bag))
+		playsound(src.loc, 'sound/items/zip.ogg', 15, 1, -3)
+	else
+		playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+	density = 1
+	return 1
+
+/obj/structure/closet/proc/toggle(mob/user as mob)
+	. = src.opened ? src.close() : src.open()
+	if(!.)
+		user << "<span class='notice'>It won't budge!</span>"
+	return
+
+// this should probably use dump_contents()
+/obj/structure/closet/ex_act(severity)
+	switch(severity)
+		if(1)
+			for(var/atom/movable/A as mob|obj in src)//pulls everything out of the locker and hits it with an explosion
+				A.loc = src.loc
+				A.ex_act(severity++)
+			del(src)
+		if(2)
+			if(prob(50))
+				for (var/atom/movable/A as mob|obj in src)
+					A.loc = src.loc
+					A.ex_act(severity++)
+				del(src)
+		if(3)
+			if(prob(5))
+				for(var/atom/movable/A as mob|obj in src)
+					A.loc = src.loc
+					A.ex_act(severity++)
+				del(src)
+
+/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	if(health <= 0)
+		for(var/atom/movable/A as mob|obj in src)
+			A.loc = src.loc
+		del(src)
+
+	return
+
+/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
+	if(user.wall_smash)
+		visible_message("\red [user] destroys the [src]. ")
+		for(var/atom/movable/A as mob|obj in src)
+			A.loc = src.loc
+		del(src)
+
+// this should probably use dump_contents()
+/obj/structure/closet/blob_act()
+	if(prob(75))
+		for(var/atom/movable/A as mob|obj in src)
+			A.loc = src.loc
+		del(src)
+
+/obj/structure/closet/meteorhit(obj/O as obj)
+	if(O.icon_state == "flaming")
+		for(var/mob/M in src)
+			M.meteorhit(O)
+		src.dump_contents()
+		del(src)
+
+/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(src.opened)
+		if(istype(W, /obj/item/weapon/grab))
+			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
+		if(istype(W,/obj/item/tk_grab))
+			return 0
+		if(istype(W, /obj/item/weapon/weldingtool))
+			var/obj/item/weapon/weldingtool/WT = W
+			if(!WT.remove_fuel(0,user))
+				user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+				return
+			new /obj/item/stack/sheet/metal(src.loc)
+			for(var/mob/M in viewers(src))
+				M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)
+			del(src)
+			return
+		if(isrobot(user))
+			return
+		usr.drop_item()
+		if(W)
+			W.loc = src.loc
+	else if(istype(W, /obj/item/weapon/packageWrap))
+		return
+	else if(istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(!WT.remove_fuel(0,user))
+			user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+			return
+		src.welded = !src.welded
+		src.update_icon()
+		for(var/mob/M in viewers(src))
+			M.show_message("<span class='warning'>[src] has been [welded?"welded shut":"unwelded"] by [user.name].</span>", 3, "You hear welding.", 2)
+	else
+		src.attack_hand(user)
+	return
+
+/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+	if(istype(O, /obj/screen))	//fix for HUD elements making their way into the world	-Pete
+		return
+	if(O.loc == user)
+		return
+	if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis)
+		return
+	if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
+		return
+	if(user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems
+		return
+	if(!istype(user.loc, /turf)) // are you in a container/closet/pod/etc?
+		return
+	if(!src.opened)
+		return
+	if(istype(O, /obj/structure/closet))
+		return
+	step_towards(O, src.loc)
+	if(user != O)
+		user.show_viewers("<span class='danger'>[user] stuffs [O] into [src]!</span>")
+	src.add_fingerprint(user)
+	return
+
+/obj/structure/closet/relaymove(mob/user as mob)
+	if(user.stat || !isturf(src.loc))
+		return
+
+	if(!src.open())
+		user << "<span class='notice'>It won't budge!</span>"
+		if(!lastbang)
+			lastbang = 1
+			for (var/mob/M in hearers(src, null))
+				M << text("<FONT size=[]>BANG, bang!</FONT>", max(0, 5 - get_dist(src, M)))
+			spawn(30)
+				lastbang = 0
+
+
+/obj/structure/closet/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/closet/attack_hand(mob/user as mob)
+	src.add_fingerprint(user)
+	src.toggle(user)
+
+// tk grab then use on self
+/obj/structure/closet/attack_self_tk(mob/user as mob)
+	src.add_fingerprint(user)
+	if(!src.toggle())
+		usr << "<span class='notice'>It won't budge!</span>"
+
+/obj/structure/closet/verb/verb_toggleopen()
+	set src in oview(1)
+	set category = "Object"
+	set name = "Toggle Open"
+
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return
+
+	if(ishuman(usr))
+		src.add_fingerprint(usr)
+		src.toggle(usr)
+	else
+		usr << "<span class='warning'>This mob type can't use this verb.</span>"
+
+/obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
+	overlays.Cut()
+	if(!opened)
+		icon_state = icon_closed
+		if(welded)
+			overlays += "welded"
+	else
+		icon_state = icon_opened

code/game/objects/structures/crates_lockers/closets/coffin.dm

@@ -0,0 +1,12 @@
+/obj/structure/closet/coffin
+	name = "coffin"
+	desc = "It's a burial receptacle for the dearly departed."
+	icon_state = "coffin"
+	icon_closed = "coffin"
+	icon_opened = "coffin_open"
+
+/obj/structure/closet/coffin/update_icon()
+	if(!opened)
+		icon_state = icon_closed
+	else
+		icon_state = icon_opened

code/game/objects/structures/crates_lockers/closets/crittercrate.dm

@@ -0,0 +1,6 @@
+/obj/structure/closet/crate/critter
+	name = "critter crate"
+	desc = "A crate which can sustain life for a while."
+	icon_state = "critter"
+	icon_opened = "critteropen"
+	icon_closed = "critter"

code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -0,0 +1,207 @@
+//I still dont think this should be a closet but whatever
+/obj/structure/closet/fireaxecabinet
+	name = "Fire Axe Cabinet"
+	desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
+	var/obj/item/weapon/twohanded/fireaxe/fireaxe = new/obj/item/weapon/twohanded/fireaxe
+	icon_state = "fireaxe1000"
+	icon_closed = "fireaxe1000"
+	icon_opened = "fireaxe1100"
+	anchored = 1
+	density = 0
+	var/localopened = 0 //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
+	opened = 1
+	var/hitstaken = 0
+	var/locked = 1
+	var/smashed = 0
+
+	attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
+		//..() //That's very useful, Erro
+
+		var/hasaxe = 0       //gonna come in handy later~
+		if(fireaxe)
+			hasaxe = 1
+
+		if (isrobot(usr) || src.locked)
+			if(istype(O, /obj/item/device/multitool))
+				user << "\red Resetting circuitry..."
+				playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
+				sleep(50) // Sleeping time~
+				src.locked = 0
+				user << "\blue You disable the locking modules."
+				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)
+					user << "\blue The cabinet's protective glass glances off the hit."
+				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()
+			return
+		if (istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened)
+			if(!fireaxe)
+				if(O:wielded)
+					user << "\red Unwield the axe first."
+					return
+				fireaxe = O
+				user.drop_item(O)
+				src.contents += O
+				user << "\blue You place the fire axe back in the [src.name]."
+				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)
+					localopened = 0
+					icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+					spawn(10) update_icon()
+					return
+				else
+					user << "\red Resetting circuitry..."
+					sleep(50)
+					src.locked = 1
+					user << "\blue You re-enable the locking modules."
+					playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
+					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()
+
+
+
+
+	attack_hand(mob/user as mob)
+
+		var/hasaxe = 0
+		if(fireaxe)
+			hasaxe = 1
+
+		if(src.locked)
+			user <<"\red The cabinet won't budge!"
+			return
+		if(localopened)
+			if(fireaxe)
+				user.put_in_hands(fireaxe)
+				fireaxe = null
+				user << "\blue You take the fire axe from the [name]."
+				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.loc = loc
+			user << "\blue You telekinetically remove the fire axe."
+			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)
+				usr << "\red The cabinet won't budge!"
+			else if(src.smashed)
+				usr << "\blue The protective glass is broken!"
+			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
+				usr << "\blue You take the Fire axe from the [name]."
+			else
+				usr << "\blue The [src.name] is empty."
+		else
+			usr << "\blue The [src.name] is closed."
+		update_icon()
+
+	attack_paw(mob/user as mob)
+		attack_hand(user)
+		return
+
+	attack_ai(mob/user as mob)
+		if(src.smashed)
+			user << "\red The security of the cabinet is compromised."
+			return
+		else
+			locked = !locked
+			if(locked)
+				user << "\red Cabinet locked."
+			else
+				user << "\blue Cabinet unlocked."
+			return
+
+	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)
+
+	open()
+		return
+
+	close()
+		return

code/game/objects/structures/crates_lockers/closets/fitness.dm

@@ -0,0 +1,79 @@
+/obj/structure/closet/athletic_mixed
+	name = "athletic wardrobe"
+	desc = "It's a storage unit for athletic wear."
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
+/obj/structure/closet/athletic_mixed/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/under/shorts/grey(src)
+	new /obj/item/clothing/under/shorts/black(src)
+	new /obj/item/clothing/under/shorts/red(src)
+	new /obj/item/clothing/under/shorts/blue(src)
+	new /obj/item/clothing/under/shorts/green(src)
+	new /obj/item/clothing/under/swimsuit/red(src)
+	new /obj/item/clothing/under/swimsuit/black(src)
+	new /obj/item/clothing/under/swimsuit/blue(src)
+	new /obj/item/clothing/under/swimsuit/green(src)
+	new /obj/item/clothing/under/swimsuit/purple(src)
+	new /obj/item/clothing/mask/snorkel(src)
+	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
+	name = "boxing gloves"
+	desc = "It's a storage unit for gloves for use in the boxing ring."
+
+/obj/structure/closet/boxinggloves/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/gloves/boxing/blue(src)
+	new /obj/item/clothing/gloves/boxing/green(src)
+	new /obj/item/clothing/gloves/boxing/yellow(src)
+	new /obj/item/clothing/gloves/boxing(src)
+
+
+/obj/structure/closet/masks
+	name = "mask closet"
+	desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
+
+/obj/structure/closet/masks/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/mask/luchador(src)
+	new /obj/item/clothing/mask/luchador/rudos(src)
+	new /obj/item/clothing/mask/luchador/tecnicos(src)
+
+
+/obj/structure/closet/lasertag/red
+	name = "red laser tag equipment"
+	desc = "It's a storage unit for laser tag equipment."
+	icon_state = "red"
+	icon_closed = "red"
+
+/obj/structure/closet/lasertag/red/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/gun/energy/laser/redtag(src)
+	new /obj/item/weapon/gun/energy/laser/redtag(src)
+	new /obj/item/clothing/suit/redtag(src)
+	new /obj/item/clothing/suit/redtag(src)
+
+
+/obj/structure/closet/lasertag/blue
+	name = "blue laser tag equipment"
+	desc = "It's a storage unit for laser tag equipment."
+	icon_state = "blue"
+	icon_closed = "blue"
+
+/obj/structure/closet/lasertag/blue/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/gun/energy/laser/bluetag(src)
+	new /obj/item/weapon/gun/energy/laser/bluetag(src)
+	new /obj/item/clothing/suit/bluetag(src)
+	new /obj/item/clothing/suit/bluetag(src)

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -0,0 +1,142 @@
+/obj/structure/closet/cabinet
+	name = "cabinet"
+	desc = "Old will forever be in fashion."
+	icon_state = "cabinet_closed"
+	icon_closed = "cabinet_closed"
+	icon_opened = "cabinet_open"
+
+/obj/structure/closet/cabinet/update_icon()
+	if(!opened)
+		icon_state = icon_closed
+	else
+		icon_state = icon_opened
+
+/obj/structure/closet/acloset
+	name = "strange closet"
+	desc = "It looks alien!"
+	icon_state = "acloset"
+	icon_closed = "acloset"
+	icon_opened = "aclosetopen"
+
+
+/obj/structure/closet/gimmick
+	name = "administrative supply closet"
+	desc = "It's a storage unit for things that have no right being here."
+	icon_state = "syndicate1"
+	icon_closed = "syndicate1"
+	icon_opened = "syndicate1open"
+	anchored = 0
+
+/obj/structure/closet/gimmick/russian
+	name = "russian surplus closet"
+	desc = "It's a storage unit for Russian standard-issue surplus."
+	icon_state = "syndicate1"
+	icon_closed = "syndicate1"
+	icon_opened = "syndicate1open"
+
+/obj/structure/closet/gimmick/russian/New()
+	..()
+	sleep(2)
+	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/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
+	name = "tacticool gear closet"
+	desc = "It's a storage unit for Tacticool gear."
+	icon_state = "syndicate1"
+	icon_closed = "syndicate1"
+	icon_opened = "syndicate1open"
+
+/obj/structure/closet/gimmick/tacticool/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/glasses/eyepatch(src)
+	new /obj/item/clothing/glasses/sunglasses(src)
+	new /obj/item/clothing/gloves/swat(src)
+	new /obj/item/clothing/gloves/swat(src)
+	new /obj/item/clothing/head/helmet/swat(src)
+	new /obj/item/clothing/head/helmet/swat(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/shoes/swat(src)
+	new /obj/item/clothing/shoes/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
+	name = "\improper Thunderdome closet"
+	desc = "Everything you need!"
+	icon_state = "syndicate"
+	icon_closed = "syndicate"
+	icon_opened = "syndicateopen"
+	anchored = 1
+
+/obj/structure/closet/thunderdome/New()
+	..()
+	sleep(2)
+
+/obj/structure/closet/thunderdome/tdred
+	name = "red-team Thunderdome closet"
+
+/obj/structure/closet/thunderdome/tdred/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/armor/tdome/red(src)
+	new /obj/item/clothing/suit/armor/tdome/red(src)
+	new /obj/item/clothing/suit/armor/tdome/red(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	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
+	name = "green-team Thunderdome closet"
+	icon_state = "syndicate1"
+	icon_closed = "syndicate1"
+	icon_opened = "syndicate1open"
+
+/obj/structure/closet/thunderdome/tdgreen/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/armor/tdome/green(src)
+	new /obj/item/clothing/suit/armor/tdome/green(src)
+	new /obj/item/clothing/suit/armor/tdome/green(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	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)
+

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -0,0 +1,76 @@
+/* Closets for specific jobs
+ * Contains:
+ *		Bartender
+ *		Janitor
+ *		Lawyer
+ */
+
+/*
+ * Bartender
+ */
+/obj/structure/closet/gmcloset
+	name = "formal closet"
+	desc = "It's a storage unit for formal clothing."
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/gmcloset/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/hairflower
+	new /obj/item/clothing/under/sl_suit(src)
+	new /obj/item/clothing/under/sl_suit(src)
+	new /obj/item/clothing/under/rank/bartender(src)
+	new /obj/item/clothing/under/rank/bartender(src)
+	new /obj/item/clothing/under/dress/dress_saloon
+	new /obj/item/clothing/suit/wcoat(src)
+	new /obj/item/clothing/suit/wcoat(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+
+/*
+ * Janitor
+ */
+/obj/structure/closet/jcloset
+	name = "custodial closet"
+	desc = "It's a storage unit for janitorial clothes and gear."
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
+/obj/structure/closet/jcloset/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/under/rank/janitor(src)
+	new /obj/item/weapon/cartridge/janitor(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/head/soft/purple(src)
+	new /obj/item/device/flashlight(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/device/lightreplacer(src)
+	new /obj/item/weapon/storage/bag/trash(src)
+	new /obj/item/clothing/shoes/galoshes(src)
+
+/*
+ * Lawyer
+ */
+/obj/structure/closet/lawcloset
+	name = "legal closet"
+	desc = "It's a storage unit for courtroom apparel and items."
+	icon_state = "blue"
+	icon_closed = "blue"
+
+/obj/structure/closet/lawcloset/New()
+	new /obj/item/clothing/under/lawyer/female(src)
+	new /obj/item/clothing/under/lawyer/black(src)
+	new /obj/item/clothing/under/lawyer/red(src)
+	new /obj/item/clothing/under/lawyer/bluesuit(src)
+	new /obj/item/clothing/suit/storage/lawyer/bluejacket(src)
+	new /obj/item/clothing/under/lawyer/purpsuit(src)
+	new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/black(src)

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -0,0 +1,79 @@
+/obj/structure/closet/l3closet
+	name = "level-3 biohazard suit closet"
+	desc = "It's a storage unit for level-3 biohazard gear."
+	icon_state = "bio"
+	icon_closed = "bio"
+	icon_opened = "bioopen"
+
+/obj/structure/closet/l3closet/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/bio_suit/general( src )
+	new /obj/item/clothing/head/bio_hood/general( src )
+
+
+/obj/structure/closet/l3closet/general
+	icon_state = "bio_general"
+	icon_closed = "bio_general"
+	icon_opened = "bio_generalopen"
+
+/obj/structure/closet/l3closet/general/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/general( src )
+	new /obj/item/clothing/head/bio_hood/general( src )
+
+
+/obj/structure/closet/l3closet/virology
+	icon_state = "bio_virology"
+	icon_closed = "bio_virology"
+	icon_opened = "bio_virologyopen"
+
+/obj/structure/closet/l3closet/virology/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/virology( src )
+	new /obj/item/clothing/head/bio_hood/virology( src )
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/weapon/tank/oxygen(src)
+
+
+/obj/structure/closet/l3closet/security
+	icon_state = "bio_security"
+	icon_closed = "bio_security"
+	icon_opened = "bio_securityopen"
+
+/obj/structure/closet/l3closet/security/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/security( src )
+	new /obj/item/clothing/head/bio_hood/security( src )
+
+
+/obj/structure/closet/l3closet/janitor
+	icon_state = "bio_janitor"
+	icon_closed = "bio_janitor"
+	icon_opened = "bio_janitoropen"
+
+/obj/structure/closet/l3closet/janitor/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/janitor( src )
+	new /obj/item/clothing/head/bio_hood/janitor( src )
+
+
+/obj/structure/closet/l3closet/scientist
+	icon_state = "bio_scientist"
+	icon_closed = "bio_scientist"
+	icon_opened = "bio_scientistopen"
+
+/obj/structure/closet/l3closet/scientist/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/scientist( src )
+	new /obj/item/clothing/head/bio_hood/scientist( src )

code/game/objects/structures/crates_lockers/closets/malfunction.dm

@@ -0,0 +1,17 @@
+
+/obj/structure/closet/malf/suits
+	desc = "It's a storage unit for operational gear."
+	icon_state = "syndicate"
+	icon_closed = "syndicate"
+	icon_opened = "syndicateopen"
+
+/obj/structure/closet/malf/suits/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/tank/jetpack/void(src)
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/clothing/head/helmet/space/nasavoid(src)
+	new /obj/item/clothing/suit/space/nasavoid(src)
+	new /obj/item/weapon/crowbar(src)
+	new /obj/item/weapon/cell(src)
+	new /obj/item/device/multitool(src)

code/game/objects/structures/crates_lockers/closets/secure/bar.dm

@@ -0,0 +1,37 @@
+/obj/structure/closet/secure_closet/bar
+	name = "Booze"
+	req_access = list(access_bar)
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		return
+
+/obj/structure/closet/secure_closet/bar/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -0,0 +1,45 @@
+/obj/structure/closet/secure_closet/cargotech
+	name = "Cargo Technician's Locker"
+	req_access = list(access_cargo)
+	icon_state = "securecargo1"
+	icon_closed = "securecargo"
+	icon_locked = "securecargo1"
+	icon_opened = "securecargoopen"
+	icon_broken = "securecargobroken"
+	icon_off = "securecargooff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/cargotech(src)
+		new /obj/item/clothing/shoes/black(src)
+		new /obj/item/device/radio/headset/headset_cargo(src)
+		new /obj/item/clothing/gloves/black(src)
+		new /obj/item/clothing/head/soft(src)
+//		new /obj/item/weapon/cartridge/quartermaster(src)
+		return
+
+/obj/structure/closet/secure_closet/quartermaster
+	name = "Quartermaster's Locker"
+	req_access = list(access_qm)
+	icon_state = "secureqm1"
+	icon_closed = "secureqm"
+	icon_locked = "secureqm1"
+	icon_opened = "secureqmopen"
+	icon_broken = "secureqmbroken"
+	icon_off = "secureqmoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/cargo(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/device/radio/headset/headset_cargo(src)
+		new /obj/item/clothing/gloves/black(src)
+//		new /obj/item/weapon/cartridge/quartermaster(src)
+		new /obj/item/clothing/suit/fire/firefighter(src)
+		new /obj/item/weapon/tank/emergency_oxygen(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/clothing/glasses/meson(src)
+		new /obj/item/clothing/head/soft(src)
+		return

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -0,0 +1,154 @@
+/obj/structure/closet/secure_closet/engineering_chief
+	name = "Chief Engineer's Locker"
+	req_access = list(access_ce)
+	icon_state = "securece1"
+	icon_closed = "securece"
+	icon_locked = "securece1"
+	icon_opened = "secureceopen"
+	icon_broken = "securecebroken"
+	icon_off = "secureceoff"
+
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/industrial(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(src)
+		new /obj/item/blueprints(src)
+		new /obj/item/clothing/under/rank/chief_engineer(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/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/device/flash(src)
+		new /obj/item/taperoll/engineering(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/engineering_electrical
+	name = "Electrical Supplies"
+	req_access = list(access_engine_equip)
+	icon_state = "secureengelec1"
+	icon_closed = "secureengelec"
+	icon_locked = "secureengelec1"
+	icon_opened = "toolclosetopen"
+	icon_broken = "secureengelecbroken"
+	icon_off = "secureengelecoff"
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/gloves/yellow(src)
+		new /obj/item/clothing/gloves/yellow(src)
+		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
+	name = "Welding Supplies"
+	req_access = list(access_construction)
+	icon_state = "secureengweld1"
+	icon_closed = "secureengweld"
+	icon_locked = "secureengweld1"
+	icon_opened = "toolclosetopen"
+	icon_broken = "secureengweldbroken"
+	icon_off = "secureengweldoff"
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/head/welding(src)
+		new /obj/item/clothing/head/welding(src)
+		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)
+		return
+
+
+
+/obj/structure/closet/secure_closet/engineering_personal
+	name = "Engineer's Locker"
+	req_access = list(access_engine_equip)
+	icon_state = "secureeng1"
+	icon_closed = "secureeng"
+	icon_locked = "secureeng1"
+	icon_opened = "secureengopen"
+	icon_broken = "secureengbroken"
+	icon_off = "secureengoff"
+
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/industrial(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(src)
+		new /obj/item/weapon/storage/toolbox/mechanical(src)
+		new /obj/item/device/radio/headset/headset_eng(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)
+		return
+/obj/structure/closet/secure_closet/atmos_personal
+	name = "Technician's Locker"
+	req_access = list(access_atmospherics)
+	icon_state = "secureeng1"
+	icon_closed = "secureeng"
+	icon_locked = "secureeng1"
+	icon_opened = "secureengopen"
+	icon_broken = "secureengbroken"
+	icon_off = "secureengoff"
+
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/industrial(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(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/clothing/suit/storage/hazardvest(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/weapon/cartridge/atmos(src)
+		new /obj/item/taperoll/engineering(src)
+		return

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -0,0 +1,103 @@
+/obj/structure/closet/secure_closet/freezer
+
+/obj/structure/closet/secure_closet/freezer/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/freezer/kitchen
+	name = "Kitchen Cabinet"
+	req_access = list(access_kitchen)
+
+	New()
+		..()
+		sleep(2)
+		for(var/i = 0, i < 3, i++)
+			new /obj/item/weapon/reagent_containers/food/drinks/flour(src)
+		new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
+		return
+
+
+/obj/structure/closet/secure_closet/freezer/kitchen/mining
+	req_access = list()
+
+
+
+/obj/structure/closet/secure_closet/freezer/meat
+	name = "Meat Fridge"
+	icon_state = "fridge1"
+	icon_closed = "fridge"
+	icon_locked = "fridge1"
+	icon_opened = "fridgeopen"
+	icon_broken = "fridgebroken"
+	icon_off = "fridge1"
+
+
+	New()
+		..()
+		sleep(2)
+		for(var/i = 0, i < 4, i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/freezer/fridge
+	name = "Refrigerator"
+	icon_state = "fridge1"
+	icon_closed = "fridge"
+	icon_locked = "fridge1"
+	icon_opened = "fridgeopen"
+	icon_broken = "fridgebroken"
+	icon_off = "fridge1"
+
+
+	New()
+		..()
+		sleep(2)
+		for(var/i = 0, i < 5, i++)
+			new /obj/item/weapon/reagent_containers/food/drinks/milk(src)
+		for(var/i = 0, i < 5, i++)
+			new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src)
+		for(var/i = 0, i < 2, i++)
+			new /obj/item/weapon/storage/fancy/egg_box(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/freezer/money
+	name = "Freezer"
+	icon_state = "fridge1"
+	icon_closed = "fridge"
+	icon_locked = "fridge1"
+	icon_opened = "fridgeopen"
+	icon_broken = "fridgebroken"
+	icon_off = "fridge1"
+	req_access = list(access_heads_vault)
+
+
+	New()
+		..()
+		sleep(2)
+		for(var/i = 0, i < 3, i++)
+			new /obj/item/weapon/spacecash/c1000(src)
+		for(var/i = 0, i < 5, i++)
+			new /obj/item/weapon/spacecash/c500(src)
+		for(var/i = 0, i < 6, i++)
+			new /obj/item/weapon/spacecash/c200(src)
+		return
+
+
+
+
+
+
+
+

code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm

@@ -0,0 +1,53 @@
+/obj/structure/closet/secure_closet/guncabinet
+	name = "gun cabinet"
+	req_access = list(access_armory)
+	icon = 'icons/obj/guncabinet.dmi'
+	icon_state = "base"
+	icon_off ="base"
+	icon_broken ="base"
+	icon_locked ="base"
+	icon_closed ="base"
+	icon_opened = "base"
+
+/obj/structure/closet/secure_closet/guncabinet/New()
+	..()
+	update_icon()
+
+/obj/structure/closet/secure_closet/guncabinet/toggle()
+	..()
+	update_icon()
+
+/obj/structure/closet/secure_closet/guncabinet/update_icon()
+	overlays.Cut()
+	if(opened)
+		overlays += icon(icon,"door_open")
+	else
+		var/lazors = 0
+		var/shottas = 0
+		for (var/obj/item/weapon/gun/G in contents)
+			if (istype(G, /obj/item/weapon/gun/energy))
+				lazors++
+			if (istype(G, /obj/item/weapon/gun/projectile/))
+				shottas++
+		if (lazors || shottas)
+			for (var/i = 0 to 2)
+				var/image/gun = image(icon(src.icon))
+
+				if (lazors > 0 && (shottas <= 0 || prob(50)))
+					lazors--
+					gun.icon_state = "laser"
+				else if (shottas > 0)
+					shottas--
+					gun.icon_state = "projectile"
+
+				gun.pixel_x = i*4
+				overlays += gun
+
+		overlays += icon(src.icon,"door")
+
+		if(broken)
+			overlays += icon(src.icon,"broken")
+		else if (locked)
+			overlays += icon(src.icon,"locked")
+		else
+			overlays += icon(src.icon,"open")

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -0,0 +1,27 @@
+/obj/structure/closet/secure_closet/hydroponics
+	name = "Botanist's locker"
+	req_access = list(access_hydroponics)
+	icon_state = "hydrosecure1"
+	icon_closed = "hydrosecure"
+	icon_locked = "hydrosecure1"
+	icon_opened = "hydrosecureopen"
+	icon_broken = "hydrosecurebroken"
+	icon_off = "hydrosecureoff"
+
+
+	New()
+		..()
+		sleep(2)
+		switch(rand(1,2))
+			if(1)
+				new /obj/item/clothing/suit/apron(src)
+			if(2)
+				new /obj/item/clothing/suit/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/clothing/head/greenbandana(src)
+		new /obj/item/weapon/minihoe(src)
+		new /obj/item/weapon/hatchet(src)
+		new /obj/item/weapon/bee_net(src)
+		return

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -0,0 +1,209 @@
+/obj/structure/closet/secure_closet/medical1
+	name = "Medicine Closet"
+	desc = "Filled with medical junk."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
+	req_access = list(access_medical)
+
+
+	New()
+		..()
+		sleep(2)
+		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/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
+	name = "Anesthetic"
+	desc = "Used to knock people out."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
+	req_access = list(access_surgery)
+
+
+	New()
+		..()
+		sleep(2)
+		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
+	name = "Medical Doctor's Locker"
+	req_access = list(access_surgery)
+	icon_state = "securemed1"
+	icon_closed = "securemed"
+	icon_locked = "securemed1"
+	icon_opened = "securemedopen"
+	icon_broken = "securemedbroken"
+	icon_off = "securemedoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/medic(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_med(src)
+		new /obj/item/clothing/under/rank/nursesuit (src)
+		new /obj/item/clothing/head/nursehat (src)
+		switch(pick("blue", "green", "purple"))
+			if ("blue")
+				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/head/surgery/blue(src)
+			if ("green")
+				new /obj/item/clothing/under/rank/medical/green(src)
+				new /obj/item/clothing/head/surgery/green(src)
+			if ("purple")
+				new /obj/item/clothing/under/rank/medical/purple(src)
+				new /obj/item/clothing/head/surgery/purple(src)
+		switch(pick("blue", "green", "purple"))
+			if ("blue")
+				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/head/surgery/blue(src)
+			if ("green")
+				new /obj/item/clothing/under/rank/medical/green(src)
+				new /obj/item/clothing/head/surgery/green(src)
+			if ("purple")
+				new /obj/item/clothing/under/rank/medical/purple(src)
+				new /obj/item/clothing/head/surgery/purple(src)
+		new /obj/item/clothing/under/rank/medical(src)
+		new /obj/item/clothing/under/rank/nurse(src)
+		new /obj/item/clothing/under/rank/orderly(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/clothing/suit/storage/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/weapon/storage/belt/medical(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/CMO
+	name = "Chief Medical Officer's Locker"
+	req_access = list(access_cmo)
+	icon_state = "cmosecure1"
+	icon_closed = "cmosecure"
+	icon_locked = "cmosecure1"
+	icon_opened = "cmosecureopen"
+	icon_broken = "cmosecurebroken"
+	icon_off = "cmosecureoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/medic(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_med(src)
+		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"))
+			if ("blue")
+				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/head/surgery/blue(src)
+			if ("green")
+				new /obj/item/clothing/under/rank/medical/green(src)
+				new /obj/item/clothing/head/surgery/green(src)
+			if ("purple")
+				new /obj/item/clothing/under/rank/medical/purple(src)
+				new /obj/item/clothing/head/surgery/purple(src)
+		new /obj/item/clothing/under/rank/chief_medical_officer(src)
+		new /obj/item/clothing/suit/storage/labcoat/cmo(src)
+		new /obj/item/weapon/cartridge/cmo(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/shoes/brown	(src)
+		new /obj/item/device/radio/headset/heads/cmo(src)
+		new /obj/item/weapon/storage/belt/medical(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/weapon/reagent_containers/hypospray(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/animal
+	name = "Animal Control"
+	req_access = list(access_surgery)
+
+
+	New()
+		..()
+		sleep(2)
+		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
+	name = "Chemical Closet"
+	desc = "Store dangerous chemicals in here."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
+	req_access = list(access_chemistry)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/storage/box/pillbottles(src)
+		new /obj/item/weapon/storage/box/pillbottles(src)
+		return
+
+/obj/structure/closet/secure_closet/medical_wall
+	name = "First Aid Closet"
+	desc = "It's a secure wall-mounted storage unit for first aid supplies."
+	icon_state = "medical_wall_locked"
+	icon_closed = "medical_wall_unlocked"
+	icon_locked = "medical_wall_locked"
+	icon_opened = "medical_wall_open"
+	icon_broken = "medical_wall_spark"
+	icon_off = "medical_wall_off"
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+	req_access = list(access_medical)
+
+/obj/structure/closet/secure_closet/medical_wall/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -0,0 +1,97 @@
+/obj/structure/closet/secure_closet/personal
+	desc = "It's a secure locker for personnel. The first card swiped gains control."
+	name = "personal closet"
+	req_access = list(access_all_personal_lockers)
+	var/registered_name = null
+
+/obj/structure/closet/secure_closet/personal/New()
+	..()
+	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/patient
+	name = "patient's closet"
+
+/obj/structure/closet/secure_closet/personal/patient/New()
+	..()
+	spawn(4)
+		contents = list()
+		new /obj/item/clothing/under/color/white( src )
+		new /obj/item/clothing/shoes/white( src )
+	return
+
+
+
+/obj/structure/closet/secure_closet/personal/cabinet
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+/obj/structure/closet/secure_closet/personal/cabinet/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/personal/cabinet/New()
+	..()
+	spawn(4)
+		contents = list()
+		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)
+	if (src.opened)
+		if (istype(W, /obj/item/weapon/grab))
+			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
+		user.drop_item()
+		if (W) W.loc = src.loc
+	else if(istype(W, /obj/item/weapon/card/id))
+		if(src.broken)
+			user << "\red It appears to be broken."
+			return
+		var/obj/item/weapon/card/id/I = W
+		if(!I || !I.registered_name)	return
+		if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name)))
+			//they can open all lockers, or nobody owns this, or they own this locker
+			src.locked = !( src.locked )
+			if(src.locked)	src.icon_state = src.icon_locked
+			else	src.icon_state = src.icon_closed
+
+			if(!src.registered_name)
+				src.registered_name = I.registered_name
+				src.desc = "Owned by [I.registered_name]."
+		else
+			user << "\red Access Denied"
+	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+		broken = 1
+		locked = 0
+		desc = "It appears to be broken."
+		icon_state = src.icon_broken
+		if(istype(W, /obj/item/weapon/melee/energy/blade))
+			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+			spark_system.set_up(5, 0, src.loc)
+			spark_system.start()
+			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+			playsound(src.loc, "sparks", 50, 1)
+			for(var/mob/O in viewers(user, 3))
+				O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2)
+	else
+		user << "\red Access Denied"
+	return

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -0,0 +1,53 @@
+/obj/structure/closet/secure_closet/scientist
+	name = "Scientist's Locker"
+	req_access = list(access_tox_storage)
+	icon_state = "secureres1"
+	icon_closed = "secureres"
+	icon_locked = "secureres1"
+	icon_opened = "secureresopen"
+	icon_broken = "secureresbroken"
+	icon_off = "secureresoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/scientist(src)
+		//new /obj/item/clothing/suit/labcoat/science(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/clothing/shoes/white(src)
+//		new /obj/item/weapon/cartridge/signal/toxins(src)
+		new /obj/item/device/radio/headset/headset_sci(src)
+		new /obj/item/weapon/tank/air(src)
+		new /obj/item/clothing/mask/gas(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/RD
+	name = "Research Director's Locker"
+	req_access = list(access_rd)
+	icon_state = "rdsecure1"
+	icon_closed = "rdsecure"
+	icon_locked = "rdsecure1"
+	icon_opened = "rdsecureopen"
+	icon_broken = "rdsecurebroken"
+	icon_off = "rdsecureoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/suit/bio_suit/scientist(src)
+		new /obj/item/clothing/head/bio_hood/scientist(src)
+		new /obj/item/clothing/under/rank/research_director(src)
+		new /obj/item/clothing/under/rank/research_director/rdalt(src)
+		new /obj/item/clothing/under/rank/research_director/dress_rd(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/weapon/cartridge/rd(src)
+		new /obj/item/clothing/shoes/white(src)
+		new /obj/item/clothing/shoes/leather(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/device/radio/headset/heads/rd(src)
+		new /obj/item/weapon/tank/air(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/device/flash(src)
+		return

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -0,0 +1,134 @@
+/obj/structure/closet/secure_closet
+	name = "secure locker"
+	desc = "It's an immobile card-locked storage unit."
+	icon = 'icons/obj/closet.dmi'
+	icon_state = "secure1"
+	density = 1
+	opened = 0
+	var/locked = 1
+	var/broken = 0
+	var/large = 1
+	icon_closed = "secure"
+	var/icon_locked = "secure1"
+	icon_opened = "secureopen"
+	var/icon_broken = "securebroken"
+	var/icon_off = "secureoff"
+	wall_mounted = 0 //never solid (You can always pass over it)
+	health = 200
+
+/obj/structure/closet/secure_closet/can_open()
+	if(src.locked)
+		return 0
+	return ..()
+
+/obj/structure/closet/secure_closet/close()
+	if(..())
+		if(broken)
+			icon_state = src.icon_off
+		return 1
+	else
+		return 0
+
+/obj/structure/closet/secure_closet/emp_act(severity)
+	for(var/obj/O in src)
+		O.emp_act(severity)
+	if(!broken)
+		if(prob(50/severity))
+			src.locked = !src.locked
+			src.update_icon()
+		if(prob(20/severity) && !opened)
+			if(!locked)
+				open()
+			else
+				src.req_access = list()
+				src.req_access += pick(get_all_accesses())
+	..()
+
+/obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob)
+	if(src.opened)
+		user << "<span class='notice'>Close the locker first.</span>"
+		return
+	if(src.broken)
+		user << "<span class='warning'>The locker appears to be broken.</span>"
+		return
+	if(user.loc == src)
+		user << "<span class='notice'>You can't reach the lock from inside.</span>"
+		return
+	if(src.allowed(user))
+		src.locked = !src.locked
+		for(var/mob/O in viewers(user, 3))
+			if((O.client && !( O.blinded )))
+				O << "<span class='notice'>The locker has been [locked ? null : "un"]locked by [user].</span>"
+		update_icon()
+	else
+		user << "<span class='notice'>Access Denied</span>"
+
+/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(src.opened)
+		if(istype(W, /obj/item/weapon/grab))
+			if(src.large)
+				src.MouseDrop_T(W:affecting, user)	//act like they were dragged onto the closet
+			else
+				user << "<span class='notice'>The locker is too small to stuff [W:affecting] into!</span>"
+		if(isrobot(user))
+			return
+		user.drop_item()
+		if(W)
+			W.loc = src.loc
+	else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+		broken = 1
+		locked = 0
+		desc = "It appears to be broken."
+		icon_state = icon_off
+		flick(icon_broken, src)
+		if(istype(W, /obj/item/weapon/melee/energy/blade))
+			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+			spark_system.set_up(5, 0, src.loc)
+			spark_system.start()
+			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+			playsound(src.loc, "sparks", 50, 1)
+			for(var/mob/O in viewers(user, 3))
+				O.show_message("<span class='warning'>The locker has been sliced open by [user] with an energy blade!</span>", 1, "You hear metal being sliced and sparks flying.", 2)
+		else
+			for(var/mob/O in viewers(user, 3))
+				O.show_message("<span class='warning'>The locker has been broken by [user] with an electromagnetic card!</span>", 1, "You hear a faint electrical spark.", 2)
+	else if(istype(W,/obj/item/weapon/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
+		return ..(W,user)
+	else
+		togglelock(user)
+
+/obj/structure/closet/secure_closet/attack_hand(mob/user as mob)
+	src.add_fingerprint(user)
+	if(src.locked)
+		src.togglelock(user)
+	else
+		src.toggle(user)
+
+/obj/structure/closet/secure_closet/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/closet/secure_closet/verb/verb_togglelock()
+	set src in oview(1) // One square distance
+	set category = "Object"
+	set name = "Toggle Lock"
+
+	if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
+		return
+
+	if(ishuman(usr))
+		src.add_fingerprint(usr)
+		src.togglelock(usr)
+	else
+		usr << "<span class='warning'>This mob type can't use this verb.</span>"
+
+/obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
+	overlays.Cut()
+	if(!opened)
+		if(locked)
+			icon_state = icon_locked
+		else
+			icon_state = icon_closed
+		if(welded)
+			overlays += "welded"
+	else
+		icon_state = icon_opened

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -0,0 +1,351 @@
+/obj/structure/closet/secure_closet/captains
+	name = "Captain's Locker"
+	req_access = list(access_captain)
+	icon_state = "capsecure1"
+	icon_closed = "capsecure"
+	icon_locked = "capsecure1"
+	icon_opened = "capsecureopen"
+	icon_broken = "capsecurebroken"
+	icon_off = "capsecureoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/captain(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_cap(src)
+		new /obj/item/clothing/suit/captunic(src)
+		new /obj/item/clothing/suit/captunic/capjacket(src)
+		new /obj/item/clothing/head/helmet/cap(src)
+		new /obj/item/clothing/under/rank/captain(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/weapon/cartridge/captain(src)
+		new /obj/item/clothing/head/helmet/swat(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/device/radio/headset/heads/captain(src)
+		new /obj/item/clothing/gloves/captain(src)
+		new /obj/item/weapon/gun/energy/gun(src)
+		new /obj/item/clothing/suit/armor/captain(src)
+		new /obj/item/weapon/melee/telebaton(src)
+		new /obj/item/clothing/under/dress/dress_cap(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/hop
+	name = "Head of Personnel's Locker"
+	req_access = list(access_hop)
+	icon_state = "hopsecure1"
+	icon_closed = "hopsecure"
+	icon_locked = "hopsecure1"
+	icon_opened = "hopsecureopen"
+	icon_broken = "hopsecurebroken"
+	icon_off = "hopsecureoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/glasses/sunglasses(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/head/helmet(src)
+		new /obj/item/weapon/cartridge/hop(src)
+		new /obj/item/device/radio/headset/heads/hop(src)
+		new /obj/item/weapon/storage/box/ids(src)
+		new /obj/item/weapon/storage/box/ids( src )
+		new /obj/item/weapon/gun/energy/gun(src)
+		new /obj/item/device/flash(src)
+		return
+
+/obj/structure/closet/secure_closet/hop2
+	name = "Head of Personnel's Attire"
+	req_access = list(access_hop)
+	icon_state = "hopsecure1"
+	icon_closed = "hopsecure"
+	icon_locked = "hopsecure1"
+	icon_opened = "hopsecureopen"
+	icon_broken = "hopsecurebroken"
+	icon_off = "hopsecureoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/head_of_personnel(src)
+		new /obj/item/clothing/under/dress/dress_hop(src)
+		new /obj/item/clothing/under/dress/dress_hr(src)
+		new /obj/item/clothing/under/lawyer/female(src)
+		new /obj/item/clothing/under/lawyer/black(src)
+		new /obj/item/clothing/under/lawyer/red(src)
+		new /obj/item/clothing/under/lawyer/oldman(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/clothing/shoes/black(src)
+		new /obj/item/clothing/shoes/leather(src)
+		new /obj/item/clothing/shoes/white(src)
+		new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/hos
+	name = "Head of Security's Locker"
+	req_access = list(access_hos)
+	icon_state = "hossecure1"
+	icon_closed = "hossecure"
+	icon_locked = "hossecure1"
+	icon_opened = "hossecureopen"
+	icon_broken = "hossecurebroken"
+	icon_off = "hossecureoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/security(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/clothing/head/helmet/HoS(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
+		new /obj/item/clothing/under/rank/head_of_security/corp(src)
+		new /obj/item/clothing/suit/armor/hos/jensen(src)
+		new /obj/item/clothing/suit/armor/hos(src)
+		new /obj/item/clothing/head/helmet/HoS/dermal(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/taperoll/police(src)
+		new /obj/item/weapon/shield/riot(src)
+		new /obj/item/weapon/storage/lockbox/loyalty(src)
+		new /obj/item/weapon/storage/box/flashbangs(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/gun/energy/gun(src)
+		new /obj/item/clothing/tie/holster/waist(src)
+		new /obj/item/weapon/melee/telebaton(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/warden
+	name = "Warden's Locker"
+	req_access = list(access_armory)
+	icon_state = "wardensecure1"
+	icon_closed = "wardensecure"
+	icon_locked = "wardensecure1"
+	icon_opened = "wardensecureopen"
+	icon_broken = "wardensecurebroken"
+	icon_off = "wardensecureoff"
+
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/security(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/clothing/suit/armor/vest/security(src)
+		new /obj/item/clothing/under/rank/warden(src)
+		new /obj/item/clothing/under/rank/warden/corp(src)
+		new /obj/item/clothing/suit/armor/vest/warden(src)
+		new /obj/item/clothing/head/helmet/warden(src)
+//		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/taperoll/police(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(src)
+		new /obj/item/weapon/gun/energy/taser(src)
+		new /obj/item/weapon/storage/box/holobadge(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/security
+	name = "Security Officer's Locker"
+	req_access = list(access_security)
+	icon_state = "sec1"
+	icon_closed = "sec"
+	icon_locked = "sec1"
+	icon_opened = "secopen"
+	icon_broken = "secbroken"
+	icon_off = "secoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/security(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/clothing/suit/armor/vest/security(src)
+		new /obj/item/clothing/head/helmet(src)
+//		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/weapon/reagent_containers/spray/pepper(src)
+		new /obj/item/weapon/grenade/flashbang(src)
+		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/gun/energy/taser(src)
+		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/taperoll/police(src)
+		new /obj/item/device/hailer(src)
+		new /obj/item/clothing/tie/storage/black_vest(src)
+		new /obj/item/clothing/head/soft/sec/corp(src)
+		new /obj/item/clothing/under/rank/security/corp(src)
+		return
+
+
+/obj/structure/closet/secure_closet/security/cargo
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/cargo(src)
+		new /obj/item/device/encryptionkey/headset_cargo(src)
+		return
+
+/obj/structure/closet/secure_closet/security/engine
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/engine(src)
+		new /obj/item/device/encryptionkey/headset_eng(src)
+		return
+
+/obj/structure/closet/secure_closet/security/science
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/science(src)
+		new /obj/item/device/encryptionkey/headset_sci(src)
+		return
+
+/obj/structure/closet/secure_closet/security/med
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/medgreen(src)
+		new /obj/item/device/encryptionkey/headset_med(src)
+		return
+
+
+/obj/structure/closet/secure_closet/detective
+	name = "Detective's Cabinet"
+	req_access = list(access_forensics_lockers)
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/det(src)
+		new /obj/item/clothing/under/det/black(src)
+		new /obj/item/clothing/under/det/slob(src)
+		new /obj/item/clothing/suit/storage/det_suit(src)
+		new /obj/item/clothing/suit/storage/det_suit/black(src)
+		new /obj/item/clothing/suit/storage/forensics/blue(src)
+		new /obj/item/clothing/suit/storage/forensics/red(src)
+		new /obj/item/clothing/gloves/black(src)
+		new /obj/item/clothing/head/det_hat(src)
+		new /obj/item/clothing/head/det_hat/black(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/storage/box/evidence(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/device/detective_scanner(src)
+		new /obj/item/clothing/suit/armor/det_suit(src)
+		new /obj/item/ammo_magazine/c45r(src)
+		new /obj/item/ammo_magazine/c45r(src)
+		new /obj/item/taperoll/police(src)
+		new /obj/item/weapon/gun/projectile/detective/semiauto(src)
+		new /obj/item/clothing/tie/holster/armpit(src)
+		return
+
+/obj/structure/closet/secure_closet/detective/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/injection
+	name = "Lethal Injections"
+	req_access = list(access_captain)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+		new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/brig
+	name = "Brig Locker"
+	req_access = list(access_brig)
+	anchored = 1
+	var/id = null
+
+	New()
+		new /obj/item/clothing/under/color/orange( src )
+		new /obj/item/clothing/shoes/orange( src )
+		return
+
+
+
+/obj/structure/closet/secure_closet/courtroom
+	name = "Courtroom Locker"
+	req_access = list(access_court)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/pen (src)
+		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
+	name = "wall locker"
+	req_access = list(access_security)
+	icon_state = "wall-locker1"
+	density = 1
+	icon_closed = "wall-locker"
+	icon_locked = "wall-locker1"
+	icon_opened = "wall-lockeropen"
+	icon_broken = "wall-lockerbroken"
+	icon_off = "wall-lockeroff"
+
+	//too small to put a man in
+	large = 0
+
+/obj/structure/closet/secure_closet/wall/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -0,0 +1,139 @@
+/obj/structure/closet/syndicate
+	name = "armoury closet"
+	desc = "Why is this here?"
+	icon_state = "syndicate"
+	icon_closed = "syndicate"
+	icon_opened = "syndicateopen"
+
+
+/obj/structure/closet/syndicate/personal
+	desc = "It's a storage unit for operative gear."
+
+/obj/structure/closet/syndicate/personal/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/tank/jetpack/oxygen(src)
+	new /obj/item/clothing/mask/gas/syndicate(src)
+	new /obj/item/clothing/under/syndicate(src)
+	new /obj/item/clothing/head/helmet/space/rig/syndi(src)
+	new /obj/item/clothing/suit/space/rig/syndi(src)
+	new /obj/item/weapon/crowbar/red(src)
+	new /obj/item/weapon/cell/high(src)
+	new /obj/item/weapon/card/id/syndicate(src)
+	new /obj/item/device/multitool(src)
+	new /obj/item/weapon/shield/energy(src)
+	new /obj/item/clothing/shoes/magboots(src)
+
+
+/obj/structure/closet/syndicate/nuclear
+	desc = "It's a storage unit for nuclear-operative gear."
+
+/obj/structure/closet/syndicate/nuclear/New()
+	..()
+	sleep(2)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a12mm(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)
+	var/obj/item/device/radio/uplink/U = new(src)
+	U.hidden_uplink.uses = 40
+	return
+
+/obj/structure/closet/syndicate/resources/
+	desc = "An old, dusty locker."
+
+	New()
+		..()
+		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/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
+
+
+		sleep(2)
+
+		var/pickednum = rand(1, 50)
+
+		//Sad trombone
+		if(pickednum == 1)
+			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
+			P.name = "IOU"
+			P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
+
+		//Metal (common ore)
+		if(pickednum >= 2)
+			new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
+
+		//Glass (common ore)
+		if(pickednum >= 5)
+			new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
+
+		//Plasteel (common ore) Because it has a million more uses then plasma
+		if(pickednum >= 10)
+			new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
+
+		//Plasma (rare ore)
+		if(pickednum >= 15)
+			new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
+
+		//Silver (rare ore)
+		if(pickednum >= 20)
+			new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
+
+		//Gold (rare ore)
+		if(pickednum >= 30)
+			new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
+
+		//Uranium (rare ore)
+		if(pickednum >= 40)
+			new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
+
+		//Diamond (rare HONK)
+		if(pickednum >= 45)
+			new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
+
+		//Jetpack (You hit the jackpot!)
+		if(pickednum == 50)
+			new /obj/item/weapon/tank/jetpack/carbondioxide(src)
+
+		return
+
+/obj/structure/closet/syndicate/resources/everything
+	desc = "It's an emergency storage closet for repairs."
+
+	New()
+		var/list/resources = list(
+		/obj/item/stack/sheet/metal,
+		/obj/item/stack/sheet/glass,
+		/obj/item/stack/sheet/mineral/gold,
+		/obj/item/stack/sheet/mineral/silver,
+		/obj/item/stack/sheet/mineral/plasma,
+		/obj/item/stack/sheet/mineral/uranium,
+		/obj/item/stack/sheet/mineral/diamond,
+		/obj/item/stack/sheet/mineral/clown,
+		/obj/item/stack/sheet/plasteel,
+		/obj/item/stack/rods
+		)
+
+		sleep(2)
+
+		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
+
+		return

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -0,0 +1,232 @@
+/* Utility Closets
+ * Contains:
+ *		Emergency Closet
+ *		Fire Closet
+ *		Tool Closet
+ *		Radiation Closet
+ *		Bombsuit Closet
+ *		Hydrant
+ *		First Aid
+ */
+
+/*
+ * Emergency Closet
+ */
+/obj/structure/closet/emcloset
+	name = "emergency closet"
+	desc = "It's a storage unit for emergency breathmasks and o2 tanks."
+	icon_state = "emergency"
+	icon_closed = "emergency"
+	icon_opened = "emergencyopen"
+
+/obj/structure/closet/emcloset/New()
+	..()
+
+	switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
+		if ("small")
+			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/clothing/mask/breath(src)
+		if ("aid")
+			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/weapon/storage/toolbox/emergency(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/weapon/storage/firstaid/o2(src)
+		if ("tank")
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+		if ("both")
+			new /obj/item/weapon/storage/toolbox/emergency(src)
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/weapon/storage/firstaid/o2(src)
+		if ("nothing")
+			// doot
+
+		// teehee - Ah, tg coders...
+		if ("delete")
+			del(src)
+
+		//If you want to re-add fire, just add "fire" = 15 to the pick list.
+		/*if ("fire")
+			new /obj/structure/closet/firecloset(src.loc)
+			del(src)*/
+
+/obj/structure/closet/emcloset/legacy/New()
+	new /obj/item/weapon/tank/oxygen(src)
+	new /obj/item/clothing/mask/gas(src)
+
+/*
+ * Fire Closet
+ */
+/obj/structure/closet/firecloset
+	name = "fire-safety closet"
+	desc = "It's a storage unit for fire-fighting supplies."
+	icon_state = "firecloset"
+	icon_closed = "firecloset"
+	icon_opened = "fireclosetopen"
+
+/obj/structure/closet/firecloset/New()
+	..()
+
+	new /obj/item/clothing/suit/fire/firefighter(src)
+	new /obj/item/clothing/mask/gas(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/full/New()
+	..()
+	sleep(4)
+	contents = list()
+
+	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()
+	if(!opened)
+		icon_state = icon_closed
+	else
+		icon_state = icon_opened
+
+
+/*
+ * Tool Closet
+ */
+/obj/structure/closet/toolcloset
+	name = "tool closet"
+	desc = "It's a storage unit for tools."
+	icon_state = "toolcloset"
+	icon_closed = "toolcloset"
+	icon_opened = "toolclosetopen"
+
+/obj/structure/closet/toolcloset/New()
+	if(prob(40))
+		new /obj/item/clothing/suit/storage/hazardvest(src)
+	if(prob(70))
+		new /obj/item/device/flashlight(src)
+	if(prob(70))
+		new /obj/item/weapon/screwdriver(src)
+	if(prob(70))
+		new /obj/item/weapon/wrench(src)
+	if(prob(70))
+		new /obj/item/weapon/weldingtool(src)
+	if(prob(70))
+		new /obj/item/weapon/crowbar(src)
+	if(prob(70))
+		new /obj/item/weapon/wirecutters(src)
+	if(prob(70))
+		new /obj/item/device/t_scanner(src)
+	if(prob(20))
+		new /obj/item/weapon/storage/belt/utility(src)
+	if(prob(30))
+		new /obj/item/weapon/cable_coil/random(src)
+	if(prob(30))
+		new /obj/item/weapon/cable_coil/random(src)
+	if(prob(30))
+		new /obj/item/weapon/cable_coil/random(src)
+	if(prob(20))
+		new /obj/item/device/multitool(src)
+	if(prob(5))
+		new /obj/item/clothing/gloves/yellow(src)
+	if(prob(40))
+		new /obj/item/clothing/head/hardhat(src)
+
+
+/*
+ * Radiation Closet
+ */
+/obj/structure/closet/radiation
+	name = "radiation suit closet"
+	desc = "It's a storage unit for rad-protective suits."
+	icon_state = "radsuitcloset"
+	icon_opened = "toolclosetopen"
+	icon_closed = "radsuitcloset"
+
+/obj/structure/closet/radiation/New()
+	..()
+	new /obj/item/clothing/suit/radiation(src)
+	new /obj/item/clothing/head/radiation(src)
+
+/*
+ * Bombsuit closet
+ */
+/obj/structure/closet/bombcloset
+	name = "\improper EOD closet"
+	desc = "It's a storage unit for explosion-protective suits."
+	icon_state = "bombsuit"
+	icon_closed = "bombsuit"
+	icon_opened = "bombsuitopen"
+
+/obj/structure/closet/bombcloset/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/bomb_suit( src )
+	new /obj/item/clothing/under/color/black( src )
+	new /obj/item/clothing/shoes/black( src )
+	new /obj/item/clothing/head/bomb_hood( src )
+
+
+/obj/structure/closet/bombclosetsecurity
+	name = "\improper EOD closet"
+	desc = "It's a storage unit for explosion-protective suits."
+	icon_state = "bombsuitsec"
+	icon_closed = "bombsuitsec"
+	icon_opened = "bombsuitsecopen"
+
+/obj/structure/closet/bombclosetsecurity/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/bomb_suit/security( src )
+	new /obj/item/clothing/under/rank/security( src )
+	new /obj/item/clothing/shoes/brown( src )
+	new /obj/item/clothing/head/bomb_hood/security( src )
+
+/*
+ * Hydrant
+ */
+/obj/structure/closet/hydrant //wall mounted fire closet
+	name = "fire-safety closet"
+	desc = "It's a storage unit for fire-fighting supplies."
+	icon_state = "hydrant"
+	icon_closed = "hydrant"
+	icon_opened = "hydrant_open"
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+
+/obj/structure/closet/hydrant/New()
+	..()
+	sleep(2)
+	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)
+
+/*
+ * First Aid
+ */
+/obj/structure/closet/medical_wall //wall mounted medical closet
+	name = "first-aid closet"
+	desc = "It's wall-mounted storage unit for first aid supplies."
+	icon_state = "medical_wall"
+	icon_closed = "medical_wall"
+	icon_opened = "medical_wall_open"
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+
+/obj/structure/closet/medical_wall/update_icon()
+	if(!opened)
+		icon_state = icon_closed
+	else
+		icon_state = icon_opened

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -0,0 +1,383 @@
+/obj/structure/closet/wardrobe
+	name = "wardrobe"
+	desc = "It's a storage unit for standard-issue Nanotrasen attire."
+	icon_state = "blue"
+	icon_closed = "blue"
+
+/obj/structure/closet/wardrobe/red
+	name = "security wardrobe"
+	icon_state = "red"
+	icon_closed = "red"
+
+/obj/structure/closet/wardrobe/red/New()
+	..()
+	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/shoes/jackboots(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/shoes/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)
+	return
+
+
+/obj/structure/closet/wardrobe/pink
+	name = "pink wardrobe"
+	icon_state = "pink"
+	icon_closed = "pink"
+
+/obj/structure/closet/wardrobe/pink/New()
+	..()
+	new /obj/item/clothing/under/color/pink(src)
+	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
+	name = "black wardrobe"
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/black/New()
+	..()
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/under/color/black(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/that(src)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/that(src)
+	return
+
+
+/obj/structure/closet/wardrobe/chaplain_black
+	name = "chapel wardrobe"
+	desc = "It's a storage unit for Nanotrasen-approved religious attire."
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/chaplain_black/New()
+	..()
+	new /obj/item/clothing/under/rank/chaplain(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/suit/nun(src)
+	new /obj/item/clothing/head/nun_hood(src)
+	new /obj/item/clothing/suit/chaplain_hoodie(src)
+	new /obj/item/clothing/head/chaplain_hood(src)
+	new /obj/item/clothing/suit/holidaypriest(src)
+	new /obj/item/clothing/under/wedding/bride_white(src)
+	new /obj/item/weapon/storage/backpack/cultpack (src)
+	new /obj/item/weapon/storage/fancy/candle_box(src)
+	new /obj/item/weapon/storage/fancy/candle_box(src)
+	return
+
+
+/obj/structure/closet/wardrobe/green
+	name = "green wardrobe"
+	icon_state = "green"
+	icon_closed = "green"
+
+/obj/structure/closet/wardrobe/green/New()
+	..()
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	return
+
+/obj/structure/closet/wardrobe/xenos
+	name = "xenos wardrobe"
+	icon_state = "green"
+	icon_closed = "green"
+
+/obj/structure/closet/wardrobe/xenos/New()
+	..()
+	new /obj/item/clothing/suit/unathi/mantle(src)
+	new /obj/item/clothing/suit/unathi/robe(src)
+	new /obj/item/clothing/shoes/sandal(src)
+	new /obj/item/clothing/shoes/sandal(src)
+	new /obj/item/clothing/shoes/sandal(src)
+	return
+
+
+/obj/structure/closet/wardrobe/orange
+	name = "prison wardrobe"
+	desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
+	icon_state = "orange"
+	icon_closed = "orange"
+
+/obj/structure/closet/wardrobe/orange/New()
+	..()
+	new /obj/item/clothing/under/color/orange(src)
+	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
+	name = "yellow wardrobe"
+	icon_state = "wardrobe-y"
+	icon_closed = "wardrobe-y"
+
+/obj/structure/closet/wardrobe/yellow/New()
+	..()
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/yellow(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/atmospherics_yellow
+	name = "atmospherics wardrobe"
+	icon_state = "yellow"
+	icon_closed = "yellow"
+
+/obj/structure/closet/wardrobe/atmospherics_yellow/New()
+	..()
+	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician(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/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/eng(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	return
+
+
+
+/obj/structure/closet/wardrobe/engineering_yellow
+	name = "engineering wardrobe"
+	icon_state = "yellow"
+	icon_closed = "yellow"
+
+/obj/structure/closet/wardrobe/engineering_yellow/New()
+	..()
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	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/eng(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	return
+
+
+/obj/structure/closet/wardrobe/white
+	name = "white wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/white/New()
+	..()
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/under/color/white(src)
+	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)
+	return
+
+
+/obj/structure/closet/wardrobe/pjs
+	name = "Pajama wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/pjs/New()
+	..()
+	new /obj/item/clothing/under/pj/red(src)
+	new /obj/item/clothing/under/pj/red(src)
+	new /obj/item/clothing/under/pj/blue(src)
+	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/toxins_white
+	name = "toxins wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/toxins_white/New()
+	..()
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(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/shoes/slippers
+	new /obj/item/clothing/shoes/slippers
+	new /obj/item/clothing/shoes/slippers
+	return
+
+
+/obj/structure/closet/wardrobe/robotics_black
+	name = "robotics wardrobe"
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/robotics_black/New()
+	..()
+	new /obj/item/clothing/under/rank/roboticist(src)
+	new /obj/item/clothing/under/rank/roboticist(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/gloves/black(src)
+	return
+
+
+/obj/structure/closet/wardrobe/chemistry_white
+	name = "chemistry wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/chemistry_white/New()
+	..()
+	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/storage/labcoat/chemist(src)
+	new /obj/item/clothing/suit/storage/labcoat/chemist(src)
+	return
+
+
+/obj/structure/closet/wardrobe/genetics_white
+	name = "genetics wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/genetics_white/New()
+	..()
+	new /obj/item/clothing/under/rank/geneticist(src)
+	new /obj/item/clothing/under/rank/geneticist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/storage/labcoat/genetics(src)
+	new /obj/item/clothing/suit/storage/labcoat/genetics(src)
+	return
+
+
+/obj/structure/closet/wardrobe/virology_white
+	name = "virology wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/virology_white/New()
+	..()
+	new /obj/item/clothing/under/rank/virologist(src)
+	new /obj/item/clothing/under/rank/virologist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/storage/labcoat/virologist(src)
+	new /obj/item/clothing/suit/storage/labcoat/virologist(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	return
+
+
+/obj/structure/closet/wardrobe/medic_white
+	name = "medical wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/medic_white/New()
+	..()
+	new /obj/item/clothing/under/rank/medical(src)
+	new /obj/item/clothing/under/rank/medical(src)
+	new /obj/item/clothing/under/rank/medical/blue(src)
+	new /obj/item/clothing/under/rank/medical/green(src)
+	new /obj/item/clothing/under/rank/medical/purple(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	return
+
+
+/obj/structure/closet/wardrobe/grey
+	name = "grey wardrobe"
+	icon_state = "grey"
+	icon_closed = "grey"
+
+/obj/structure/closet/wardrobe/grey/New()
+	..()
+	new /obj/item/clothing/under/color/grey(src)
+	new /obj/item/clothing/under/color/grey(src)
+	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
+	name = "mixed wardrobe"
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
+/obj/structure/closet/wardrobe/mixed/New()
+	..()
+	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/under/dress/plaid_blue(src)
+	new /obj/item/clothing/under/dress/plaid_red(src)
+	new /obj/item/clothing/under/dress/plaid_purple(src)
+	new /obj/item/clothing/under/dress/plaid_green(src)
+	new /obj/item/clothing/shoes/blue(src)
+	new /obj/item/clothing/shoes/yellow(src)
+	new /obj/item/clothing/shoes/green(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/purple(src)
+	new /obj/item/clothing/shoes/red(src)
+	new /obj/item/clothing/shoes/leather(src)
+	return

code/game/objects/structures/crates_lockers/crates.dm

@@ -0,0 +1,451 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+/obj/structure/closet/crate
+	name = "crate"
+	desc = "A rectangular steel crate."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "crate"
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+//	mouse_drag_pointer = MOUSE_ACTIVE_POINTER	//???
+	var/rigged = 0
+
+/obj/structure/closet/crate/can_open()
+	return 1
+
+/obj/structure/closet/crate/can_close()
+	return 1
+
+/obj/structure/closet/crate/open()
+	if(src.opened)
+		return 0
+	if(!src.can_open())
+		return 0
+
+	if(rigged && locate(/obj/item/device/radio/electropack) in src)
+		if(isliving(usr))
+			var/mob/living/L = usr
+			if(L.electrocute_act(17, src))
+				var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+				s.set_up(5, 1, src)
+				s.start()
+				return 2
+
+	playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+	for(var/obj/O in src)
+		O.loc = get_turf(src)
+	icon_state = icon_opened
+	src.opened = 1
+	return 1
+
+/obj/structure/closet/crate/close()
+	if(!src.opened)
+		return 0
+	if(!src.can_close())
+		return 0
+
+	playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+	var/itemcount = 0
+	for(var/obj/O in get_turf(src))
+		if(itemcount >= storage_capacity)
+			break
+		if(O.density || O.anchored || istype(O,/obj/structure/closet))
+			continue
+		if(istype(O, /obj/structure/stool/bed)) //This is only necessary because of rollerbeds and swivel chairs.
+			var/obj/structure/stool/bed/B = O
+			if(B.buckled_mob)
+				continue
+		O.loc = src
+		itemcount++
+
+	icon_state = icon_closed
+	src.opened = 0
+	return 1
+
+/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(opened)
+		if(isrobot(user))
+			return
+		user.drop_item()
+		if(W)
+			W.loc = src.loc
+	else if(istype(W, /obj/item/weapon/packageWrap))
+		return
+	else if(istype(W, /obj/item/weapon/cable_coil))
+		if(rigged)
+			user << "<span class='notice'>[src] is already rigged!</span>"
+			return
+		user  << "<span class='notice'>You rig [src].</span>"
+		user.drop_item()
+		del(W)
+		rigged = 1
+		return
+	else if(istype(W, /obj/item/device/radio/electropack))
+		if(rigged)
+			user  << "<span class='notice'>You attach [W] to [src].</span>"
+			user.drop_item()
+			W.loc = src
+			return
+	else if(istype(W, /obj/item/weapon/wirecutters))
+		if(rigged)
+			user  << "<span class='notice'>You cut away the wiring.</span>"
+			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			rigged = 0
+			return
+	else return attack_hand(user)
+
+/obj/structure/closet/crate/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			for(var/obj/O in src.contents)
+				del(O)
+			del(src)
+			return
+		if(2.0)
+			for(var/obj/O in src.contents)
+				if(prob(50))
+					del(O)
+			del(src)
+			return
+		if(3.0)
+			if (prob(50))
+				del(src)
+			return
+		else
+	return
+
+/obj/structure/closet/crate/secure
+	desc = "A secure crate."
+	name = "Secure crate"
+	icon_state = "securecrate"
+	icon_opened = "securecrateopen"
+	icon_closed = "securecrate"
+	var/redlight = "securecrater"
+	var/greenlight = "securecrateg"
+	var/sparks = "securecratesparks"
+	var/emag = "securecrateemag"
+	var/broken = 0
+	var/locked = 1
+
+/obj/structure/closet/crate/secure/New()
+	..()
+	if(locked)
+		overlays.Cut()
+		overlays += redlight
+	else
+		overlays.Cut()
+		overlays += greenlight
+
+/obj/structure/closet/crate/secure/can_open()
+	return !locked
+
+/obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob)
+	if(src.opened)
+		user << "<span class='notice'>Close the crate first.</span>"
+		return
+	if(src.broken)
+		user << "<span class='warning'>The crate appears to be broken.</span>"
+		return
+	if(src.allowed(user))
+		src.locked = !src.locked
+		for(var/mob/O in viewers(user, 3))
+			if((O.client && !( O.blinded )))
+				O << "<span class='notice'>The crate has been [locked ? null : "un"]locked by [user].</span>"
+		overlays.Cut()
+		overlays += locked ? redlight : greenlight
+	else
+		user << "<span class='notice'>Access Denied</span>"
+
+/obj/structure/closet/crate/secure/verb/verb_togglelock()
+	set src in oview(1) // One square distance
+	set category = "Object"
+	set name = "Toggle Lock"
+
+	if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
+		return
+
+	if(ishuman(usr))
+		src.add_fingerprint(usr)
+		src.togglelock(usr)
+	else
+		usr << "<span class='warning'>This mob type can't use this verb.</span>"
+
+/obj/structure/closet/crate/secure/attack_hand(mob/user as mob)
+	src.add_fingerprint(user)
+	if(locked)
+		src.togglelock(user)
+	else
+		src.toggle(user)
+
+/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(is_type_in_list(W, list(/obj/item/weapon/packageWrap, /obj/item/weapon/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters)))
+		return ..()
+	if(locked && (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)))
+		overlays.Cut()
+		overlays += emag
+		overlays += sparks
+		spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
+		playsound(src.loc, "sparks", 60, 1)
+		src.locked = 0
+		src.broken = 1
+		user << "<span class='notice'>You unlock \the [src].</span>"
+		return
+	if(!opened)
+		src.togglelock(user)
+		return
+	return ..()
+
+/obj/structure/closet/crate/secure/emp_act(severity)
+	for(var/obj/O in src)
+		O.emp_act(severity)
+	if(!broken && !opened  && prob(50/severity))
+		if(!locked)
+			src.locked = 1
+			overlays.Cut()
+			overlays += redlight
+		else
+			overlays.Cut()
+			overlays += emag
+			overlays += sparks
+			spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
+			playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
+			src.locked = 0
+	if(!opened && prob(20/severity))
+		if(!locked)
+			open()
+		else
+			src.req_access = list()
+			src.req_access += pick(get_all_accesses())
+	..()
+
+/obj/structure/closet/crate/plastic
+	name = "plastic crate"
+	desc = "A rectangular plastic crate."
+	icon_state = "plasticcrate"
+	icon_opened = "plasticcrateopen"
+	icon_closed = "plasticcrate"
+
+/obj/structure/closet/crate/internals
+	desc = "A internals crate."
+	name = "Internals crate"
+	icon_state = "o2crate"
+	icon_opened = "o2crateopen"
+	icon_closed = "o2crate"
+
+/obj/structure/closet/crate/trashcart
+	desc = "A heavy, metal trashcart with wheels."
+	name = "Trash Cart"
+	icon_state = "trashcart"
+	icon_opened = "trashcartopen"
+	icon_closed = "trashcart"
+
+/*these aren't needed anymore
+/obj/structure/closet/crate/hat
+	desc = "A crate filled with Valuable Collector's Hats!."
+	name = "Hat Crate"
+	icon_state = "crate"
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+
+/obj/structure/closet/crate/contraband
+	name = "Poster crate"
+	desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."
+	icon_state = "crate"
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+*/
+
+/obj/structure/closet/crate/medical
+	desc = "A medical crate."
+	name = "Medical crate"
+	icon_state = "medicalcrate"
+	icon_opened = "medicalcrateopen"
+	icon_closed = "medicalcrate"
+
+/obj/structure/closet/crate/rcd
+	desc = "A crate for the storage of the RCD."
+	name = "RCD crate"
+	icon_state = "crate"
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+
+/obj/structure/closet/crate/rcd/New()
+	..()
+	new /obj/item/weapon/rcd_ammo(src)
+	new /obj/item/weapon/rcd_ammo(src)
+	new /obj/item/weapon/rcd_ammo(src)
+	new /obj/item/weapon/rcd(src)
+
+/obj/structure/closet/crate/freezer
+	desc = "A freezer."
+	name = "Freezer"
+	icon_state = "freezer"
+	icon_opened = "freezeropen"
+	icon_closed = "freezer"
+	var/target_temp = T0C - 40
+	var/cooling_power = 40
+
+	return_air()
+		var/datum/gas_mixture/gas = (..())
+		if(!gas)	return null
+		var/datum/gas_mixture/newgas = new/datum/gas_mixture()
+		newgas.oxygen = gas.oxygen
+		newgas.carbon_dioxide = gas.carbon_dioxide
+		newgas.nitrogen = gas.nitrogen
+		newgas.toxins = gas.toxins
+		newgas.volume = gas.volume
+		newgas.temperature = gas.temperature
+		if(newgas.temperature <= target_temp)	return
+
+		if((newgas.temperature - cooling_power) > target_temp)
+			newgas.temperature -= cooling_power
+		else
+			newgas.temperature = target_temp
+		return newgas
+
+
+/obj/structure/closet/crate/bin
+	desc = "A large bin."
+	name = "Large bin"
+	icon_state = "largebin"
+	icon_opened = "largebinopen"
+	icon_closed = "largebin"
+
+/obj/structure/closet/crate/radiation
+	desc = "A crate with a radiation sign on it."
+	name = "Radioactive gear crate"
+	icon_state = "radiation"
+	icon_opened = "radiationopen"
+	icon_closed = "radiation"
+
+/obj/structure/closet/crate/radiation/New()
+	..()
+	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)
+	new /obj/item/clothing/suit/radiation(src)
+	new /obj/item/clothing/head/radiation(src)
+
+/obj/structure/closet/crate/secure/weapon
+	desc = "A secure weapons crate."
+	name = "Weapons crate"
+	icon_state = "weaponcrate"
+	icon_opened = "weaponcrateopen"
+	icon_closed = "weaponcrate"
+
+/obj/structure/closet/crate/secure/plasma
+	desc = "A secure plasma crate."
+	name = "Plasma crate"
+	icon_state = "plasmacrate"
+	icon_opened = "plasmacrateopen"
+	icon_closed = "plasmacrate"
+
+/obj/structure/closet/crate/secure/gear
+	desc = "A secure gear crate."
+	name = "Gear crate"
+	icon_state = "secgearcrate"
+	icon_opened = "secgearcrateopen"
+	icon_closed = "secgearcrate"
+
+/obj/structure/closet/crate/secure/hydrosec
+	desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
+	name = "secure hydroponics crate"
+	icon_state = "hydrosecurecrate"
+	icon_opened = "hydrosecurecrateopen"
+	icon_closed = "hydrosecurecrate"
+
+/obj/structure/closet/crate/secure/bin
+	desc = "A secure bin."
+	name = "Secure bin"
+	icon_state = "largebins"
+	icon_opened = "largebinsopen"
+	icon_closed = "largebins"
+	redlight = "largebinr"
+	greenlight = "largebing"
+	sparks = "largebinsparks"
+	emag = "largebinemag"
+
+/obj/structure/closet/crate/large
+	name = "large crate"
+	desc = "A hefty metal crate."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "largemetal"
+	icon_opened = "largemetalopen"
+	icon_closed = "largemetal"
+
+/obj/structure/closet/crate/large/close()
+	. = ..()
+	if (.)//we can hold up to one large item
+		var/found = 0
+		for(var/obj/structure/S in src.loc)
+			if(S == src)
+				continue
+			if(!S.anchored)
+				found = 1
+				S.loc = src
+				break
+		if(!found)
+			for(var/obj/machinery/M in src.loc)
+				if(!M.anchored)
+					M.loc = src
+					break
+	return
+
+/obj/structure/closet/crate/secure/large
+	name = "large crate"
+	desc = "A hefty metal crate with an electronic locking system."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "largemetal"
+	icon_opened = "largemetalopen"
+	icon_closed = "largemetal"
+	redlight = "largemetalr"
+	greenlight = "largemetalg"
+
+/obj/structure/closet/crate/secure/large/close()
+	. = ..()
+	if (.)//we can hold up to one large item
+		var/found = 0
+		for(var/obj/structure/S in src.loc)
+			if(S == src)
+				continue
+			if(!S.anchored)
+				found = 1
+				S.loc = src
+				break
+		if(!found)
+			for(var/obj/machinery/M in src.loc)
+				if(!M.anchored)
+					M.loc = src
+					break
+	return
+
+//fluff variant
+/obj/structure/closet/crate/secure/large/reinforced
+	desc = "A hefty, reinforced metal crate with an electronic locking system."
+	icon_state = "largermetal"
+	icon_opened = "largermetalopen"
+	icon_closed = "largermetal"
+
+/obj/structure/closet/crate/hydroponics
+	name = "Hydroponics crate"
+	desc = "All you need to destroy those pesky weeds and pests."
+	icon_state = "hydrocrate"
+	icon_opened = "hydrocrateopen"
+	icon_closed = "hydrocrate"
+
+/obj/structure/closet/crate/hydroponics/prespawned
+	//This exists so the prespawned hydro crates spawn with their contents.
+
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
+		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
+		new /obj/item/weapon/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)

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -0,0 +1,64 @@
+/obj/structure/largecrate
+	name = "large crate"
+	desc = "A hefty wooden crate."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "densecrate"
+	density = 1
+	flags = FPRINT
+
+/obj/structure/largecrate/attack_hand(mob/user as mob)
+	user << "<span class='notice'>You need a crowbar to pry this open!</span>"
+	return
+
+/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /obj/item/stack/sheet/wood(src)
+		var/turf/T = get_turf(src)
+		for(var/obj/O in contents)
+			O.loc = T
+		user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
+							 "<span class='notice'>You pry open \the [src].</span>", \
+							 "<span class='notice'>You hear splitting wood.</span>")
+		del(src)
+	else
+		return attack_hand(user)
+
+/obj/structure/largecrate/mule
+	icon_state = "mulecrate"
+
+/obj/structure/largecrate/lisa
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/lisa/attackby(obj/item/weapon/W as obj, mob/user as mob)	//ugly but oh well
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/corgi/Lisa(loc)
+	..()
+
+/obj/structure/largecrate/cow
+	name = "cow crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/cow/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/cow(loc)
+	..()
+
+/obj/structure/largecrate/goat
+	name = "goat crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/goat/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/hostile/retaliate/goat(loc)
+	..()
+
+/obj/structure/largecrate/chick
+	name = "chicken crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/chick/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		var/num = rand(4, 6)
+		for(var/i = 0, i < num, i++)
+			new /mob/living/simple_animal/chick(loc)
+	..()