cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] fix a runtime in the keyloop (#9813)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-06 20:43:47 -07:00
committed by GitHub
parent 8822e9e9e1
commit 0144bf1e6e
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/turfs/simulated.dm
View File

@@ -196,7 +196,8 @@
B.blood_DNA = list() B.blood_DNA = list()
if(!B.blood_DNA[M.dna.unique_enzymes]) if(!B.blood_DNA[M.dna.unique_enzymes])
B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type 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 return 1 //we bloodied the floor
blood_splatter(src,M.get_blood(M.vessel),1) blood_splatter(src,M.get_blood(M.vessel),1)
return 1 //we bloodied the floor return 1 //we bloodied the floor

8
code/modules/clothing/spacesuits/rig/modules/protean.dm
View File

@@ -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() /obj/item/rig_module/protean/armor/process()
if(active) if(active)
var/mob/living/carbon/human/H = holder.wearer var/mob/living/carbon/human/H = holder.wearer
if(!H)
deactivate(1)
return
if(istype(H.species, /datum/species/protean)) if(istype(H.species, /datum/species/protean))
to_chat(H, span_warning("Your Protean modules do not function on yourself.")) to_chat(H, span_warning("Your Protean modules do not function on yourself."))
deactivate(1) deactivate(1)
@@ -185,7 +188,10 @@ These should come standard with the Protean rigsuit, unless you want them to wor
if(active) if(active)
var/mob/living/carbon/human/H = holder.wearer var/mob/living/carbon/human/H = holder.wearer
var/mob/living/P = holder?:myprotean 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.")) to_chat(H, span_warning("Your Protean modules do not function on yourself."))
deactivate() deactivate()
return return

9
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -579,10 +579,11 @@ emp_act
/mob/living/carbon/human/proc/bloody_hands(var/mob/living/source, var/amount = 2) /mob/living/carbon/human/proc/bloody_hands(var/mob/living/source, var/amount = 2)
if (gloves) if (istype(gloves, /obj/item/clothing/gloves))
gloves.add_blood(source) var/obj/item/clothing/gloves/gl = gloves
gloves:transfer_blood = amount gl.add_blood(source)
gloves:bloody_hands_mob = source gl.transfer_blood = amount
gl.bloody_hands_mob = source
else else
add_blood(source) add_blood(source)
bloody_hands = amount bloody_hands = amount