Committed for Sieve:

Fixed an error in door_assembly.dm regarding glass doors not getting sprites.

Cleaned up astroid floor code.
-Bombing astroid floors (sand) will now 'dig' up sand.

TK users no longer get shocked while bashing grilles using TK.
- Range check on grille shocking. Fixes Issue 419.

Added to the lighting checks for Plantmen. They should no longer starve on the shuttle. Fixes Issue 471.

Bombs now affect people inside lockers. Fixes issue 208.
- Modified Sieve's original change so that the contents of the locker get severity+1. Meaning a weaker severity meaning the locker offers some protection.

Vending machines and mass driver buttons now leave fingerprints. Fixing issue 542.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3800 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/closets.dm

@@ -20,9 +20,6 @@
 	for(var/obj/item/I in src)
 		I.loc = src.loc
 
-	for(var/obj/mecha/working/ripley/deathripley/I in src)
-		I.loc = src.loc
-
 	for(var/mob/M in src)
 		M.loc = src.loc
 		if(M.client)
@@ -57,9 +54,6 @@
 		if(!I.anchored)
 			I.loc = src
 
-	for(var/obj/mecha/working/ripley/deathripley/I in src.loc)
-		I.loc = src
-
 	for(var/mob/M in src.loc)
 		if(istype (M, /mob/dead/observer))
 			continue
@@ -89,21 +83,21 @@
 /obj/structure/closet/ex_act(severity)
 	switch(severity)
 		if(1)
-			for(var/atom/movable/A as mob|obj in src)
+			for(var/atom/movable/A as mob|obj in src)//pulls everything out of the locker and hits it with an explosion
 				A.loc = src.loc
-				ex_act(severity)
+				A.ex_act(severity++)
 			del(src)
 		if(2)
 			if(prob(50))
 				for (var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
-					ex_act(severity)
+					A.ex_act(severity++)
 				del(src)
 		if(3)
 			if(prob(5))
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
-					ex_act(severity)
+					A.ex_act(severity++)
 				del(src)
 
 /obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
@@ -125,6 +119,8 @@
 
 /obj/structure/closet/meteorhit(obj/O as obj)
 	if(O.icon_state == "flaming")
+		for(var/mob/M in src)
+			M.meteorhit(O)
 		src.dump_contents()
 		del(src)
 

code/game/objects/door_assembly.dm

@@ -364,7 +364,7 @@ obj/structure/door_assembly
 							src.mineral = "glass"
 							src.name = "Near finished Window Airlock Assembly"
 							src.airlock_type = /obj/machinery/door/airlock/glass
-							src.base_icon_state = "door_as_glass" //this will be applied to the icon_state with the correct state number at the proc's end.
+							src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end.
 					if(/obj/item/stack/sheet/gold)
 						if(G.amount>=2)
 							playsound(src.loc, 'Crowbar.ogg', 100, 1)

code/game/objects/grille.dm

@@ -199,6 +199,8 @@
 			return 0
 		if(!prob(prb))
 			return 0
+		if(!in_range(src, usr))//To prevent TK and mech users from getting shocked
+			return 0
 		var/turf/T = get_turf(src)
 		var/obj/structure/cable/C = T.get_cable_node()
 		if(C)