cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 02:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes hallucination shocks (#19361)

Browse Source
This commit is contained in:
Charlie
2022-10-12 11:09:55 -05:00
committed by GitHub
parent 431571f7b0
commit bc79020037
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -592,7 +592,7 @@
if(stat == CONSCIOUS)
to_chat(src, "<span class='notice'>You feel your heart beating again!</span>")
dna.species.spec_electrocute_act(src, shock_damage, source, siemens_coeff, flags = NONE)
dna.species.spec_electrocute_act(src, shock_damage, source, siemens_coeff, flags)
/mob/living/carbon/human/Topic(href, href_list)
if(!usr.stat && !HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) && !usr.restrained() && in_range(src, usr))
code/modules/mob/living/carbon/human/species/machine.dm
+2
View File
@@ -162,6 +162,8 @@
H.change_hair_color(new_color)
/datum/species/machine/spec_electrocute_act(mob/living/carbon/human/H, shock_damage, source, siemens_coeff, flags)
if(flags & SHOCK_ILLUSION)
return
H.adjustBrainLoss(shock_damage)
H.adjust_nutrition(shock_damage)