Fixes

2019-09-27 13:49:25 +01:00
parent b16e697201
commit b622ea4fd2
2 changed files with 5 additions and 3 deletions
@@ -386,11 +386,13 @@
 	if(stat != DEAD)
 		for(var/V in internal_organs)
 			var/obj/item/organ/O = V
-			O.on_life()
+			if(O)
+				O.on_life()
 	else
 		for(var/V in internal_organs)
 			var/obj/item/organ/O = V
-			O.on_death() //Needed so organs decay while inside the body.
+			if(O)
+				O.on_death() //Needed so organs decay while inside the body.

 /mob/living/carbon/handle_diseases()
 	for(var/thing in diseases)
@@ -185,7 +185,7 @@
 	M.become_blind("flashlight_eyes")


-/obj/item/organ/eyes/robotic/flashlight/Remove(var/mob/living/carbon/M, var/special = 0)
+/obj/item/organ/eyes/robotic/flashlight/Remove(var/mob/living/carbon/M, special = FALSE)
 	eye.on = FALSE
 	eye.update_brightness(M)
 	eye.forceMove(src)