Should be up to date now.

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -16,6 +16,10 @@
 	icon_state = "ash"
 	anchored = 1
 
+/obj/effect/decal/cleanable/ash/New()
+	..()
+	reagents.add_reagent("ash", 30)
+
 /obj/effect/decal/cleanable/greenglow
 	name = "green glow"
 
@@ -130,3 +134,11 @@
 	layer = 2
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_pie")
+
+/obj/effect/decal/cleanable/chem_pile
+	name = "chemical pile"
+	desc = "A pile of chemicals. You can't quite tell what's inside it."
+	gender = PLURAL
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "ash"
+	anchored = 1

code/game/objects/effects/decals/Cleanable/robots.dm

@@ -51,6 +51,10 @@
 	var/viruses = list()
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
 
+/obj/effect/decal/cleanable/oil/New()
+	..()
+	reagents.add_reagent("oil", 30)
+
 /obj/effect/decal/cleanable/oil/Destroy()
 	for(var/datum/disease/D in viruses)
 		D.cure(0)

code/game/objects/effects/decals/cleanable.dm

@@ -4,4 +4,39 @@
 /obj/effect/decal/cleanable/New()
 	if (random_icon_states && length(src.random_icon_states) > 0)
 		src.icon_state = pick(src.random_icon_states)
+	create_reagents(300)
+	..()
+
+/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob,)
+	if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food/drinks))
+		if(src.reagents && W.reagents)
+			if(!src.reagents.total_volume)
+				user << "<span class='notice'>[src] isn't thick enough to scoop up!</span>"
+				return
+			if(W.reagents.total_volume >= W.reagents.maximum_volume)
+				user << "<span class='notice'>[W] is full!</span>"
+				return
+			user << "<span class='notice'>You scoop up [src] into [W]!</span>"
+			reagents.trans_to(W, reagents.total_volume)
+			if(!reagents.total_volume) //scooped up all of it
+				qdel(src)
+				return
+	if(is_hot(W)) //todo: make heating a reagent holder proc
+		if(istype(W, /obj/item/clothing/mask/cigarette)) return
+		else
+			var/hotness = is_hot(W)
+			var/added_heat = (hotness / 100)
+			src.reagents.chem_temp = min(src.reagents.chem_temp + added_heat, hotness)
+			src.reagents.handle_reactions()
+			user << "<span class='notice'>You heat [src] with [W]!</span>"
+
+/obj/effect/decal/cleanable/ex_act()
+	if(reagents)
+		for(var/datum/reagent/R in reagents.reagent_list)
+			R.on_ex_act()
+	..()
+
+/obj/effect/decal/cleanable/fire_act()
+	reagents.chem_temp += 30
+	reagents.handle_reactions()
 	..()

code/game/objects/effects/effect_system/effects_foam.dm

@@ -142,7 +142,7 @@
 	metal = metaltype
 
 /datum/effect/effect/system/foam_spread/start()
-	var/obj/effect/effect/foam/foundfoam = locate()
+	var/obj/effect/effect/foam/foundfoam = locate() in location
 	if(foundfoam)//If there was already foam where we start, we add our foaminess to it.
 		foundfoam.amount += amount
 	else

code/game/objects/effects/mines.dm

@@ -13,7 +13,12 @@
 	icon_state = "uglyminearmed"
 
 /obj/effect/mine/Crossed(AM as mob|obj)
-	Bumped(AM)
+	if(isanimal(AM))
+		var/mob/living/simple_animal/SA = AM
+		if(!SA.flying)
+			Bumped(SA)
+	else
+		Bumped(AM)
 
 /obj/effect/mine/Bumped(AM as mob|obj)
 

code/game/objects/items/bodybag.dm

@@ -34,9 +34,7 @@
 	name = "body bag"
 	desc = "A plastic bag designed for the storage and transportation of cadavers."
 	icon = 'icons/obj/bodybag.dmi'
-	icon_state = "bodybag_closed"
-	icon_closed = "bodybag_closed"
-	icon_opened = "bodybag_open"
+	icon_state = "bodybag"
 	var/foldedbag_path = /obj/item/bodybag
 	density = 0
 	mob_storage_capacity = 2
@@ -84,13 +82,6 @@
 		qdel(src)
 
 
-/obj/structure/closet/body_bag/update_icon()
-	if(!opened)
-		icon_state = icon_closed
-	else
-		icon_state = icon_opened
-
-
 // Bluespace bodybag
 
 /obj/item/bodybag/bluespace
@@ -105,9 +96,7 @@
 	name = "bluespace body bag"
 	desc = "A bluespace body bag designed for the storage and transportation of cadavers."
 	icon = 'icons/obj/bodybag.dmi'
-	icon_state = "bluebodybag_closed"
-	icon_closed = "bluebodybag_closed"
-	icon_opened = "bluebodybag_open"
+	icon_state = "bluebodybag"
 	foldedbag_path = /obj/item/bodybag/bluespace
 	density = 0
 	mob_storage_capacity = 15

code/game/objects/items/crayons.dm

@@ -125,6 +125,7 @@
 				C.confused = max(C.confused, 3)
 				C.Weaken(3)
 			C.lip_style = "spray_face"
+			C.lip_color = colour
 			C.update_body()
 		playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5)
 		..()

code/game/objects/items/devices/megaphone.dm

@@ -17,12 +17,11 @@
 		if(user.client.prefs.muted & MUTE_IC)
 			src << "<span class='warning'>You cannot speak in IC (muted).</span>"
 			return
+
 	if(!ishuman(user))
 		user << "<span class='warning'>You don't know how to use this!</span>"
 		return
-	if(user.can_speak())
-		user << "<span class='warning'>You find yourself unable to speak at all.</span>"
-		return
+
 	if(spamcheck > world.time)
 		user << "<span class='warning'>\The [src] needs to recharge!</span>"
 		return
@@ -30,16 +29,21 @@
 	var/message = copytext(sanitize(input(user, "Shout a message?", "Megaphone", null)  as text),1,MAX_MESSAGE_LEN)
 	if(!message)
 		return
+
 	message = capitalize(message)
+	if(!user.can_speak(message))
+		user << "<span class='warning'>You find yourself unable to speak at all.</span>"
+		return
+
 	if ((src.loc == user && user.stat == 0))
 		if(emagged)
 			if(insults)
-				user.audible_message("<B>[user]</B> broadcasts, <FONT size=3>\"[pick(insultmsg)]\"</FONT>", null, 1) // 2 stands for hearable message
+				user.audible_message("<B>[user]</B> broadcasts, <FONT size=3>\"[pick(insultmsg)]\"</FONT>")
 				insults--
 			else
 				user << "<span class='warning'>*BZZZZzzzzzt*</span>"
 		else
-			user.audible_message("<B>[user]</B> broadcasts, <FONT size=3>\"[message]\"</FONT>", null, 1) // 2 stands for hearable message
+			user.audible_message("<B>[user]</B> broadcasts, <FONT size=3>\"[message]\"</FONT>")
 
 		playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1)
 		spamcheck = world.time + 50
@@ -60,4 +64,4 @@
 
 /obj/item/device/megaphone/cargo
 	name = "supply megaphone"
-	icon_state = "megaphone-cargo"
+	icon_state = "megaphone-cargo"

code/game/objects/items/devices/pizza_bomb.dm

@@ -0,0 +1,101 @@
+/obj/item/device/pizza_bomb
+	name = "pizza box"
+	desc = "A box suited for pizzas."
+	icon = 'icons/obj/food/containers.dmi'
+	icon_state = "pizzabox1"
+	var/timer = 10 //Adjustable timer
+	var/timer_set = 0
+	var/primed = 0
+	var/disarmed = 0
+	var/wires = list("orange", "green", "blue", "yellow", "aqua", "purple")
+	var/correct_wire
+	var/armer //Used for admin purposes
+
+/obj/item/device/pizza_bomb/attack_self(mob/user)
+	if(disarmed)
+		user << "<span class='notice'>\The [src] is disarmed.</span>"
+		return
+	if(!timer_set)
+		name = "pizza bomb"
+		desc = "It seems inactive."
+		icon_state = "pizzabox_bomb"
+		timer_set = 1
+		timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) * 10
+		if(!user.canUseTopic(src))
+			timer_set = 0
+			name = "pizza box"
+			desc = "A box suited for pizzas."
+			icon_state = "pizzabox1"
+			return
+		timer = Clamp(timer, 10, 100)
+		icon_state = "pizzabox1"
+		user << "<span class='notice'>You set the timer to [timer / 10] before activating the payload and closing \the [src]."
+		message_admins("[key_name(usr)]<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A> has set a timer on a pizza bomb to [timer/10] seconds at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>(JMP)</a>.")
+		log_game("[key_name(usr)] has set the timer on a pizza bomb to [timer/10] seconds ([loc.x],[loc.y],[loc.z]).")
+		armer = usr
+		name = "pizza box"
+		desc = "A box suited for pizzas."
+		return
+	if(!primed)
+		name = "pizza bomb"
+		desc = "OH GOD THAT'S NOT A PIZZA"
+		icon_state = "pizzabox_bomb"
+		audible_message("<span class='warning'>\icon[src] *beep* *beep*</span>")
+		user << "<span class='danger'>That's no pizza! That's a bomb!</span>"
+		message_admins("[key_name(usr)]<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A> has triggered a pizza bomb armed by [armer] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>(JMP)</a>.")
+		log_game("[key_name(usr)] has triggered a pizza bomb armed by [armer] ([loc.x],[loc.y],[loc.z]).")
+		primed = 1
+		sleep(timer)
+		return go_boom()
+
+/obj/item/device/pizza_bomb/proc/go_boom()
+	if(disarmed)
+		visible_message("<span class='danger'>\icon[src] Sparks briefly jump out of the [correct_wire] wire on \the [src], but it's disarmed!")
+		return
+	src.audible_message("\icon[src] <b>[src]</b> beeps, \"Enjoy the pizza!\"")
+	src.visible_message("<span class='userdanger'>\The [src] violently explodes!</span>")
+	explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb
+	qdel(src)
+
+/obj/item/device/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params)
+	if(istype(I, /obj/item/weapon/wirecutters) && primed)
+		user << "<span class='danger'>Oh God, what wire do you cut?!</span>"
+		var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires
+		if(!user.canUseTopic(src))
+			return
+		playsound(src, 'sound/items/Wirecutter.ogg', 50, 1, 1)
+		user.visible_message("<span class='warning'>[user] cuts the [chosen_wire] wire!</span>", "<span class='danger'>You cut the [chosen_wire] wire!</span>")
+		sleep(5)
+		if(chosen_wire == correct_wire)
+			src.audible_message("<span class='warning'>\icon[src] \The [src] suddenly stops beeping and seems lifeless.</span>")
+			user << "<span class='notice'>You did it!</span>"
+			icon_state = "pizzabox_bomb_[correct_wire]"
+			name = "pizza bomb"
+			desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed."
+			disarmed = 1
+			primed = 0
+			return
+		else
+			user << "<span class='userdanger'>WRONG WIRE!</span>"
+			go_boom()
+			return
+	if(istype(I, /obj/item/weapon/wirecutters) && disarmed)
+		if(!in_range(user, src))
+			user << "<span class='warning'>You can't see the box well enough to cut the wires out.</span>"
+			return
+		user.visible_message("<span class='notice'>[user] starts removing the payload and wires from \the [src].</span>")
+		if(do_after(user, 40))
+			playsound(src, 'sound/items/Wirecutter.ogg', 50, 1, 1)
+			user.unEquip(src)
+			user.visible_message("<span class='notice'>[user] removes the insides of \the [src]!</span>")
+			var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(src.loc)
+			C.amount = 3
+			new /obj/item/weapon/bombcore/miniature(src.loc)
+			new /obj/item/pizzabox(src.loc)
+			qdel(src)
+		return
+	..()
+
+/obj/item/device/pizza_bomb/New()
+	..()
+	correct_wire = pick(wires)

