Merge branch 'pr/21'

2019-07-29 22:57:40 +01:00
parent 5e5f2fea54 3d597ea508
commit fbbc4d8589
56 changed files with 930 additions and 367 deletions
@@ -497,6 +497,6 @@

 /obj/item/organ/lungs/slime/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
 	. = ..()
-	if (breath.gases[/datum/gas/plasma])
+	if (breath && breath.gases[/datum/gas/plasma])
 		var/plasma_pp = breath.get_breath_partial_pressure(breath.gases[/datum/gas/plasma])
 		owner.blood_volume += (0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.