diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm
index 2e798900b1..b965860124 100755
--- a/code/WorkInProgress/SkyMarshal/wardrobes.dm
+++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm
@@ -5,7 +5,6 @@
 	icon_state = "wardrobe_sealed"
 	item_state = "wardrobe"
 	w_class = 4
-	layer = 2.9
 	var
 		descriptor = "various clothing"
 		seal_torn = 0
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 5655f73a1e..c36c0aae49 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -663,23 +663,23 @@
 	anchored = 1.0
 	var/list/buckled_mobs = list(  )
 
-/obj/stool/chair/comfy
+/obj/structure/stool/chair/comfy
 	name = "comfy chair"
 	desc = "It looks comfy."
 
-/obj/stool/chair/comfy/brown
+/obj/structure/stool/chair/comfy/brown
 	icon_state = "comfychair_brown"
 
-/obj/stool/chair/comfy/beige
+/obj/structure/stool/chair/comfy/beige
 	icon_state = "comfychair_beige"
 
-/obj/stool/chair/comfy/teal
+/obj/structure/stool/chair/comfy/teal
 	icon_state = "comfychair_teal"
 
-/obj/stool/chair/comfy/black
+/obj/structure/stool/chair/comfy/black
 	icon_state = "comfychair_black"
 
-/obj/stool/chair/comfy/lime
+/obj/structure/stool/chair/comfy/lime
 	icon_state = "comfychair_lime"
 
 /obj/structure/stool/chair/e_chair
diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm
index 6aa1243670..6f4d2bd0b6 100644
--- a/code/defines/obj/closet.dm
+++ b/code/defines/obj/closet.dm
@@ -13,7 +13,6 @@
 	var/health = 100	//Might be a bit much, dono can always change later	//Nerfed -Pete
 	var/lastbang	//
 	var/lasttry = 0
-	layer = 2.8
 
 /obj/structure/closet/detective
 	name = "Detective's Closet"
diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 2e5b0f5eb9..9eee3a4235 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -277,7 +277,7 @@
 /obj/item/weapon/storage/stma_kit
 	name = "Sterile Masks"
 	desc = "This box contains masks of +2 constitution." //I made it better.  --SkyMarshal
-	icon_state = "latex"
+	icon_state = "mask"
 	item_state = "syringe_kit"
 
 /obj/item/weapon/storage/trackimp_kit
diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
index d4e4ea682a..ee9041ad4a 100644
--- a/code/game/machinery/OpTable.dm
+++ b/code/game/machinery/OpTable.dm
@@ -17,7 +17,7 @@
 
 	New()
 		..()
-		if(id)
+		if(!isnull(id))
 			for(var/obj/machinery/computer/operating/O in world)
 				if(src.id == O.id)
 					src.computer = O
@@ -94,11 +94,13 @@
 		if(locate(/mob/living/carbon, src.loc))
 			var/mob/M = locate(/mob/living/carbon, src.loc)
 			if(M.resting)
-				src.victim = M
+				victim = M
 				if(updatesicon)
 					icon_state = "table2-active"
 				return 1
-		src.victim = null
+		if(victim)
+			victim.update_clothing()
+		victim = null
 		if(updatesicon)
 			icon_state = "table2-idle"
 		processing_objects.Remove(src)
@@ -124,6 +126,7 @@
 				if(updatesicon)
 					icon_state = "table2-active"
 				src.victim = M
+				M.update_clothing()
 				processing_objects.Add(src)
 				del(W)
 				return
@@ -133,7 +136,7 @@
 		return
 
 /obj/machinery/optable/portable
-	name = "mobile operating Table"
+	name = "mobile operating table"
 	desc = "Used for advanced medical procedures. Seems to be movable, neat."
 	icon = 'rollerbed.dmi'
 	icon_state = "up"
diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index 5226f4d9bb..f1bdbd15ed 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -20,12 +20,6 @@ mob/living/carbon/verb/give()
 		I = usr.r_hand
 	if(!I)
 		return
-	var/obj/item/weapon/T = new(usr.loc)
-	if(!src.loc.Enter(T))
-		usr << "Can't reach him"
-		del(T)
-		return
-	del(T)
 	if(src.r_hand == null)
 		switch(alert(src,"[usr.name] wants to give you \a [I.name]?",,"Yes","No"))
 			if("Yes")
@@ -42,11 +36,13 @@ mob/living/carbon/verb/give()
 						usr.drop_item(I)
 						src.l_hand = I
 					else
+						src << "Your hands are full."
 						usr << "Their hands are full."
 						return
 				else
 					usr.drop_item(I)
 					src.r_hand = I
+				usr.client.screen -= I
 				I.loc = src
 				I.layer = 20
 				I.add_fingerprint(src)
@@ -71,11 +67,13 @@ mob/living/carbon/verb/give()
 						usr.drop_item(I)
 						src.r_hand = I
 					else
+						src << "Your hands are full."
 						usr << "Their hands are full."
 						return
 				else
 					usr.drop_item(I)
 					src.l_hand = I
+				usr.client.screen -= I
 				I.loc = src
 				I.layer = 20
 				I.add_fingerprint(src)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 63f9803b41..67b3c3f302 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1584,7 +1584,7 @@
 											return
 									message = text("\red <B>[] is trying to empty []'s pockets!!</B>", source, target)
 								if("CPR")