code/game/objects/items/weapons/cosmetics.dm

@@ -14,8 +14,9 @@
 	colour = "purple"
 
 /obj/item/weapon/lipstick/jade
+	//It's still called Jade, but theres no HTML color for jade, so we use lime.
 	name = "jade lipstick"
-	colour = "jade"
+	colour = "lime"
 
 /obj/item/weapon/lipstick/black
 	name = "black lipstick"
@@ -26,17 +27,21 @@
 	name = "lipstick"
 
 /obj/item/weapon/lipstick/random/New()
-	colour = pick("red","purple","jade","black")
+	colour = pick("red","purple","lime","black","green","blue","white")
 	name = "[colour] lipstick"
 
 
 /obj/item/weapon/lipstick/attack_self(mob/user)
+	overlays.Cut()
 	user << "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>"
 	open = !open
 	if(open)
-		icon_state = "[initial(icon_state)]_[colour]"
+		var/image/colored = image("icon"='icons/obj/items.dmi', "icon_state"="lipstick_uncap_color")
+		colored.color = colour
+		icon_state = "lipstick_uncap"
+		overlays += colored
 	else
-		icon_state = initial(icon_state)
+		icon_state = "lipstick"
 
 /obj/item/weapon/lipstick/attack(mob/M, mob/user)
 	if(!open)	return
@@ -51,7 +56,8 @@
 		if(H == user)
 			user.visible_message("<span class='notice'>[user] does their lips with \the [src].</span>", \
 								 "<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
-			H.lip_style = colour
+			H.lip_style = "lipstick"
+			H.lip_color = colour
 			H.update_body()
 		else
 			user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
@@ -59,7 +65,8 @@
 			if(do_after(user, 20) && do_after(H, 20, 5, 0))	//user needs to keep their active hand, H does not.
 				user.visible_message("<span class='notice'>[user] does [H]'s lips with \the [src].</span>", \
 									 "<span class='notice'>You apply \the [src].</span>")
-				H.lip_style = colour
+				H.lip_style = "lipstick"
+				H.lip_color = colour
 				H.update_body()
 	else
 		user << "<span class='notice'>Where are the lips on that?</span>"

code/game/objects/items/weapons/handcuffs.dm

@@ -1,3 +1,7 @@
+
+/obj/item/weapon/restraints
+	var/breakouttime = 600
+
 //Handcuffs
 
 /obj/item/weapon/restraints/handcuffs
@@ -14,7 +18,7 @@
 	throw_range = 5
 	m_amt = 500
 	origin_tech = "materials=1"
-	var/breakouttime = 600 //Deciseconds = 60s = 1 minute
+	breakouttime = 600 //Deciseconds = 60s = 1 minute
 	var/cuffsound = 'sound/weapons/handcuffs.ogg'
 	var/trashtype = null //for disposable cuffs
 
@@ -144,7 +148,7 @@
 	w_class = 3.0
 	origin_tech = "materials=1"
 	slowdown = 7
-	var/breakouttime = 300	//Deciseconds = 30s = 0.5 minute
+	breakouttime = 300	//Deciseconds = 30s = 0.5 minute
 
 /obj/item/weapon/restraints/legcuffs/beartrap
 	name = "bear trap"
@@ -169,26 +173,29 @@
 
 /obj/item/weapon/restraints/legcuffs/beartrap/Crossed(AM as mob|obj)
 	if(armed && isturf(src.loc))
-		if( (iscarbon(AM) || isanimal(AM)) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator))
+		if(isliving(AM))
 			var/mob/living/L = AM
-			armed = 0
-			icon_state = "beartrap0"
-			playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
-			L.visible_message("<span class='danger'>[L] triggers \the [src].</span>", \
-					"<span class='userdanger'>You trigger \the [src]!</span>")
-
-			if(ishuman(AM))
-				var/mob/living/carbon/H = AM
-				if(H.lying)
-					H.apply_damage(20,BRUTE,"chest")
-				else
-					H.apply_damage(20,BRUTE,(pick("l_leg", "r_leg")))
-				if(!H.legcuffed) //beartrap can't cuff you leg if there's already a beartrap or legcuffs.
-					H.legcuffed = src
-					src.loc = H
-					H.update_inv_legcuffed(0)
-					feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
-
-			else
-				L.apply_damage(20,BRUTE)
+			var/snap = 0
+			var/def_zone = "chest"
+			if(iscarbon(L))
+				var/mob/living/carbon/C = L
+				snap = 1
+				if(!C.lying)
+					def_zone = pick("l_leg", "r_leg")
+					if(!C.legcuffed) //beartrap can't cuff your leg if there's already a beartrap or legcuffs.
+						C.legcuffed = src
+						src.loc = C
+						C.update_inv_legcuffed(0)
+						feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
+			else if(isanimal(L))
+				var/mob/living/simple_animal/SA = L
+				if(!SA.flying && SA.mob_size > MOB_SIZE_TINY)
+					snap = 1
+			if(snap)
+				armed = 0
+				icon_state = "beartrap0"
+				playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+				L.visible_message("<span class='danger'>[L] triggers \the [src].</span>", \
+						"<span class='userdanger'>You trigger \the [src]!</span>")
+				L.apply_damage(20,BRUTE, def_zone)
 	..()

code/game/objects/items/weapons/manuals.dm

@@ -686,7 +686,8 @@
 				All doughs can be microwaved.<br>
 				<b>Bowl:</b> Add water to it for soup preparation.<br>
 				<b>Meat:</b> Microwave it, process it, slice it into microwavable cutlets with your knife, or use it raw.<br>
-				<b>Cheese:</b> Add 5u universal enzyme (catalyst) to milk and soy milk to prepare cheese (sliceable) and tofu.
+				<b>Cheese:</b> Add 5u universal enzyme (catalyst) to milk and soy milk to prepare cheese (sliceable) and tofu.<br>
+				<b>Rice:</b> Mix 10u rice with 10u water in a bowl then microwave it.
 
 				<h2>Custom food:</h2>
 				Add ingredients to a base item to prepare a custom meal.<br>

code/game/objects/items/weapons/signs.dm

@@ -7,6 +7,7 @@
 	attack_verb = list("bashed","smacked")
 
 	var/label = ""
+	var/last_wave = 0
 
 /obj/item/weapon/picket_sign/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon))
@@ -18,11 +19,13 @@
 	..()
 
 /obj/item/weapon/picket_sign/attack_self(mob/living/carbon/human/user)
-	if(label)
-		user.visible_message("<span class='warning'>[user] waves around \the \"[label]\" sign.</span>")
-	else
-		user.visible_message("<span class='warning'>[user] waves around blank sign.</span>")
-	user.changeNext_move(CLICK_CD_MELEE)
+	if( last_wave + 20 < world.time )
+		last_wave = world.time
+		if(label)
+			user.visible_message("<span class='warning'>[user] waves around \the \"[label]\" sign.</span>")
+		else
+			user.visible_message("<span class='warning'>[user] waves around blank sign.</span>")
+		user.changeNext_move(CLICK_CD_MELEE)
 
 /datum/table_recipe/picket_sign
 	name = "Picket Sign"

code/game/objects/items/weapons/storage/backpack.dm

@@ -43,6 +43,9 @@
 
 /obj/item/weapon/storage/backpack/holding/handle_item_insertion(obj/item/W, prevent_warning = 0, mob/user)
 	if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
+		var/safety = alert(user, "You feel this may not be the best idea.", "Put in [name]?", "Proceed", "Abort")
+		if(safety == "Abort" || !in_range(src, user) || !src || !W)
+			return
 		investigate_log("has become a singularity. Caused by [user.key]","singulo")
 		user << "<span class='danger'>The Bluespace interfaces of the two devices catastrophically malfunction!</span>"
 		qdel(W)

