Skip to content

Commit

Permalink
cybernetic organs no longer permanently begin to shut down (#2335)
Browse files Browse the repository at this point in the history
## About The Pull Request

Removes the chance of an EMP effect shutting down cybernetic organs
based on its intensity aka rng

## Why It's Good For The Game

I would prefer to not force IPCs to have to ahelp for revival if they
get hit by one loose ion (gross)

## Changelog

:cl:
balance: Cybernetic organs can no longer require replacement due to EMPs
(they do not suffer permanent damage)
/:cl:
  • Loading branch information
Skrem7 authored Sep 19, 2023
1 parent 070c9e2 commit 3cf93eb
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 12 deletions.
6 changes: 0 additions & 6 deletions code/modules/surgery/organs/heart.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,6 @@
owner.Dizzy(10)
owner.losebreath += 10
severe_cooldown = world.time + 20 SECONDS
if(prob(emp_vulnerability/severity)) //Chance of permanent effects
organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
Stop()
owner.visible_message("<span class='danger'>[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!</span>", \
"<span class='userdanger'>You feel a terrible pain in your chest, as if your heart has stopped!</span>")
addtimer(CALLBACK(src, .proc/Restart), 10 SECONDS)

/obj/item/organ/heart/cybernetic/on_life()
. = ..()
Expand Down
2 changes: 0 additions & 2 deletions code/modules/surgery/organs/liver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@
if(world.time > severe_cooldown) //So we cant just spam emp to kill people.
owner.adjustToxLoss(10)
severe_cooldown = world.time + 10 SECONDS
if(prob(emp_vulnerability/severity)) //Chance of permanent effects
organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.

/obj/item/organ/liver/cybernetic/upgraded/ipc
icon = 'icons/obj/surgery.dmi'
Expand Down
2 changes: 0 additions & 2 deletions code/modules/surgery/organs/lungs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,6 @@
if(world.time > severe_cooldown) //So we cant just spam emp to kill people.
owner.losebreath += 20
severe_cooldown = world.time + 30 SECONDS
if(prob(emp_vulnerability/severity)) //Chance of permanent effects
organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.

#undef PP
#undef PP_MOLES
2 changes: 0 additions & 2 deletions code/modules/surgery/organs/stomach.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,6 @@
if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
owner.vomit(stun = FALSE)
COOLDOWN_START(src, severe_cooldown, 10 SECONDS)
if(prob(emp_vulnerability/severity)) //Chance of permanent effects
organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.

//WS Begin - IPCs

Expand Down

0 comments on commit 3cf93eb

Please sign in to comment.