diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 2dfd08199fd..6510f049dde 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -259,6 +259,8 @@ return spread_fire(AM) + + ..() // call parent because we moved behavior to parent // Get rank from ID, ID inside PDA, PDA, ID in wallet, etc. /mob/living/carbon/human/proc/get_authentification_rank(var/if_no_id = "No id", var/if_no_job = "No job") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b9945335f85..a472366b03e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -246,7 +246,7 @@ default behaviour is: // Called when something steps onto us. This allows for mulebots and vehicles to run things over. <3 /mob/living/Crossed(var/atom/movable/AM) // Transplanting this from /mob/living/carbon/human/Crossed() - if(AM.is_incorporeal()) + if(AM == src || AM.is_incorporeal()) // We're not going to run over ourselves or ghosts return if(istype(AM, /mob/living/bot/mulebot)) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index cc66674b878..49f9d5b6a45 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -360,7 +360,7 @@ proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large) drop.drips |= drips // If there's no data to copy, call it quits here. - if(!source) + if(!istype(source)) return B // Update appearance.