Merge remote-tracking branch 'ParadiseSS13/master' into toml-config

code/modules/surgery/organs/heart.dm

@@ -64,8 +64,9 @@
 
 /obj/item/organ/internal/heart/prepare_eat()
 	var/obj/S = ..()
-	S.icon_state = dead_icon
-	return S
+	if(S)
+		S.icon_state = dead_icon
+		return S
 
 /obj/item/organ/internal/heart/cursed
 	name = "cursed heart"

code/modules/surgery/organs/lungs.dm

@@ -304,8 +304,9 @@
 
 /obj/item/organ/internal/lungs/prepare_eat()
 	var/obj/S = ..()
-	S.reagents.add_reagent("salbutamol", 5)
-	return S
+	if(S)
+		S.reagents.add_reagent("salbutamol", 5)
+		return S
 
 /obj/item/organ/internal/lungs/plasmaman
 	name = "plasma filter"