code/game/objects/items/weapons/storage/bags.dm

@@ -286,7 +286,7 @@
  */
 /obj/item/weapon/storage/bag/tray
 	name = "tray"
-	icon = 'icons/obj/food.dmi'
+	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "tray"
 	desc = "A metal tray to lay food on."
 	force = 5

code/game/objects/items/weapons/storage/boxes.dm

@@ -350,7 +350,7 @@
 /obj/item/weapon/storage/box/monkeycubes
 	name = "monkey cube box"
 	desc = "Drymate brand monkey cubes. Just add water!"
-	icon = 'icons/obj/food.dmi'
+	icon = 'icons/obj/food/food.dmi'
 	icon_state = "monkeycubebox"
 	storage_slots = 7
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube)

code/game/objects/items/weapons/storage/fancy.dm

@@ -15,7 +15,7 @@
  */
 
 /obj/item/weapon/storage/fancy/
-	icon = 'icons/obj/food.dmi'
+	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "donutbox6"
 	name = "donut box"
 	var/icon_type = "donut"
@@ -39,7 +39,7 @@
  */
 
 /obj/item/weapon/storage/fancy/donut_box
-	icon = 'icons/obj/food.dmi'
+	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "donutbox6"
 	icon_type = "donut"
 	name = "donut box"
@@ -58,7 +58,7 @@
  */
 
 /obj/item/weapon/storage/fancy/egg_box
-	icon = 'icons/obj/food.dmi'
+	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "eggbox"
 	icon_type = "egg"
 	name = "egg box"

code/game/objects/items/weapons/stunbaton.dm

@@ -13,7 +13,6 @@
 	var/status = 0
 	var/obj/item/weapon/stock_parts/cell/high/bcell = null
 	var/hitcost = 1000
-	var/losspertick = 5
 
 /obj/item/weapon/melee/baton/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide.</span>")
@@ -45,24 +44,8 @@
 		else
 			return 0
 
-/obj/item/weapon/melee/baton/proc/update_process()
-	if(status)
-		SSobj.processing |= src
-	else
-		SSobj.processing.Remove(src)
 
-/obj/item/weapon/melee/baton/process()
-	if(bcell)
-		if(bcell.charge < hitcost)
-			status = 0
-			update_icon()
-		if(status)
-			if(isrobot(loc))
-				var/mob/living/silicon/robot/R = loc
-				if(R && R.cell)
-					R.cell.use(losspertick)
-			else
-				bcell.use(losspertick)
+
 
 /obj/item/weapon/melee/baton/update_icon()
 	if(status)
@@ -71,7 +54,6 @@
 		icon_state = "[initial(name)]_nocell"
 	else
 		icon_state = "[initial(name)]"
-	update_process()
 
 /obj/item/weapon/melee/baton/examine(mob/user)
 	..()

code/game/objects/items/weapons/tanks/tanks.dm

@@ -102,7 +102,7 @@
 <b>Tank</b><BR>
 <FONT color='blue'><b>Tank Pressure:</b> [air_contents.return_pressure()]</FONT><BR>
 <BR>
-<b>Mask Release Pressure:</b> <A href='?src=\ref[src];dist_p=-10'>-</A> <A href='?src=\ref[src];dist_p=-1'>-</A> [distribute_pressure] <A href='?src=\ref[src];dist_p=1'>+</A> <A href='?src=\ref[src];dist_p=10'>+</A><BR>
+<b>Mask Release Pressure:</b> <A href='?src=\ref[src];dist_p=-5'>-</A> <A href='?src=\ref[src];dist_p=-1'>-</A> [distribute_pressure] <A href='?src=\ref[src];dist_p=1'>+</A> <A href='?src=\ref[src];dist_p=5'>+</A><BR>
 <b>Mask Release Valve:</b> <A href='?src=\ref[src];stat=1'>[using_internal?("Open"):("Closed")]</A>
 "}
 	user << browse(message, "window=tank;size=600x300")

code/game/objects/items/weapons/weaponry.dm

@@ -138,7 +138,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
 	icon_state = "throwingstar"
 	item_state = "eshield0"
 	force = 2
-	throwforce = 0 //This is never used since this has a 100% embed chance.
+	throwforce = 20 //This is never used on mobs since this has a 100% embed chance.
 	throw_speed = 4
 	embedded_pain_multiplier = 4
 	w_class = 2

code/game/objects/objs.dm

@@ -10,10 +10,6 @@
 	var/damtype = "brute"
 	var/force = 0
 
