Band-aids three runtimes (#4591)

* Runtime in dna_modifier.dm,330: Cannot read null.occupant

* Runtime in Chemistry-Reagents.dm,47: Cannot execute null.remove reagent().

* Runtime in blood.dm,182: Division by zero

* Compiled with the right map this time
This commit is contained in:
Atermonera
2018-01-20 13:28:51 -06:00
committed by Anewbe
parent 93b4df4517
commit 17accf2e28
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -327,7 +327,7 @@
*/
/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(user == connected.occupant || user.stat)
if(!connected || user == connected.occupant || user.stat)
return
// this is the data which will be sent to the ui
+1 -1
View File
@@ -141,7 +141,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
//Bleeding out
var/blood_max = 0
var/blood_loss_divisor = 30 //lower factor = more blood loss
var/blood_loss_divisor = 30.01 //lower factor = more blood loss
// Some species bleed out differently
blood_loss_divisor /= species.bloodloss_rate
+2 -1
View File
@@ -44,7 +44,8 @@
var/list/glass_special = null // null equivalent to list()
/datum/reagent/proc/remove_self(var/amount) // Shortcut
holder.remove_reagent(id, amount)
if(holder)
holder.remove_reagent(id, amount)
// This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing.
/datum/reagent/proc/touch_mob(var/mob/M, var/amount)