diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index e728ab8e50..0dc9b72be7 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -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 diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index a3f0d4bba8..9b0bef6aaa 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -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 diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 6d07fcc159..fe480ed574 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -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)