-/obj/proc/process()
-	SSobj.processing.Remove(src)
-	return 0
-
 /obj/Destroy()
 	if(!istype(src, /obj/machinery))
 		SSobj.processing.Remove(src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists

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

@@ -1,12 +1,8 @@
 /obj/structure/closet/crate/bin
 	desc = "A trash bin, place your trash here for the janitor to collect."
 	name = "trash bin"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "largebins"
-	density = 1
+	icon_crate = "largebins"
 	anchored = 1
-	icon_opened = "largebinsopen"
-	icon_closed = "largebins"
 	sound_effect_open = 'sound/effects/bin_open.ogg'
 	sound_effect_close = 'sound/effects/bin_close.ogg'
 	var/animation = "animate_largebins"
@@ -14,7 +10,6 @@
 	var/greenlight = "largebing"
 	var/orangelight = "largebino"
 
-
 /obj/structure/closet/crate/bin/New()
 	..()
 	update_icon()

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

@@ -2,10 +2,9 @@
 	name = "closet"
 	desc = "It's a basic storage unit."
 	icon = 'icons/obj/closet.dmi'
-	icon_state = "closed"
+	icon_state = "generic"
 	density = 1
-	var/icon_closed = "closed"
-	var/icon_opened = "open"
+	var/icon_door = null
 	var/opened = 0
 	var/welded = 0
 	var/locked = 0
@@ -19,11 +18,30 @@
 	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()
+	..()
+	update_icon()
+
 /obj/structure/closet/initialize()
 	..()
 	if(!opened)		// if closed, any item at the crate's loc is put in the contents
 		take_contents()
 
+/obj/structure/closet/update_icon()
+	overlays.Cut()
+	if(!opened)
+		if(icon_door)
+			overlays += "[icon_door]_door"
+		else
+			overlays += "[icon_state]_door"
+		if(welded)
+			overlays += "welded"
+	else
+		if(icon_door)
+			overlays += "[icon_door]_open"
+		else
+			overlays += "[icon_state]_open"
+
 /obj/structure/closet/alter_health()
 	return get_turf(src)
 
@@ -68,13 +86,13 @@
 
 	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
+	update_icon()
 	return 1
 
 /obj/structure/closet/proc/insert(var/atom/movable/AM)
@@ -86,7 +104,7 @@
 		var/mob/living/L = AM
 		if(L.buckled || L.mob_size > max_mob_size) //buckled mobs and mobs too big for the container don't get inside closets.
 			return 0
-		if(L.mob_size > 0)
+		if(L.mob_size > MOB_SIZE_TINY) //decently sized mobs take more space than objects.
 			var/mobs_stored = 0
 			for(var/mob/living/M in contents)
 				mobs_stored++
@@ -112,13 +130,13 @@
 
 	take_contents()
 
-	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
+	update_icon()
 	return 1
 
 /obj/structure/closet/proc/toggle()
@@ -275,15 +293,6 @@
 	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
-
 // Objects that try to exit a locker by stepping were doing so successfully,
 // and due to an oversight in turf/Enter() were going through walls.  That
 // should be independently resolved, but this is also an interesting twist.

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

@@ -1,12 +0,0 @@
-/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

@@ -2,8 +2,6 @@
 	name = "critter crate"
 	desc = "A crate designed for safe transport of animals. Only openable from the the outside."
 	icon_state = "critter"
-	icon_opened = "critteropen"
-	icon_closed = "critter"
 	var/already_opened = 0
 	var/content_mob = null
 	var/amount = 1

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

@@ -3,9 +3,8 @@
 	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 = 'icons/obj/wallmounts.dmi'
 	icon_state = "fireaxe1000"
-	icon_closed = "fireaxe1000"
-	icon_opened = "fireaxe1100"
 	anchored = 1
 	density = 0
 	wall_mounted = 1

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

@@ -1,8 +1,7 @@
 /obj/structure/closet/athletic_mixed
 	name = "athletic wardrobe"
 	desc = "It's a storage unit for athletic wear."
-	icon_state = "mixed"
-	icon_closed = "mixed"
+	icon_door = "mixed"
 
 /obj/structure/closet/athletic_mixed/New()
 	..()
@@ -40,8 +39,7 @@
 /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"
+	icon_door = "red"
 
 /obj/structure/closet/lasertag/red/New()
 	..()
@@ -57,8 +55,7 @@
 /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"
+	icon_door = "blue"
 
 /obj/structure/closet/lasertag/blue/New()
 	..()

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

@@ -1,38 +1,22 @@
 /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
+	icon_state = "cabinet"
 
 /obj/structure/closet/acloset
 	name = "strange closet"
 	desc = "It looks alien!"
-	icon_state = "acloset"
-	icon_closed = "acloset"
-	icon_opened = "aclosetopen"
+	icon_state = "alien"
 
 
 /obj/structure/closet/gimmick
 	name = "administrative supply closet"
 	desc = "It's a storage unit for things that have no right being here."
-	icon_state = "syndicate1"
-	icon_closed = "syndicate1"
-	icon_opened = "syndicate1open"
-	anchored = 0
+	icon_state = "syndicate"
 
 /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()
 	..()
@@ -51,9 +35,6 @@
 /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()
 	..()
@@ -76,16 +57,11 @@
 /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()
-	..()
-
 /obj/structure/closet/thunderdome/tdred
 	name = "red-team Thunderdome closet"
+	icon_door = "red"
 
 /obj/structure/closet/thunderdome/tdred/New()
 	..()
@@ -110,9 +86,7 @@
 
 /obj/structure/closet/thunderdome/tdgreen
 	name = "green-team Thunderdome closet"
-	icon_state = "syndicate1"
-	icon_closed = "syndicate1"
-	icon_opened = "syndicate1open"
+	icon_door = "green"
 
 /obj/structure/closet/thunderdome/tdgreen/New()
 	..()
@@ -135,3 +109,16 @@
 	new /obj/item/clothing/head/helmet/thunderdome(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)
 
+/obj/structure/closet/malf/suits
+	desc = "It's a storage unit for operational gear."
+	icon_state = "syndicate"
+
+/obj/structure/closet/malf/suits/New()
+	..()
+	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/stock_parts/cell(src)
+	new /obj/item/device/multitool(src)

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

@@ -3,6 +3,7 @@
  *		Bartender
  *		Janitor
  *		Lawyer
+ *		Coffin
  */
 
 /*
@@ -11,8 +12,7 @@
 /obj/structure/closet/gmcloset
 	name = "formal closet"
 	desc = "It's a storage unit for formal clothing."
-	icon_state = "black"
-	icon_closed = "black"
+	icon_door = "black"
 
 /obj/structure/closet/gmcloset/New()
 	..()
@@ -37,8 +37,7 @@
 /obj/structure/closet/chefcloset
 	name = "\proper chef's closet"
 	desc = "It's a storage unit for foodservice garments and mouse traps."
-	icon_state = "black"
-	icon_closed = "black"
+	icon_door = "black"
 
 /obj/structure/closet/chefcloset/New()
 	..()
@@ -65,8 +64,7 @@
 /obj/structure/closet/jcloset
 	name = "custodial closet"
 	desc = "It's a storage unit for janitorial clothes and gear."
-	icon_state = "mixed"
-	icon_closed = "mixed"
+	icon_door = "mixed"
 
 /obj/structure/closet/jcloset/New()
 	..()
@@ -91,10 +89,10 @@
 /obj/structure/closet/lawcloset
 	name = "legal closet"
 	desc = "It's a storage unit for courtroom apparel and items."
-	icon_state = "blue"
-	icon_closed = "blue"
+	icon_door = "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)
@@ -105,4 +103,9 @@
 	new /obj/item/clothing/under/lawyer/blacksuit(src)
 	new /obj/item/clothing/suit/toggle/lawyer/black(src)
 	new /obj/item/clothing/shoes/laceup(src)
-	new /obj/item/clothing/shoes/laceup(src)
+	new /obj/item/clothing/shoes/laceup(src)
+
+/obj/structure/closet/coffin
+	name = "coffin"
+	desc = "It's a burial receptacle for the dearly departed."
+	icon_state = "coffin"

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

@@ -2,31 +2,14 @@
 	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()
 	..()
 	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()
-	..()
-	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"
+	icon_state = "bio_viro"
 
 /obj/structure/closet/l3closet/virology/New()
 	..()
@@ -36,9 +19,7 @@
 
 
 /obj/structure/closet/l3closet/security
-	icon_state = "bio_security"
-	icon_closed = "bio_security"
-	icon_opened = "bio_securityopen"
+	icon_state = "bio_sec"
 
 /obj/structure/closet/l3closet/security/New()
 	..()
@@ -48,9 +29,7 @@
 
 
 /obj/structure/closet/l3closet/janitor
-	icon_state = "bio_janitor"
-	icon_closed = "bio_janitor"
-	icon_opened = "bio_janitoropen"
+	icon_state = "bio_jan"
 
 /obj/structure/closet/l3closet/janitor/New()
 	..()
@@ -60,9 +39,7 @@
 
 
 /obj/structure/closet/l3closet/scientist
-	icon_state = "bio_scientist"
-	icon_closed = "bio_scientist"
-	icon_opened = "bio_scientistopen"
+	icon_state = "bio_viro"
 
 /obj/structure/closet/l3closet/scientist/New()
 	..()

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

@@ -1,16 +0,0 @@
-
-/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()
-	..()
-	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/stock_parts/cell(src)
-	new /obj/item/device/multitool(src)

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

@@ -1,13 +1,7 @@
 /obj/structure/closet/secure_closet/bar
 	name = "booze storage"
 	req_access = list(access_bar)
-	icon_state = "cabinetdetective_locked"
-	icon_closed = "cabinetdetective"
-	icon_locked = "cabinetdetective_locked"
-	icon_opened = "cabinetdetective_open"
-	icon_broken = "cabinetdetective_broken"
-	icon_off = "cabinetdetective_broken"
-
+	icon_state = "cabinet"
 
 /obj/structure/closet/secure_closet/bar/New()
 	..()
@@ -21,16 +15,3 @@
 	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
 	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
 	new /obj/item/weapon/reagent_containers/food/drinks/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

@@ -1,12 +1,7 @@
 /obj/structure/closet/secure_closet/cargotech
 	name = "cargo technician's locker"
 	req_access = list(access_cargo)
-	icon_state = "securecargo1"
-	icon_closed = "securecargo"
-	icon_locked = "securecargo1"
-	icon_opened = "securecargoopen"
-	icon_broken = "securecargobroken"
-	icon_off = "securecargooff"
+	icon_state = "cargo"
 
 /obj/structure/closet/secure_closet/cargotech/New()
 	..()
@@ -15,18 +10,11 @@
 	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/clothing/head/soft(src)
-//	new /obj/item/weapon/cartridge/quartermaster(src)
-	return
 
 /obj/structure/closet/secure_closet/quartermaster
 	name = "\proper quartermaster's locker"
 	req_access = list(access_qm)
-	icon_state = "secureqm1"
-	icon_closed = "secureqm"
-	icon_locked = "secureqm1"
-	icon_opened = "secureqmopen"
-	icon_broken = "secureqmbroken"
-	icon_off = "secureqmoff"
+	icon_state = "qm"
 
 /obj/structure/closet/secure_closet/quartermaster/New()
 	..()
@@ -34,7 +22,6 @@
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)
-//	new /obj/item/weapon/cartridge/quartermaster(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/device/megaphone/cargo(src)
@@ -42,4 +29,3 @@
 	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

@@ -1,13 +1,7 @@
 /obj/structure/closet/secure_closet/engineering_chief
 	name = "\proper chief engineer's locker"
 	req_access = list(access_ce)
-	icon_state = "securece1"
-	icon_closed = "securece"
-	icon_locked = "securece1"
-	icon_opened = "secureceopen"
-	icon_broken = "securecebroken"
-	icon_off = "secureceoff"
-
+	icon_state = "ce"
 
 /obj/structure/closet/secure_closet/engineering_chief/New()
 	..()
@@ -35,18 +29,12 @@
 	new /obj/item/device/multitool(src)
 	new /obj/item/device/flash/handheld(src)
 	new /obj/item/clothing/glasses/meson/engine(src)
-	return
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"
 	req_access = list(access_engine_equip)
-	icon_state = "secureengelec1"
-	icon_closed = "secureengelec"
-	icon_locked = "secureengelec1"
-	icon_opened = "toolclosetopen"
-	icon_broken = "secureengelecbroken"
-	icon_off = "secureengelecoff"
-
+	icon_state = "eng"
+	icon_door = "eng_elec"
 
 /obj/structure/closet/secure_closet/engineering_electrical/New()
 	..()
@@ -61,20 +49,12 @@
 	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 locker"
 	req_access = list(access_engine_equip)
-	icon_state = "secureengweld1"
-	icon_closed = "secureengweld"
-	icon_locked = "secureengweld1"
-	icon_opened = "toolclosetopen"
-	icon_broken = "secureengweldbroken"
-	icon_off = "secureengweldoff"
-
+	icon_state = "eng"
+	icon_door = "eng_weld"
 
 /obj/structure/closet/secure_closet/engineering_welding/New()
 	..()
@@ -84,20 +64,11 @@
 	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"
-
+	icon_state = "eng_secure"
 
 /obj/structure/closet/secure_closet/engineering_personal/New()
 	..()
@@ -115,18 +86,11 @@
 	new /obj/item/tapeproj/engineering(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/glasses/meson/engine(src)
-	return
 
 /obj/structure/closet/secure_closet/atmospherics
 	name = "\proper atmospheric technician's locker"
 	req_access = list(access_atmospherics)
-	icon_state = "secureatmos1"
-	icon_closed = "secureatmos"
-	icon_locked = "secureatmos1"
-	icon_opened = "secureatmosopen"
-	icon_broken = "secureatmosbroken"
-	icon_off = "secureatmosoff"
-
+	icon_state = "atmos"
 
 /obj/structure/closet/secure_closet/atmospherics/New()
 	..()
@@ -139,5 +103,4 @@
 	new /obj/item/tapeproj/engineering(src)
 	new /obj/item/weapon/watertank/atmos(src)
 	new /obj/item/clothing/suit/fire/atmos(src)
-	new /obj/item/clothing/head/hardhat/atmos(src)
-	return
+	new /obj/item/clothing/head/hardhat/atmos(src)

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

@@ -1,16 +1,5 @@
 /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
+	icon_state = "freezer"
 
 /obj/structure/closet/secure_closet/freezer/kitchen
 	name = "kitchen Cabinet"
@@ -20,42 +9,21 @@
 	..()
 	for(var/i = 0, i < 3, i++)
 		new /obj/item/weapon/reagent_containers/food/condiment/flour(src)
+	new /obj/item/weapon/reagent_containers/food/condiment/rice(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"
-
 
 /obj/structure/closet/secure_closet/freezer/meat/New()
 	..()
 	for(var/i = 0, i < 4, i++)
-		new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
-	return
-
-
-
+		new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src)
 /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"
-
 
 /obj/structure/closet/secure_closet/freezer/fridge/New()
 	..()
@@ -65,22 +33,12 @@
 		new /obj/item/weapon/reagent_containers/food/condiment/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"
 	desc = "This contains cold hard cash."
-	icon_state = "fridge1"
-	icon_closed = "fridge"
-	icon_locked = "fridge1"
-	icon_opened = "fridgeopen"
-	icon_broken = "fridgebroken"
-	icon_off = "fridge1"
 	req_access = list(access_heads_vault)
 
-
 /obj/structure/closet/secure_closet/freezer/money/New()
 	..()
 	for(var/i = 0, i < 3, i++)
@@ -89,4 +47,3 @@
 		new /obj/item/stack/spacecash/c500(src)
 	for(var/i = 0, i < 6, i++)
 		new /obj/item/stack/spacecash/c200(src)
-	return

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

@@ -1,31 +1,24 @@
 /obj/structure/closet/secure_closet/hydroponics
 	name = "botanist's locker"
 	req_access = list(access_hydroponics)
-	icon_state = "hydrosecure1"
-	icon_closed = "hydrosecure"
-	icon_locked = "hydrosecure1"
-	icon_opened = "hydrosecureopen"
-	icon_broken = "hydrosecurebroken"
-	icon_off = "hydrosecureoff"
+	icon_state = "hydro"
 
-
-	New()
-		..()
-		new /obj/item/clothing/suit/hooded/wintercoat/hydro(src)
-		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/portaseeder(src)
-		new /obj/item/clothing/under/rank/hydroponics(src)
-		new /obj/item/device/analyzer/plant_analyzer(src)
-		new /obj/item/device/radio/headset/headset_srv(src)
-		new /obj/item/clothing/mask/bandana(src)
-		new /obj/item/weapon/minihoe(src)
-		new /obj/item/weapon/hatchet(src)
-		new /obj/item/weapon/storage/backpack/botany(src)
-		new /obj/item/weapon/storage/backpack/botany(src)
-		new /obj/item/weapon/storage/backpack/satchel_hyd(src)
-		new /obj/item/weapon/storage/backpack/satchel_hyd(src)
-		return
+/obj/structure/closet/secure_closet/hydroponics/New()
+	..()
+	new /obj/item/clothing/suit/hooded/wintercoat/hydro(src)
+	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/portaseeder(src)
+	new /obj/item/clothing/under/rank/hydroponics(src)
+	new /obj/item/device/analyzer/plant_analyzer(src)
+	new /obj/item/device/radio/headset/headset_srv(src)
+	new /obj/item/clothing/mask/bandana(src)
+	new /obj/item/weapon/minihoe(src)
+	new /obj/item/weapon/hatchet(src)
+	new /obj/item/weapon/storage/backpack/botany(src)
+	new /obj/item/weapon/storage/backpack/botany(src)
+	new /obj/item/weapon/storage/backpack/satchel_hyd(src)
+	new /obj/item/weapon/storage/backpack/satchel_hyd(src)

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

@@ -1,15 +1,9 @@
 /obj/structure/closet/secure_closet/medical1
 	name = "medicine closet"
 	desc = "Filled to the brim with medical junk."
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medicaloff"
+	icon_state = "med"
 	req_access = list(access_medical)
 
-
 /obj/structure/closet/secure_closet/medical1/New()
 	..()
 	new /obj/item/weapon/reagent_containers/glass/beaker(src)
@@ -28,22 +22,12 @@
 	new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src)
 	new /obj/item/weapon/storage/box/rxglasses(src)
-	return
-
-
 
 /obj/structure/closet/secure_closet/medical2
 	name = "anesthetic closet"
 	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)
 
-
 /obj/structure/closet/secure_closet/medical2/New()
 	..()
 	new /obj/item/weapon/tank/internals/anesthetic(src)
@@ -52,19 +36,11 @@
 	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"
+	icon_state = "med_secure"
 
 /obj/structure/closet/secure_closet/medical3/New()
 	..()
@@ -83,17 +59,10 @@
 	new /obj/item/clothing/glasses/hud/health(src)
 	return
 
-
-
 /obj/structure/closet/secure_closet/CMO
 	name = "\proper chief medical officer's locker"
 	req_access = list(access_cmo)
-	icon_state = "cmosecure1"
-	icon_closed = "cmosecure"
-	icon_locked = "cmosecure1"
-	icon_opened = "cmosecureopen"
-	icon_broken = "cmosecurebroken"
-	icon_off = "cmosecureoff"
+	icon_state = "cmo"
 
 /obj/structure/closet/secure_closet/CMO/New()
 	..()
@@ -116,65 +85,24 @@
 	new /obj/item/device/flash/handheld(src)
 	new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
 	new /obj/item/cybernetic_implant/eyes/hud/medical(src)
-	return
-
-
 
 /obj/structure/closet/secure_closet/animal
 	name = "animal control"
 	req_access = list(access_surgery)
 
-
 /obj/structure/closet/secure_closet/animal/New()
 	..()
 	new /obj/item/device/assembly/signaler(src)
 	new /obj/item/device/electropack(src)
 	new /obj/item/device/electropack(src)
 	new /obj/item/device/electropack(src)
-	return
-
-
 
 /obj/structure/closet/secure_closet/chemical
 	name = "chemical closet"
 	desc = "Store dangerous chemicals in here."
-	icon_state = "chemical1"
-	icon_closed = "chemical"
-	icon_locked = "chemical1"
-	icon_opened = "medicalopen"
-	icon_broken = "chemicalbroken"
-	icon_off = "chemicaloff"
-	req_access = list(access_chemistry)
-
+	icon_door = "chemical"
 
 /obj/structure/closet/secure_closet/chemical/New()
 	..()
 	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/misc.dm

@@ -2,12 +2,7 @@
 	name = "commander's closet"
 	desc = "Emergency Response Team equipment locker."
 	req_access = list(access_cent_captain)
-	icon_state = "capsecure1"
-	icon_closed = "capsecure"
-	icon_locked = "capsecure1"
-	icon_opened = "capsecureopen"
-	icon_broken = "capsecurebroken"
-	icon_off = "capsecureoff"
+	icon_state = "cap"
 
 /obj/structure/closet/secure_closet/ertCom/New()
 	..()
@@ -24,18 +19,12 @@
 		new /obj/item/ammo_box/a357(src)
 		new /obj/item/ammo_box/a357(src)
 		new /obj/item/weapon/gun/projectile/revolver/mateba(src)
-	return
 
 /obj/structure/closet/secure_closet/ertSec
 	name = "security closet"
 	desc = "Emergency Response Team equipment locker."
 	req_access = list(access_cent_specops)
-	icon_state = "hossecure1"
-	icon_closed = "hossecure"
-	icon_locked = "hossecure1"
-	icon_opened = "hossecureopen"
-	icon_broken = "hossecurebroken"
-	icon_off = "hossecureoff"
+	icon_state = "hos"
 
 /obj/structure/closet/secure_closet/ertSec/New()
 	..()
@@ -45,18 +34,12 @@
 	new /obj/item/weapon/storage/box/handcuffs(src)
 	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/weapon/shield/riot/tele(src)
-	return
 
 /obj/structure/closet/secure_closet/ertMed
 	name = "medical closet"
 	desc = "Emergency Response Team equipment locker."
 	req_access = list(access_cent_medical)
-	icon_state = "cmosecure1"
-	icon_closed = "cmosecure"
-	icon_locked = "cmosecure1"
-	icon_opened = "cmosecureopen"
-	icon_broken = "cmosecurebroken"
-	icon_off = "cmosecureoff"
+	icon_state = "cmo"
 
 /obj/structure/closet/secure_closet/ertMed/New()
 	..()
@@ -68,18 +51,12 @@
 	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/weapon/defibrillator/compact/combat(src)
 	new /obj/machinery/bot/medbot(src)
-	return
 
 /obj/structure/closet/secure_closet/ertEngi
 	name = "engineer closet"
 	desc = "Emergency Response Team equipment locker."
 	req_access = list(access_cent_storage)
-	icon_state = "securece1"
-	icon_closed = "securece"
-	icon_locked = "securece1"
-	icon_opened = "secureceopen"
-	icon_broken = "securecebroken"
-	icon_off = "secureceoff"
+	icon_state = "ce"
 
 /obj/structure/closet/secure_closet/ertEngi/New()
 	..()
@@ -92,4 +69,3 @@
 	new /obj/item/weapon/rcd_ammo/large(src)
 	new /obj/item/weapon/rcd_ammo/large(src)
 	new /obj/item/weapon/rcd_ammo/large(src)
-	return

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

@@ -13,8 +13,6 @@
 	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"
@@ -24,36 +22,15 @@
 	contents.Cut()
 	new /obj/item/clothing/under/color/white( src )
 	new /obj/item/clothing/shoes/sneakers/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
+	icon_state = "cabinet"
 
 /obj/structure/closet/secure_closet/personal/cabinet/New()
 	..()
 	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/W as obj, mob/user as mob, params)
 
@@ -67,8 +44,7 @@
 			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
+				update_icon()
 
 				if(!src.registered_name)
 					src.registered_name = I.registered_name

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

@@ -1,12 +1,7 @@
 /obj/structure/closet/secure_closet/scientist
 	name = "scientist's locker"
 	req_access = list(access_tox_storage)
-	icon_state = "secureres1"
-	icon_closed = "secureres"
-	icon_locked = "secureres1"
-	icon_opened = "secureresopen"
-	icon_broken = "secureresbroken"
-	icon_off = "secureresoff"
+	icon_state = "science"
 
 /obj/structure/closet/secure_closet/scientist/New()
 	..()
@@ -21,19 +16,11 @@
 	new /obj/item/weapon/storage/backpack/science(src)
 	new /obj/item/weapon/storage/backpack/satchel_tox(src)
 	new /obj/item/weapon/storage/backpack/satchel_tox(src)
-	return
-
-
 
 /obj/structure/closet/secure_closet/RD
 	name = "\proper research director's locker"
 	req_access = list(access_rd)
-	icon_state = "rdsecure1"
-	icon_closed = "rdsecure"
-	icon_locked = "rdsecure1"
-	icon_opened = "rdsecureopen"
-	icon_broken = "rdsecurebroken"
-	icon_off = "rdsecureoff"
+	icon_state = "rd"
 
 /obj/structure/closet/secure_closet/RD/New()
 	..()
@@ -53,4 +40,3 @@
 	new /obj/item/clothing/suit/armor/reactive(src)
 	new /obj/item/device/flash/handheld(src)
 	new /obj/item/device/laser_pointer(src)
-	return

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

@@ -1,19 +1,21 @@
 /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
 	locked = 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)
+	icon_state = "secure"
 	health = 200
 
+/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)
+	..()
+	if(!opened)
+		if(!broken)
+			if(locked)
+				overlays += "locked"
+			else
+				overlays += "unlocked"
+		else
+			overlays += "off"
+
 /obj/structure/closet/secure_closet/examine(mob/user)
 	..()
 	if(broken || opened || !ishuman(user))
@@ -41,12 +43,6 @@
 		return 0
 	return 1
 
-/obj/structure/closet/secure_closet/close()
-	..()
-	if(broken)
-		icon_state = src.icon_off
-	return 1
-
 /obj/structure/closet/secure_closet/emp_act(severity)
 	for(var/obj/O in src)
 		O.emp_act(severity)
@@ -69,10 +65,7 @@
 		for(var/mob/O in viewers(user, 3))
 			if((O.client && !( O.eye_blind )))
 				O << "<span class='notice'>[user] has [locked ? null : "un"]locked the locker.</span>"
-		if(src.locked)
-			src.icon_state = src.icon_locked
-		else
-			src.icon_state = src.icon_closed
+		update_icon()
 	else
 		user << "<span class='notice'>Access Denied</span>"
 
@@ -94,11 +87,14 @@
 	if(!broken)
 		broken = 1
 		locked = 0
-		desc = "It appears to be broken."
-		icon_state = icon_off
-		flick(icon_broken, src)
+		desc += "It appears to be broken."
+		update_icon()
+
 		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)
+		overlays += "sparking"
+		spawn(4) //overlays don't support flick so we have to cheat
+		update_icon()
 
 /obj/structure/closet/secure_closet/relaymove(mob/user as mob)
 	if(user.stat || !isturf(src.loc))
@@ -121,16 +117,4 @@
 		return src.attackby(null, user)
 
 /obj/structure/closet/secure_closet/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
-/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
+	return src.attack_hand(user)

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

@@ -1,12 +1,7 @@
 /obj/structure/closet/secure_closet/captains
 	name = "\proper captain's locker"
 	req_access = list(access_captain)
-	icon_state = "capsecure1"
-	icon_closed = "capsecure"
-	icon_locked = "capsecure1"
-	icon_opened = "capsecureopen"
-	icon_broken = "capsecurebroken"
-	icon_off = "capsecureoff"
+	icon_state = "cap"
 
 /obj/structure/closet/secure_closet/captains/New()
 	..()
@@ -27,17 +22,11 @@
 	new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
 	new /obj/item/clothing/gloves/color/captain(src)
 	new /obj/item/weapon/gun/energy/gun(src)
-	return
 
 /obj/structure/closet/secure_closet/hop
 	name = "\proper head of personnel's locker"
 	req_access = list(access_hop)
-	icon_state = "hopsecure1"
-	icon_closed = "hopsecure"
-	icon_locked = "hopsecure1"
-	icon_opened = "hopsecureopen"
-	icon_broken = "hopsecurebroken"
-	icon_off = "hopsecureoff"
+	icon_state = "hop"
 
 /obj/structure/closet/secure_closet/hop/New()
 	..()
@@ -56,19 +45,11 @@
 	new /obj/item/weapon/mining_voucher(src)
 	new /obj/item/weapon/gun/energy/gun(src)
 	new /obj/item/clothing/tie/petcollar(src)
-	return
-
-
 
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"
 	req_access = list(access_hos)
-	icon_state = "hossecure1"
-	icon_closed = "hossecure"
-	icon_locked = "hossecure1"
-	icon_opened = "hossecureopen"
-	icon_broken = "hossecurebroken"
-	icon_off = "hossecureoff"
+	icon_state = "hos"
 
 /obj/structure/closet/secure_closet/hos/New()
 	..()
@@ -91,19 +72,11 @@
 	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/weapon/storage/belt/security/full(src)
 	new /obj/item/weapon/gun/energy/gun/hos(src)
-	return
-
 
 /obj/structure/closet/secure_closet/warden
 	name = "\proper warden's locker"
 	req_access = list(access_armory)
-	icon_state = "wardensecure1"
-	icon_closed = "wardensecure"
-	icon_locked = "wardensecure1"
-	icon_opened = "wardensecureopen"
-	icon_broken = "wardensecurebroken"
-	icon_off = "wardensecureoff"
-
+	icon_state = "warden"
 
 /obj/structure/closet/secure_closet/warden/New()
 	..()
@@ -122,19 +95,11 @@
 	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/weapon/storage/belt/security/full(src)
 	new /obj/item/weapon/gun/energy/gun/advtaser(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"
+	icon_state = "sec"
 
 /obj/structure/closet/secure_closet/security/New()
 	..()
@@ -148,58 +113,45 @@
 	new /obj/item/weapon/grenade/flashbang(src)
 	new /obj/item/weapon/storage/belt/security/full(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
-	return
-
 
 /obj/structure/closet/secure_closet/security/sec
 
 /obj/structure/closet/secure_closet/security/sec/New()
-	new /obj/item/weapon/melee/baton/loaded(src)
 	..()
-	return
+	new /obj/item/weapon/melee/baton/loaded(src)
 
 /obj/structure/closet/secure_closet/security/cargo
 
 /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
 
 /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
 
 /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
 
 /obj/structure/closet/secure_closet/security/med/New()
+	..()
 	new /obj/item/clothing/tie/armband/medblue(src)
 	new /obj/item/device/encryptionkey/headset_med(src)
-	..()
-	return
-
 
 /obj/structure/closet/secure_closet/detective
 	name = "\proper detective's cabinet"
 	req_access = list(access_forensics_lockers)
-	icon_state = "cabinetdetective_locked"
-	icon_closed = "cabinetdetective"
-	icon_locked = "cabinetdetective_locked"
-	icon_opened = "cabinetdetective_open"
-	icon_broken = "cabinetdetective_broken"
-	icon_off = "cabinetdetective_broken"
+	icon_state = "cabinet"
 
 /obj/structure/closet/secure_closet/detective/New()
 	..()
@@ -221,19 +173,6 @@
 	new /obj/item/ammo_box/c38(src)
 	new /obj/item/weapon/storage/belt/holster(src)
 	new /obj/item/weapon/gun/projectile/revolver/detective(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"
@@ -247,7 +186,6 @@
 	new /obj/item/weapon/reagent_containers/syringe/lethal/choral(src)
 	new /obj/item/weapon/reagent_containers/syringe/lethal/choral(src)
 
-
 /obj/structure/closet/secure_closet/brig
 	name = "brig locker"
 	req_access = list(access_brig)
@@ -255,11 +193,9 @@
 	var/id = null
 
 /obj/structure/closet/secure_closet/brig/New()
+	..()
 	new /obj/item/clothing/under/rank/prisoner( src )
 	new /obj/item/clothing/shoes/sneakers/orange( src )
-	return
-
-
 
 /obj/structure/closet/secure_closet/courtroom
 	name = "courtroom locker"
@@ -275,30 +211,3 @@
 	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

@@ -2,8 +2,6 @@
 	name = "armory closet"
 	desc = "Why is this here?"
 	icon_state = "syndicate"
-	icon_closed = "syndicate"
-	icon_opened = "syndicateopen"
 
 /obj/structure/closet/syndicate/personal
 	desc = "It's a personal storage unit for operative gear."
@@ -107,6 +105,8 @@
 	desc = "It's an emergency storage closet for repairs."
 
 /obj/structure/closet/syndicate/resources/everything/New()
+	..()
+	contents = list()
 	var/list/resources = list(
 	/obj/item/stack/sheet/metal,
 	/obj/item/stack/sheet/glass,

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

@@ -16,8 +16,6 @@
 	name = "emergency closet"
 	desc = "It's a storage unit for emergency breath masks and O2 tanks."
 	icon_state = "emergency"
-	icon_closed = "emergency"
-	icon_opened = "emergencyopen"
 
 /obj/structure/closet/emcloset/New()
 	..()
@@ -53,19 +51,13 @@
 			new /obj/structure/closet/firecloset(src.loc)
 			qdel(src)*/
 
-/obj/structure/closet/emcloset/legacy/New()
-	new /obj/item/weapon/tank/internals/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"
+	icon_state = "fire"
 
 /obj/structure/closet/firecloset/New()
 	..()
@@ -87,24 +79,17 @@
 	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"
+	icon_state = "eng"
+	icon_door = "eng_tool"
 
 /obj/structure/closet/toolcloset/New()
+	..()
 	if(prob(40))
 		new /obj/item/clothing/suit/hazardvest(src)
 	if(prob(70))
@@ -143,9 +128,8 @@
 /obj/structure/closet/radiation
 	name = "radiation suit closet"
 	desc = "It's a storage unit for rad-protective suits."
-	icon_state = "radsuitcloset"
-	icon_opened = "toolclosetopen"
-	icon_closed = "radsuitcloset"
+	icon_state = "eng"
+	icon_door = "eng_rad"
 
 /obj/structure/closet/radiation/New()
 	..()
@@ -158,9 +142,7 @@
 /obj/structure/closet/bombcloset
 	name = "\improper EOD closet"
 	desc = "It's a storage unit for explosion-protective suits."
-	icon_state = "bombsuit"
-	icon_closed = "bombsuit"
-	icon_opened = "bombsuitopen"
+	icon_state = "bomb"
 
 /obj/structure/closet/bombcloset/New()
 	..()
@@ -173,9 +155,7 @@
 /obj/structure/closet/bombclosetsecurity
 	name = "\improper EOD closet"
 	desc = "It's a storage unit for explosion-protective suits."
-	icon_state = "bombsuitsec"
-	icon_closed = "bombsuitsec"
-	icon_opened = "bombsuitsecopen"
+	icon_state = "bomb"
 
 /obj/structure/closet/bombclosetsecurity/New()
 	..()
@@ -184,38 +164,6 @@
 	new /obj/item/clothing/shoes/sneakers/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
-
-/*
- * 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
-
 /*
  * Ammunition
  */
@@ -232,4 +180,3 @@
 	new /obj/item/ammo_casing/shotgun/beanbag(src)
 	new /obj/item/ammo_casing/shotgun/beanbag(src)
 	new /obj/item/ammo_casing/shotgun/beanbag(src)
-

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

@@ -1,10 +1,10 @@
 /obj/structure/closet/wardrobe
 	name = "wardrobe"
 	desc = "It's a storage unit for standard-issue Nanotrasen attire."
-	icon_state = "blue"
-	icon_closed = "blue"
+	icon_door = "blue"
 
 /obj/structure/closet/wardrobe/New()
+	..()
 	new /obj/item/clothing/under/color/blue(src)
 	new /obj/item/clothing/under/color/blue(src)
 	new /obj/item/clothing/under/color/blue(src)
@@ -16,10 +16,10 @@
 
 /obj/structure/closet/wardrobe/red
 	name = "security wardrobe"
-	icon_state = "red"
-	icon_closed = "red"
+	icon_door = "red"
 
 /obj/structure/closet/wardrobe/red/New()
+	..()
 	new /obj/item/weapon/storage/backpack/security(src)
 	new /obj/item/weapon/storage/backpack/satchel_sec(src)
 	new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
@@ -42,10 +42,10 @@
 
 /obj/structure/closet/wardrobe/pink
 	name = "pink wardrobe"
-	icon_state = "pink"
-	icon_closed = "pink"
+	icon_door = "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)
@@ -56,10 +56,10 @@
 
 /obj/structure/closet/wardrobe/black
 	name = "black wardrobe"
-	icon_state = "black"
-	icon_closed = "black"
+	icon_door = "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)
@@ -84,10 +84,10 @@
 /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"
+	icon_door = "black"
 
 /obj/structure/closet/wardrobe/chaplain_black/New()
+	..()
 	new /obj/item/clothing/under/rank/chaplain(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/clothing/suit/nun(src)
@@ -102,10 +102,10 @@
 
 /obj/structure/closet/wardrobe/green
 	name = "green wardrobe"
-	icon_state = "green"
-	icon_closed = "green"
+	icon_door = "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)
@@ -120,10 +120,10 @@
 /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"
+	icon_door = "orange"
 
 /obj/structure/closet/wardrobe/orange/New()
+	..()
 	new /obj/item/clothing/under/rank/prisoner(src)
 	new /obj/item/clothing/under/rank/prisoner(src)
 	new /obj/item/clothing/under/rank/prisoner(src)
@@ -135,10 +135,10 @@
 
 /obj/structure/closet/wardrobe/yellow
 	name = "yellow wardrobe"
-	icon_state = "yellow"
-	icon_closed = "yellow"
+	icon_door = "yellow"
 
 /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)
@@ -152,10 +152,10 @@
 
 /obj/structure/closet/wardrobe/atmospherics_yellow
 	name = "atmospherics wardrobe"
-	icon_state = "atmos"
-	icon_closed = "atmos"
+	icon_door = "atmos"
 
 /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)
