From 3cf93ebde5cd6afad86ab37e78c18041fe90e925 Mon Sep 17 00:00:00 2001
From: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
Date: Tue, 19 Sep 2023 17:05:37 -0500
Subject: [PATCH] cybernetic organs no longer permanently begin to shut down
(#2335)
## 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:
---
code/modules/surgery/organs/heart.dm | 6 ------
code/modules/surgery/organs/liver.dm | 2 --
code/modules/surgery/organs/lungs.dm | 2 --
code/modules/surgery/organs/stomach.dm | 2 --
4 files changed, 12 deletions(-)
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index dd6d8efc10659..cafcc0196b1bd 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -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("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!", \
- "You feel a terrible pain in your chest, as if your heart has stopped!")
- addtimer(CALLBACK(src, .proc/Restart), 10 SECONDS)
/obj/item/organ/heart/cybernetic/on_life()
. = ..()
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index d8e10731da301..b2812d9419750 100644
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -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'
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index fa928c1e20538..fc5de4be30496 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -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
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 615428d962b57..10cc049eb8069 100644
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -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