-									if (target.cpr_time >= world.time + 3)
+									if (target.cpr_time + 3 >= world.time)
 										//SN src = null
 										del(src)
 										return
@@ -2045,14 +2045,15 @@ It can still be worn/put on as normal.
 					target.handcuffed = item
 					item.loc = target
 		if("CPR")
-			if (target.cpr_time >= world.time + 30)
+			if (target.cpr_time + 30 >= world.time)
 				//SN src = null
 				del(src)
 				return
-			if ((target.health >= -99.0 && target.health < config.health_threshold_dead))
+			if ((target.health >= -99.0 && target.stat == 1))
 				target.cpr_time = world.time
 				var/suff = min(target.getOxyLoss(), 7)
 				target.oxyloss -= suff
+				target.losebreath = 0
 				target.updatehealth()
 				for(var/mob/O in viewers(source, null))
 					O.show_message(text("\red [] performs CPR on []!", source, target), 1)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 0fec1a769b..e32ed9eab1 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -118,17 +118,18 @@
 	proc
 		handle_health_updates()
 			// if the mob has enough health, she should slowly heal
-			if(health >= 0)
-				var/pr = 10
-				if(stat == 1) // sleeping means faster healing
-					pr += 5
-				if(prob(pr))
-					heal_organ_damage(1,1)
-					adjustToxLoss(-1)
-			else if(health < 0)
-				var/pr = 80
-				if(prob(pr))
-					adjustToxLoss(1)
+			if(stat != 2)
+				if(health >= 0)
+					var/pr = 10
+					if(stat == 1) // sleeping means faster healing
+						pr += 5
+					if(prob(pr))
+						heal_organ_damage(1,1)
+						adjustToxLoss(-1)
+				else if(health < 0)
+					var/pr = 50
+					if(prob(pr))
+						adjustToxLoss(1)
 
 		clamp_values()
 
@@ -275,23 +276,23 @@
 			var/datum/air_group/breath
 			// HACK NEED CHANGING LATER
 			if(health < config.health_threshold_dead)
+				losebreath++
 				isbreathing = 0
 				spawn emote("stopbreath")
 
 			if(holdbreath)
 				isbreathing = 0
-
-			if(isbreathing)
-				// are we running out of air in our lungs?
-				if(losebreath > 0)
-					// inaprovaline prevents the need to breathe for a while
-					if(reagents.has_reagent("inaprovaline"))
-						losebreath = 0
-					else
-						// we're running out of air, gasp for it!
-						if (prob(25)) //High chance of gasping for air
-							spawn emote("gasp")
-			else if(health >= 0)
+			if(losebreath > 0)
+				// inaprovaline prevents the need to breathe for a while
+				if(reagents.has_reagent("inaprovaline"))
+					losebreath = 0
+				else
+					losebreath--
+					// we're running out of air, gasp for it!
+					if (prob(25)) //High chance of gasping for air
+						spawn emote("gasp")
+					isbreathing = 0
+			else if(health >= 0 && !isbreathing)
 				if(holdbreath)
 					// we're simply holding our breath, see if we can hold it longer
 					if(health < 30)
@@ -457,6 +458,7 @@
 					else if(SA_pp > 0.01)	// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
 						if(prob(20))
 							spawn(0) emote(pick("giggle", "laugh"))
+					SA.moles = 0 //Hack to stop the damned surgeon from giggling.
 
 
 			if(breath.temperature > (T0C+66) && !(mutations & COLD_RESISTANCE)) // Hot air hurts :(
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 5c36584c43..50035fd760 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -85,16 +85,17 @@ var/global/list/uneatable = list(
 
 
 	process()
-		eat()
-		dissipate()
-		check_energy()
-		if(current_size >= 3)
-			move()
-			if(current_size <= 7)
-				pulse()
-				if(current_size >= 5)
-					if(prob(event_chance))//Chance for it to run a special event TODO:Come up with one or two more that fit
-						event()
+		spawn(0)
+			eat()
+			dissipate()
+			check_energy()
+			if(current_size >= 3)
+				move()
+				if(current_size <= 7)
+					pulse()
+					if(current_size >= 5)
+						if(prob(event_chance))//Chance for it to run a special event TODO:Come up with one or two more that fit
+							event()
 		return
 
 
@@ -442,12 +443,13 @@ var/global/list/uneatable = list(
 		consume_range = 3 //How many tiles out do we eat
 
 		process()
-			eat()
-			if(!target || prob(5))
-				pickcultist()
-			move()
-			if(prob(25))
-				mezzer()
+			spawn(0)
+				eat()
+				if(!target || prob(5))
+					pickcultist()
+				move()
+				if(prob(25))
+					mezzer()
 
 		consume(var/atom/A) //Has its own consume proc because it doesn't need energy and I don't want BoHs to explode it. --NEO
 			if(is_type_in_list(A, uneatable))
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index e2fb65761e..5d789cbaf3 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -7,7 +7,6 @@
 	name = "conveyor belt"
 	desc = "A conveyor belt."
 	anchored = 1
-	layer = 2.7
 	var/operating = 0	// 1 if running forward, -1 if backwards, 0 if off
 	var/operable = 1	// true if can operate (no broken segments in this belt run)
 	var/forwards		// this is the default (forward) direction, set by the map dir, can be 0
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 079a6c280a..ccae2e6688 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