@@ -171,10 +171,10 @@
 
 /obj/structure/closet/wardrobe/engineering_yellow
 	name = "engineering wardrobe"
-	icon_state = "yellow"
-	icon_closed = "yellow"
+	icon_door = "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)
@@ -186,10 +186,10 @@
 
 /obj/structure/closet/wardrobe/white
 	name = "white wardrobe"
-	icon_state = "white"
-	icon_closed = "white"
+	icon_door = "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)
@@ -205,6 +205,7 @@
 	name = "medical doctor's wardrobe"
 
 /obj/structure/closet/wardrobe/white/medical/New()
+	..()
 	new /obj/item/clothing/under/rank/nursesuit (src)
 	new /obj/item/clothing/head/nursehat (src)
 	new /obj/item/clothing/under/rank/medical/blue(src)
@@ -223,10 +224,10 @@
 
 /obj/structure/closet/wardrobe/pjs
 	name = "pajama wardrobe"
-	icon_state = "white"
-	icon_closed = "white"
+	icon_door = "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)
@@ -240,10 +241,10 @@
 
 /obj/structure/closet/wardrobe/toxins_white
 	name = "toxins wardrobe"
-	icon_state = "white"
-	icon_closed = "white"
+	icon_door = "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)
@@ -258,10 +259,10 @@
 
 /obj/structure/closet/wardrobe/robotics_black
 	name = "robotics wardrobe"
