Merge pull request #6382 from Citadel-Station-13/upstream-merge-37119

[MIRROR] floor is lava no longer hurts silicons
2018-04-14 07:45:42 -05:00
parent 6b3a59b028 af7ab75acd
commit 385c9d9b22
1 changed files with 2 additions and 0 deletions
@@ -23,6 +23,8 @@


 /datum/weather/floor_is_lava/weather_act(mob/living/L)
+	if(issilicon(L))
+		return
 	for(var/obj/structure/O in L.loc)
 		if(O.density || (L in O.buckled_mobs && istype(O, /obj/structure/bed)))
 			return