Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hard electrocute act [Ballance testing needed] #35

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Hard electrocute act [Ballance testing needed] #35

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6a9736e
Update .gitattributes
MrCastmer Feb 29, 2024
9072537
Revert "Update .gitattributes"
MrCastmer Feb 29, 2024
3e796c9
one small issue - ZZZAP
MrCastmer Mar 16, 2024
64cd1fb
Merge branch 'master' into hard-electrocute-act-
MrCastmer Mar 27, 2024
dfe7b2d
Merge branch 'master' into hard-electrocute-act-
MrCastmer Mar 27, 2024
adfd587
Merge branch 'master' into hard-electrocute-act-
MrCastmer Apr 6, 2024
f0af690
Merge branch 'master' into hard-electrocute-act-
MrCastmer Apr 9, 2024
35717c0
Merge branch 'master' into hard-electrocute-act-
MrCastmer Apr 12, 2024
a83e220
Merge branch 'master' into hard-electrocute-act-
MrCastmer Apr 12, 2024
9d22ab7
Merge branch 'master' into hard-electrocute-act-
MrCastmer Apr 19, 2024
daf8755
Merge branch 'master' into hard-electrocute-act-
MrCastmer Apr 26, 2024
a723e32
Merge branch 'master' into hard-electrocute-act-
MrCastmer Apr 26, 2024
c5f50f1
Merge branch 'master' into hard-electrocute-act-
MrCastmer Jul 18, 2024
eb1d474
Merge branch 'master' into hard-electrocute-act-
MrCastmer Jul 18, 2024
db651f9
Merge branch 'master' into hard-electrocute-act-
MrCastmer Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions code/modules/mob/living/carbon/carbon_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
addtimer(CALLBACK(src, PROC_REF(secondary_shock), should_stun, stuntime - (2 SECONDS)), 2 SECONDS)

if(stat == DEAD && can_defib()) //yogs: ZZAPP
if(!illusion && (shock_damage * siemens_coeff >= 1) && prob(80))
if(!illusion && (shock_damage >= 1) && prob(80)) //dripstation fix, shock damage multiplies by siemens_coeff a bit higher
set_heartattack(FALSE)
adjustOxyLoss(-50)
adjustToxLoss(-50)
Expand All @@ -451,12 +451,15 @@
addtimer(CALLBACK(src, PROC_REF(supermatter_tesla_gib)), 4 SECONDS) //yogs end

if(undergoing_cardiac_arrest() && !illusion)
if(shock_damage * siemens_coeff >= 1 && prob(25))
if(shock_damage >= 1 && prob(25)) //dripstation fix, shock damage multiplies by siemens_coeff a bit higher
var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART)
heart.beating = TRUE
if(stat == CONSCIOUS)
to_chat(src, span_notice("You feel your heart beating again!"))

else if(stat != DEAD && can_heartattack() && shock_damage >= 1 && prob(shock_damage/5)) //dripstation edit: HARD ZZZZAP
set_heartattack(TRUE) //dripstation edit

if(override)
return override
else
Expand Down
Loading