-	icon_state = "black"
-	icon_closed = "black"
+	icon_door = "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/toggle/labcoat(src)
@@ -281,10 +282,10 @@
 
 /obj/structure/closet/wardrobe/chemistry_white
 	name = "chemistry wardrobe"
-	icon_state = "white"
-	icon_closed = "white"
+	icon_door = "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/sneakers/white(src)
@@ -300,10 +301,10 @@
 
 /obj/structure/closet/wardrobe/genetics_white
 	name = "genetics wardrobe"
-	icon_state = "white"
-	icon_closed = "white"
+	icon_door = "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/sneakers/white(src)
@@ -319,10 +320,10 @@
 
 /obj/structure/closet/wardrobe/virology_white
 	name = "virology wardrobe"
-	icon_state = "white"
-	icon_closed = "white"
+	icon_door = "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/sneakers/white(src)
@@ -340,10 +341,10 @@
 
 /obj/structure/closet/wardrobe/grey
 	name = "grey wardrobe"
-	icon_state = "grey"
-	icon_closed = "grey"
+	icon_door = "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)
@@ -370,10 +371,10 @@
 
 /obj/structure/closet/wardrobe/mixed
 	name = "mixed wardrobe"
-	icon_state = "mixed"
-	icon_closed = "mixed"
+	icon_door = "mixed"
 
 /obj/structure/closet/wardrobe/mixed/New()
