cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework appendicitis: not event-based, not a disease (#60331)

Browse Source 
Adds a new trait that "simulates" a medium-like disease according to health HUDs.
Organs now control their own "status text" for health scanners, for all except the appendix, this is the same as before.
Appendicitis has a low chance of occuring on each life tick of an appendix, it is no longer a disease.
This commit is contained in:
coiax
2021-07-20 20:22:54 -03:00
committed by GitHub
parent ef9a42e9bf
commit 383dcc52bf
8 changed files with 83 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/traits.dm
+3
View File
@@ -507,6 +507,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Trait applied when the MMI component is added to an [/obj/item/integrated_circuit]
#define TRAIT_COMPONENT_MMI "component_mmi"
/// If present on a [/mob/living/carbon], will make them appear to have a medium level disease on health HUDs.
#define TRAIT_DISEASELIKE_SEVERITY_MEDIUM "diseaselike_severity_medium"
//Medical Categories for quirks
#define CAT_QUIRK_ALL 0
#define CAT_QUIRK_NOTES 1
code/datums/diseases/appendicitis.dm
-40
View File
@@ -1,40 +0,0 @@
/datum/disease/appendicitis
form = "Condition"
name = "Appendicitis"
max_stages = 3
cure_text = "Surgery"
agent = "Shitty Appendix"
viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 1
desc = "If left untreated the subject will become very weak, and may vomit often."
severity = DISEASE_SEVERITY_MEDIUM
disease_flags = CAN_CARRY|CAN_RESIST
spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS
visibility_flags = HIDDEN_PANDEMIC
required_organs = list(/obj/item/organ/appendix)
bypasses_immunity = TRUE // Immunity is based on not having an appendix; this isn't a virus
/datum/disease/appendicitis/stage_act(delta_time, times_fired)
. = ..()
if(!.)
return
switch(stage)
if(1)
if(DT_PROB(2.5, delta_time))
affected_mob.emote("cough")
if(2)
var/obj/item/organ/appendix/A = affected_mob.getorgan(/obj/item/organ/appendix)
if(A)
A.inflamed = 1
A.update_appearance()
if(DT_PROB(1.5, delta_time))
to_chat(affected_mob, span_warning("You feel a stabbing pain in your abdomen!"))
affected_mob.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 5)
affected_mob.Stun(rand(40, 60))
affected_mob.adjustToxLoss(1, FALSE)
if(3)
if(DT_PROB(0.5, delta_time))
affected_mob.vomit(95)
affected_mob.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 15)
code/game/data_huds.dm
+4
View File
@@ -95,6 +95,10 @@ Medical HUD! Basic mode needs suit sensors on.
/mob/living/carbon/proc/check_virus()
var/threat
var/severity
if(HAS_TRAIT(src, TRAIT_DISEASELIKE_SEVERITY_MEDIUM))
severity = DISEASE_SEVERITY_MEDIUM
threat = get_disease_severity_value(severity)
for(var/thing in diseases)
var/datum/disease/D = thing
if(!(D.visibility_flags & HIDDEN_SCANNER))
code/game/objects/items/devices/scanners.dm
+1 -11
View File
@@ -325,17 +325,7 @@ GENE SCANNER
<td style='width:12em;'><font color='#ff0000'><b>Status</b></font></td>"
for(var/obj/item/organ/organ in H.internal_organs)
var/status = ""
if(H.has_reagent(/datum/reagent/inverse/technetium))
if(organ.damage)
status = "<font color='#E42426'> organ is [round((organ.damage/organ.maxHealth)*100, 1)]% damaged.</font>"
else
if (organ.organ_flags & ORGAN_FAILING)
status = "<font color='#cc3333'>Non-Functional</font>"
else if (organ.damage > organ.high_threshold)
status = "<font color='#ff9933'>Severely Damaged</font>"
else if (organ.damage > organ.low_threshold)
status = "<font color='#ffcc33'>Mildly Damaged</font>"
var/status = organ.get_status_text()
if (status != "")
render = TRUE
toReport += "<tr><td><font color='#cc3333'>[organ.name]:</font></td>\
code/modules/events/spontaneous_appendicitis.dm
-34
View File
@@ -1,34 +0,0 @@
/datum/round_event_control/spontaneous_appendicitis
name = "Spontaneous Appendicitis"
typepath = /datum/round_event/spontaneous_appendicitis
weight = 20
max_occurrences = 4
earliest_start = 10 MINUTES
min_players = 5 // To make your chance of getting help a bit higher.
/datum/round_event/spontaneous_appendicitis
fakeable = FALSE
/datum/round_event/spontaneous_appendicitis/start()
for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list))
if(!H.client)
continue
if(H.stat == DEAD)
continue
if(!H.getorgan(/obj/item/organ/appendix)) //Don't give the disease to some who lacks it, only for it to be auto-cured
continue
if(!(H.mob_biotypes & MOB_ORGANIC)) //biotype sleeper bugs strike again, once again making appendicitis pick a target that can't take it
continue
if(H.z in SSmapping.levels_by_trait(ZTRAIT_CENTCOM))//not for admin/ooc stuff
continue
var/foundAlready = FALSE //don't infect someone that already has appendicitis
for(var/datum/disease/appendicitis/A in H.diseases)
foundAlready = TRUE
break
if(foundAlready)
continue
var/datum/disease/D = new /datum/disease/appendicitis()
H.ForceContractDisease(D, FALSE, TRUE)
announce_to_ghosts(H)
break
code/modules/surgery/organs/appendix.dm
+61 -15
View File
@@ -1,3 +1,7 @@
// A 10% chance that out of a group of 25 people, one person will get appendicitis in 1 hour.
#define APPENDICITIS_PROB 100 * (0.1 * (1 / 25) / 3600)
#define INFLAMATION_ADVANCEMENT_PROB 2
/obj/item/organ/appendix
name = "appendix"
icon_state = "appendix"
@@ -12,35 +16,77 @@
now_failing = "<span class='warning'>An explosion of pain erupts in your lower right abdomen!</span>"
now_fixed = "<span class='info'>The pain in your abdomen has subsided.</span>"
var/inflamed
var/inflamation_stage = 0
/obj/item/organ/appendix/update_name()
. = ..()
name = "[inflamed ? "inflamed " : null][initial(name)]"
name = "[inflamation_stage ? "inflamed " : null][initial(name)]"
/obj/item/organ/appendix/update_icon_state()
icon_state = "[base_icon_state][inflamed ? "inflamed" : ""]"
icon_state = "[base_icon_state][inflamation_stage ? "inflamed" : ""]"
return ..()
/obj/item/organ/appendix/on_life(delta_time, times_fired)
..()
if(!(organ_flags & ORGAN_FAILING))
return
var/mob/living/carbon/organ_owner = owner
if(organ_owner)
organ_owner.adjustToxLoss(2 * delta_time, TRUE, TRUE) //forced to ensure people don't use it to gain tox as slime person
if(!organ_owner)
return
if(organ_flags & ORGAN_FAILING)
// forced to ensure people don't use it to gain tox as slime person
organ_owner.adjustToxLoss(2 * delta_time, updating_health = TRUE, forced = TRUE)
else if(inflamation_stage)
inflamation(delta_time)
else if(DT_PROB(APPENDICITIS_PROB, delta_time))
become_inflamed()
/obj/item/organ/appendix/proc/become_inflamed()
inflamation_stage = 1
update_appearance()
if(owner)
ADD_TRAIT(owner, TRAIT_DISEASELIKE_SEVERITY_MEDIUM, type)
owner.med_hud_set_status()
/obj/item/organ/appendix/proc/inflamation(delta_time)
var/mob/living/carbon/organ_owner = owner
if(inflamation_stage < 3 && DT_PROB(INFLAMATION_ADVANCEMENT_PROB, delta_time))
inflamation_stage += 1
switch(inflamation_stage)
if(1)
if(DT_PROB(2.5, delta_time))
organ_owner.emote("cough")
if(2)
if(DT_PROB(1.5, delta_time))
to_chat(organ_owner, span_warning("You feel a stabbing pain in your abdomen!"))
organ_owner.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 5)
organ_owner.Stun(rand(40, 60))
organ_owner.adjustToxLoss(1, updating_health = TRUE, forced = TRUE)
if(3)
if(DT_PROB(0.5, delta_time))
organ_owner.vomit(95)
organ_owner.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 15)
/obj/item/organ/appendix/get_availability(datum/species/owner_species)
return !(TRAIT_NOHUNGER in owner_species.inherent_traits)
/obj/item/organ/appendix/Remove(mob/living/carbon/organ_owner, special = 0)
for(var/datum/disease/appendicitis/appendicitis in organ_owner.diseases)
appendicitis.cure()
inflamed = TRUE
update_appearance()
/obj/item/organ/appendix/Remove(mob/living/carbon/organ_owner, special = FALSE)
REMOVE_TRAIT(organ_owner, TRAIT_DISEASELIKE_SEVERITY_MEDIUM, type)
organ_owner.med_hud_set_status()
..()
/obj/item/organ/appendix/Insert(mob/living/carbon/organ_owner, special = 0)
/obj/item/organ/appendix/Insert(mob/living/carbon/organ_owner, special = FALSE)
..()
if(inflamed)
organ_owner.ForceContractDisease(new /datum/disease/appendicitis(), FALSE, TRUE)
if(inflamation_stage)
ADD_TRAIT(organ_owner, TRAIT_DISEASELIKE_SEVERITY_MEDIUM, type)
organ_owner.med_hud_set_status()
/obj/item/organ/appendix/get_status_text()
if((!(organ_flags & ORGAN_FAILING)) && inflamation_stage)
return "<font color='#ff9933'>Inflamed</font>"
else
return ..()
#undef APPENDICITIS_PROB
#undef INFLAMATION_ADVANCEMENT_PROB
code/modules/surgery/organs/organ_internal.dm
+14
View File
@@ -279,3 +279,17 @@
/// Called before organs are replaced in regenerate_organs with new ones
/obj/item/organ/proc/before_organ_replacement(obj/item/organ/replacement)
return
/// Called by medical scanners to get a simple summary of how healthy the organ is. Returns an empty string if things are fine.
/obj/item/organ/proc/get_status_text()
var/status = ""
if(owner.has_reagent(/datum/reagent/inverse/technetium))
status = "<font color='#E42426'> organ is [round((damage/maxHealth)*100, 1)]% damaged.</font>"
else if(organ_flags & ORGAN_FAILING)
status = "<font color='#cc3333'>Non-Functional</font>"
else if(damage > high_threshold)
status = "<font color='#ff9933'>Severely Damaged</font>"
else if (damage > low_threshold)
status = "<font color='#ffcc33'>Mildly Damaged</font>"
return status
tgstation.dme
-2
View File
@@ -634,7 +634,6 @@
#include "code\datums\diseases\_disease.dm"
#include "code\datums\diseases\_MobProcs.dm"
#include "code\datums\diseases\anxiety.dm"
#include "code\datums\diseases\appendicitis.dm"
#include "code\datums\diseases\beesease.dm"
#include "code\datums\diseases\brainrot.dm"
#include "code\datums\diseases\cold.dm"
@@ -2163,7 +2162,6 @@
#include "code\modules\events\space_ninja.dm"
#include "code\modules\events\spacevine.dm"
#include "code\modules\events\spider_infestation.dm"
#include "code\modules\events\spontaneous_appendicitis.dm"
#include "code\modules\events\stray_cargo.dm"
#include "code\modules\events\swarmer.dm"
#include "code\modules\events\wisdomcow.dm"