mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] fix a runtime in the keyloop (#9813)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
8822e9e9e1
commit
0144bf1e6e
@@ -196,7 +196,8 @@
|
||||
B.blood_DNA = list()
|
||||
if(!B.blood_DNA[M.dna.unique_enzymes])
|
||||
B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
|
||||
B.viruses = M.viruses.Copy()
|
||||
if(M.viruses)
|
||||
B.viruses = M.viruses.Copy()
|
||||
return 1 //we bloodied the floor
|
||||
blood_splatter(src,M.get_blood(M.vessel),1)
|
||||
return 1 //we bloodied the floor
|
||||
|
||||
@@ -131,6 +131,9 @@ These should come standard with the Protean rigsuit, unless you want them to wor
|
||||
/obj/item/rig_module/protean/armor/process()
|
||||
if(active)
|
||||
var/mob/living/carbon/human/H = holder.wearer
|
||||
if(!H)
|
||||
deactivate(1)
|
||||
return
|
||||
if(istype(H.species, /datum/species/protean))
|
||||
to_chat(H, span_warning("Your Protean modules do not function on yourself."))
|
||||
deactivate(1)
|
||||
@@ -185,7 +188,10 @@ These should come standard with the Protean rigsuit, unless you want them to wor
|
||||
if(active)
|
||||
var/mob/living/carbon/human/H = holder.wearer
|
||||
var/mob/living/P = holder?:myprotean
|
||||
if((istype(H.species, /datum/species/protean)) || !H || !P)
|
||||
if(!H || !P)
|
||||
deactivate()
|
||||
return
|
||||
if(istype(H.species, /datum/species/protean))
|
||||
to_chat(H, span_warning("Your Protean modules do not function on yourself."))
|
||||
deactivate()
|
||||
return
|
||||
|
||||
@@ -579,10 +579,11 @@ emp_act
|
||||
|
||||
|
||||
/mob/living/carbon/human/proc/bloody_hands(var/mob/living/source, var/amount = 2)
|
||||
if (gloves)
|
||||
gloves.add_blood(source)
|
||||
gloves:transfer_blood = amount
|
||||
gloves:bloody_hands_mob = source
|
||||
if (istype(gloves, /obj/item/clothing/gloves))
|
||||
var/obj/item/clothing/gloves/gl = gloves
|
||||
gl.add_blood(source)
|
||||
gl.transfer_blood = amount
|
||||
gl.bloody_hands_mob = source
|
||||
else
|
||||
add_blood(source)
|
||||
bloody_hands = amount
|
||||
|
||||
Reference in New Issue
Block a user