+	..()
 	if(prob(40))
 		new /obj/item/clothing/suit/jacket(src)
 	if(prob(40))

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

@@ -3,82 +3,48 @@
 /obj/structure/closet/crate
 	name = "crate"
 	desc = "A rectangular steel crate."
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "crate"
-	density = 1
-	icon_opened = "crateopen"
-	icon_closed = "crate"
+	icon = 'icons/obj/crates.dmi'
+	var/icon_crate = "crate"
 	req_access = null
-	opened = 0
 //	mouse_drag_pointer = MOUSE_ACTIVE_POINTER	//???
 	var/rigged = 0
 	var/sound_effect_open = 'sound/machines/click.ogg'
 	var/sound_effect_close = 'sound/machines/click.ogg'
 
+/obj/structure/closet/crate/New()
+	..()
+	update_icon()
+
+/obj/structure/closet/crate/update_icon()
+	if(opened)
+		icon_state = "[icon_crate]open"
+	else
+		icon_state = icon_crate
+
 /obj/structure/closet/crate/internals
 	desc = "A internals crate."
 	name = "internals crate"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "o2crate"
-	density = 1
-	icon_opened = "o2crateopen"
-	icon_closed = "o2crate"
+	icon_crate = "o2crate"
 
 /obj/structure/closet/crate/trashcart
 	desc = "A heavy, metal trashcart with wheels."
 	name = "trash cart"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "trashcart"
-	density = 1
-	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 = 'icons/obj/storage.dmi'
-	icon_state = "crate"
-	density = 1
-	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 = 'icons/obj/storage.dmi'
-	icon_state = "crate"
-	density = 1
-	icon_opened = "crateopen"
-	icon_closed = "crate"
-*/
+	icon_crate = "trashcart"
 
 /obj/structure/closet/crate/medical
 	desc = "A medical crate."
 	name = "medical crate"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "medicalcrate"
-	density = 1
-	icon_opened = "medicalcrateopen"
-	icon_closed = "medicalcrate"
+	icon_crate = "medicalcrate"
 
 /obj/structure/closet/crate/rcd
 	desc = "A crate for the storage of the RCD."
 	name = "\improper RCD crate"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "crate"
-	density = 1
-	icon_opened = "crateopen"
-	icon_closed = "crate"
+	icon_crate = "crate"
 
 /obj/structure/closet/crate/freezer
 	desc = "A freezer."
 	name = "freezer"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "freezer"
-	density = 1
-	icon_opened = "freezeropen"
-	icon_closed = "freezer"
+	icon_crate = "freezer"
 	var/target_temp = T0C - 40
 	var/cooling_power = 40
 
@@ -104,119 +70,7 @@
 /obj/structure/closet/crate/radiation
 	desc = "A crate with a radiation sign on it."
 	name = "radioactive gear crate"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "radiation"
-	density = 1
-	icon_opened = "radiationopen"
-	icon_closed = "radiation"
-
-/obj/structure/closet/crate/secure/weapon
-	desc = "A secure weapons crate."
-	name = "weapons crate"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "weaponcrate"
-	density = 1
-	icon_opened = "weaponcrateopen"
-	icon_closed = "weaponcrate"
-
-/obj/structure/closet/crate/secure/plasma
-	desc = "A secure plasma crate."
-	name = "plasma crate"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "plasmacrate"
-	density = 1
-	icon_opened = "plasmacrateopen"
-	icon_closed = "plasmacrate"
-
-/obj/structure/closet/crate/secure/gear
-	desc = "A secure gear crate."
-	name = "gear crate"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "secgearcrate"
-	density = 1
-	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 = 'icons/obj/storage.dmi'
-	icon_state = "hydrosecurecrate"
-	density = 1
-	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/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"
-	broken = 0
-	locked = 1
-	health = 1000
-
-/obj/structure/closet/crate/hydroponics
-	name = "hydroponics crate"
-	desc = "All you need to destroy those pesky weeds and pests."
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "hydrocrate"
-	icon_opened = "hydrocrateopen"
-	icon_closed = "hydrocrate"
-	density = 1
-
-/obj/structure/closet/crate/hydroponics/prespawned
-	//This exists so the prespawned hydro crates spawn with their contents.
-/*	name = "Hydroponics crate"
-	desc = "All you need to destroy those pesky weeds and pests."
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "hydrocrate"
-	icon_opened = "hydrocrateopen"
-	icon_closed = "hydrocrate"
-	density = 1*/
-
-/obj/structure/closet/crate/hydroponics/prespawned/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/reagent_containers/spray/weedspray(src)
-//		new /obj/item/weapon/reagent_containers/spray/weedspray(src)
-//		new /obj/item/weapon/reagent_containers/spray/pestspray(src)
-//		new /obj/item/weapon/reagent_containers/spray/pestspray(src)
-//		new /obj/item/weapon/reagent_containers/spray/pestspray(src)
-
-
-/obj/structure/closet/crate/secure/New()
-	..()
-	if(locked)
-		overlays.Cut()
-		overlays += redlight
-	else
-		overlays.Cut()
-		overlays += greenlight
-
-/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)
+	icon_crate = "radiation"
 
 /obj/structure/closet/crate/radiation/New()
 	..()
@@ -229,22 +83,78 @@
 	new /obj/item/clothing/suit/radiation(src)
 	new /obj/item/clothing/head/radiation(src)
 
+/obj/structure/closet/crate/hydroponics
+	name = "hydroponics crate"
+	desc = "All you need to destroy those pesky weeds and pests."
+	icon = 'icons/obj/storage.dmi'
+	icon_crate = "hydrocrate"
+
+/obj/structure/closet/crate/hydroponics/prespawned
+
+/obj/structure/closet/crate/hydroponics/prespawned/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)
+
+/obj/structure/closet/crate/secure
+	desc = "A secure crate."
+	name = "secure crate"
+	icon_crate = "securecrate"
+	var/redlight = "securecrater"
+	var/greenlight = "securecrateg"
+	var/sparks = "securecratesparks"
+	var/emag = "securecrateemag"
+	locked = 1
+	health = 1000
+
+/obj/structure/closet/crate/secure/weapon
+	desc = "A secure weapons crate."
+	name = "weapons crate"
+	icon_crate = "weaponcrate"
+
+/obj/structure/closet/crate/secure/plasma
+	desc = "A secure plasma crate."
+	name = "plasma crate"
+	icon_crate = "plasmacrate"
+
+/obj/structure/closet/crate/secure/gear
+	desc = "A secure gear crate."
+	name = "gear crate"
+	icon_crate = "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_crate = "hydrosecurecrate"
+
+/obj/structure/closet/crate/secure/New()
+	..()
+	overlays.Cut()
+	if(locked)
+		overlays += redlight
+	else
+		overlays += greenlight
+
+/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/open()
 	playsound(src.loc, sound_effect_open, 15, 1, -3)
-
 	dump_contents()
-
-	icon_state = icon_opened
 	src.opened = 1
+	update_icon()
 	return 1
 
 /obj/structure/closet/crate/close()
 	playsound(src.loc, sound_effect_close, 15, 1, -3)
-
 	take_contents()
-
-	icon_state = icon_closed
 	src.opened = 0
+	update_icon()
 	return 1
 
 /obj/structure/closet/crate/insert(var/atom/movable/AM, var/include_mobs = 0)

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

@@ -1,7 +1,7 @@
 /obj/structure/largecrate
 	name = "large crate"
 	desc = "A hefty wooden crate."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/crates.dmi'
 	icon_state = "densecrate"
 	density = 1
 

code/game/objects/structures/extinguisher.dm

@@ -1,7 +1,7 @@
 /obj/structure/extinguisher_cabinet
 	name = "extinguisher cabinet"
 	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
-	icon = 'icons/obj/closet.dmi'
+	icon = 'icons/obj/wallmounts.dmi'
 	icon_state = "extinguisher_closed"
 	anchored = 1
 	density = 0

code/game/objects/structures/guncase.dm

@@ -3,15 +3,19 @@
 	name = "gun locker"
 	desc = "A locker that holds guns."
 	icon = 'icons/obj/closet.dmi'
-	icon_state = "gcase-0-open"
+	icon_state = "shotguncase"
 	anchored = 0
 	density = 1
 	opacity = 0
-	var/case_type = "gcase"
+	var/case_type = null
 	var/gun_category = /obj/item/weapon/gun
 	var/open = 1
 	var/capacity = 4
 
+/obj/structure/guncase/New()
+	..()
+	update_icon()
+
 /obj/structure/guncase/initialize()
 	..()
 	for(var/obj/item/I in loc.contents)
@@ -22,7 +26,13 @@
 	update_icon()
 
 /obj/structure/guncase/update_icon()
-	icon_state = "[case_type]-[contents.len]-[open ? "open" : "closed"]"
+	overlays.Cut()
+	for(var/i = contents.len, i >= 1, i--)
+		overlays += image(icon = src.icon, icon_state = "[case_type]", pixel_x = 4 * (i -1) )
+	if(open)
+		overlays += "[icon_state]_open"
+	else
+		overlays += "[icon_state]_door"
 
 /obj/structure/guncase/attackby(obj/item/I, mob/user, params)
 	if(isrobot(user) || isalien(user))
@@ -75,12 +85,12 @@
 /obj/structure/guncase/shotgun
 	name = "shotgun locker"
 	desc = "A locker that holds shotguns."
-	case_type = "gcase"
+	case_type = "shotgun"
 	gun_category = /obj/item/weapon/gun/projectile/shotgun
 
 /obj/structure/guncase/ecase
 	name = "energy gun locker"
 	desc = "A locker that holds energy guns."
-	icon_state = "ecase-0-open"
-	case_type = "ecase"
+	icon_state = "ecase"
+	case_type = "egun"
 	gun_category = /obj/item/weapon/gun/energy/gun

code/game/objects/structures/kitchen_spike.dm

@@ -91,11 +91,11 @@
 				user << "You remove the hide from the monkey!"
 			else if(src.meat > 1)
 				src.meat--
-				new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src.loc )
+				new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src.loc )
 				usr << "You remove some meat from the monkey."
 			else if(src.meat == 1)
 				src.meat--
-				new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src.loc)
+				new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src.loc)
 				usr << "You remove the last piece of meat from the monkey!"
 				src.icon_state = "spike"
 				src.occupied = 0
@@ -106,11 +106,11 @@
 				user << "You remove the hide from the alien!"
 			else if(src.meat > 1)
 				src.meat--
-				new /obj/item/weapon/reagent_containers/food/snacks/meat/xeno(src.loc )
+				new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno(src.loc )
 				usr << "You remove some meat from the alien."
 			else if(src.meat == 1)
 				src.meat--
-				new /obj/item/weapon/reagent_containers/food/snacks/meat/xeno(src.loc)
+				new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno(src.loc)
 				usr << "You remove the last piece of meat from the alien!"
 				src.icon_state = "spike"
 				src.occupied = 0
@@ -121,11 +121,11 @@
 				user << "You remove the hide from the bear!"
 			else if(src.meat > 1)
 				src.meat--
-				new /obj/item/weapon/reagent_containers/food/snacks/meat/bear(src.loc )
+				new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear(src.loc )
 				usr << "You remove some meat from the bear."
 			else if(src.meat == 1)
 				src.meat--
-				new /obj/item/weapon/reagent_containers/food/snacks/meat/bear(src.loc)
+				new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear(src.loc)
 				usr << "You remove the last piece of meat from the bear!"
 				src.icon_state = "spike"
 				src.occupied = 0

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -60,8 +60,7 @@
 		M.pixel_x = initial(M.pixel_x)
 		M.pixel_y = initial(M.pixel_y)
 		if(M.lying)
-			var/lying_pixel_y_offset = -6
-			M.pixel_y += lying_pixel_y_offset
+			M.pixel_y = M.lying_pixel_offset
 		overlays.Cut()
 
 /obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -60,8 +60,7 @@
 	icon_state = "down"
 	anchored = 0
 
-
-/obj/structure/stool/bed/roller/post_buckle_mob(mob/M)
+/obj/structure/stool/bed/roller/post_buckle_mob(mob/living/M)
 	if(M == buckled_mob)
 		density = 1
 		icon_state = "up"
@@ -71,8 +70,7 @@
 		icon_state = "down"
 		M.pixel_y = initial(M.pixel_y)
 		if(M.lying)
-			var/lying_pixel_y_offset = -6
-			M.pixel_y += lying_pixel_y_offset
+			M.pixel_y = M.lying_pixel_offset
 
 
 /obj/item/roller