cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-11 18:11:06 -07:00
committed by GitHub
parent d5b62d4159
commit fd5d9267ff
622 changed files with 11273 additions and 9558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/diseases/_disease.dm
View File

@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
if((spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD) && !force_spread)
return
if(affected_mob.bloodstr.has_reagent("spaceacillin") || (affected_mob.nutrition > 300 && prob(affected_mob.nutrition/50)))
if(affected_mob.bloodstr.has_reagent(REAGENT_ID_SPACEACILLIN) || (affected_mob.nutrition > 300 && prob(affected_mob.nutrition/50)))
return
var/spread_range = 1

8
code/datums/diseases/advance/advance.dm
View File

@@ -1,10 +1,10 @@
GLOBAL_LIST_EMPTY(archive_diseases)
GLOBAL_LIST_INIT(advance_cures, list(
"sodiumchloride", "sugar", "orangejuice",
"spaceacillin", "glucose", "ethanol",
"leporazine", "impedrezene", "hepanephrodaxon",
"silver", "gold"
REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE,
REAGENT_ID_SPACEACILLIN, REAGENT_ID_GLUCOSE, REAGENT_ID_ETHANOL,
REAGENT_ID_LEPORAZINE, REAGENT_ID_IMPEDREZENE, REAGENT_ID_HEPANEPHRODAXON,
REAGENT_ID_SILVER, REAGENT_ID_GOLD
))
/datum/disease/advance

4
code/datums/diseases/advance/symptoms/oxygen.dm
View File

@@ -29,8 +29,8 @@ Bonus
var/mob/living/M = A.affected_mob
switch(A.stage)
if(4, 5)
if(M.reagents.get_reagent_amount("dexalin") < 10)
M.reagents.add_reagent("dexalin", 10)
if(M.reagents.get_reagent_amount(REAGENT_ID_DEXALIN) < 10)
M.reagents.add_reagent(REAGENT_ID_DEXALIN, 10)
else
if(prob(SYMPTOM_ACTIVATION_PROB * 5))
to_chat(M, span_notice(pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")))

14
code/datums/diseases/advance/symptoms/sensory.dm
View File

@@ -32,15 +32,15 @@ Bonus
if(A.stage >= 3)
M.slurring = max(0, M.slurring-4)
M.druggy = max(0, M.druggy-4)
M.reagents.remove_reagent("ethanol", 3)
M.reagents.remove_reagent(REAGENT_ID_ETHANOL, 3)
if(A.stage >= 4)
M.drowsyness = max(0, M.drowsyness-4)
if(M.reagents.has_reagent("bliss"))
M.reagents.del_reagent("bliss")
if(M.reagents.has_reagent(REAGENT_ID_BLISS))
M.reagents.del_reagent(REAGENT_ID_BLISS)
M.hallucination = max(0, M.hallucination-4)
if(A.stage >= 5)
if(M.reagents.get_reagent_amount("alkysine") < 10)
M.reagents.add_reagent("alkysine", 5)
if(M.reagents.get_reagent_amount(REAGENT_ID_ALKYSINE) < 10)
M.reagents.add_reagent(REAGENT_ID_ALKYSINE, 5)
/datum/symptom/sensory_restoration
name = "Sensory Restoration"
@@ -56,8 +56,8 @@ Bonus
var/mob/living/M = A.affected_mob
switch(A.stage)
if(4, 5)
if(M.reagents.get_reagent_amount("imidazoline") < 10)
M.reagents.add_reagent("imidazoline", 5)
if(M.reagents.get_reagent_amount(REAGENT_ID_IMIDAZOLINE) < 10)
M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
else
if(prob(SYMPTOM_ACTIVATION_PROB))
to_chat(M, span_notice(pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.")))

4
code/datums/diseases/advance/symptoms/stimulant.dm
View File

@@ -36,8 +36,8 @@ Bonus
if(3, 4)
L.jitteriness += 10
else
if(L.reagents.get_reagent_amount("hyperzine" < 10))
L.reagents.add_reagent("hyperzine", 5)
if(L.reagents.get_reagent_amount(REAGENT_ID_HYPERZINE < 10))
L.reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
if(prob(30))
L.jitteriness += 15
return

4
code/datums/diseases/anxiety.dm
View File

@@ -4,8 +4,8 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Ethanol"
cures = list("ethanol")
cure_text = REAGENT_ETHANOL
cures = list(REAGENT_ID_ETHANOL)
agent = "Excess Lepdopticides"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated subject will regurgitate butterflies."

4
code/datums/diseases/beesease.dm
View File

@@ -4,8 +4,8 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Sugar"
cures = list("sugar")
cure_text = REAGENT_SUGAR
cures = list(REAGENT_ID_SUGAR)
agent = "Apidae Infection"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated, subject will regurgitate bees."

4
code/datums/diseases/brainrot.dm
View File

@@ -3,8 +3,8 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Alkysine"
cures = list("alkysine")
cure_text = REAGENT_ALKYSINE
cures = list(REAGENT_ID_ALKYSINE)
agent = "Cryptococcus Cosmosis"
viable_mobtypes = list(/mob/living/carbon/human)
cure_chance = 15

4
code/datums/diseases/choreomania.dm
View File

@@ -2,8 +2,8 @@
name = "Choreomania"
max_stages = 3
spread_text = "Airborne"
cure_text = "Adranol"
cures = list("adranol")
cure_text = REAGENT_ADRANOL
cures = list(REAGENT_ID_ADRANOL)
cure_chance = 10
agent = "TAP-DAnC3"
viable_mobtypes = list(/mob/living/carbon/human)

4
code/datums/diseases/cold.dm
View File

@@ -3,8 +3,8 @@
max_stages = 3
spread_text = "Airborne"
spread_flags = AIRBORNE
cure_text = "Rest & Spaceacillin"
cures = list("spaceacillin", "chicken_soup")
cure_text = "Rest & " + REAGENT_SPACEACILLIN
cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
agent = "XY-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)

4
code/datums/diseases/cold9.dm
View File

@@ -4,8 +4,8 @@
max_stages = 3
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Spaceacillin"
cures = list("spaceacillin")
cure_text = REAGENT_SPACEACILLIN
cures = list(REAGENT_ID_SPACEACILLIN)
agent = "ICE9-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated the subject will slow, as if partly frozen."

4
code/datums/diseases/fake_gbs.dm
View File

@@ -3,8 +3,8 @@
max_stages = 5
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Adranol & Sulfur"
cures = list("adranol", "sulfur")
cure_text = REAGENT_ADRANOL + " & " + REAGENT_SULFUR
cures = list(REAGENT_ID_ADRANOL, REAGENT_ID_SULFUR)
agent = "Gravitokinetic Bipotential SADS-"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "if left untreated death will occur."

4
code/datums/diseases/flu.dm
View File

@@ -2,8 +2,8 @@
name = "The Flu"
max_stages = 3
spread_text = "Airborne"
cure_text = "Spaceacillin"
cures = list("spaceacillin", "chicken_soup")
cure_text = REAGENT_SPACEACILLIN
cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
cure_chance = 10
agent = "H13N1 flu virion"

4
code/datums/diseases/food_poisoning.dm
View File

@@ -5,8 +5,8 @@
spread_text = "Non-Contagious"
spread_flags = NON_CONTAGIOUS
cure_text = "Sleep"
agent = "Salmonella"
cures = list("chicken_soup")
agent = REAGENT_SALMONELLA
cures = list(REAGENT_ID_CHICKENSOUP)
cure_chance = 10
viable_mobtypes = list(/mob/living/carbon/human)
desc = "Nausea, sickness, and vomitting."

8
code/datums/diseases/gbs.dm
View File

@@ -3,8 +3,8 @@
max_stages = 5
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Adranol & Sulfur"
cures = list("adranol", "sulfur")
cure_text = REAGENT_ADRANOL + " & " + REAGENT_SULFUR
cures = list(REAGENT_ID_ADRANOL, REAGENT_ID_SULFUR)
cure_chance = 15
agent = "Gravitokinetic Bipotential SADS+"
viable_mobtypes = list(/mob/living/carbon/human)
@@ -42,8 +42,8 @@
stage_prob = 5
spread_text = "Non-contagious"
spread_flags = NON_CONTAGIOUS
cure_text = "Cryoxadone"
cures = list("cryoxadone")
cure_text = REAGENT_CRYOXADONE
cures = list(REAGENT_ID_CRYOXADONE)
cure_chance = 10
agent = "gibbis"
disease_flags = CURABLE

4
code/datums/diseases/lycancoughy.dm
View File

@@ -4,8 +4,8 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Ethanol"
cures = list("ethanol")
cure_text = REAGENT_ETHANOL
cures = list(REAGENT_ID_ETHANOL)
agent = "Excess Snuggles"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated subject will regurgitate... puppies."

4
code/datums/diseases/magnitis.dm
View File

@@ -2,8 +2,8 @@
name = "Magnitis"
max_stages = 4
spread_text = "Airbone"
cure_text = "Iron"
cures = list("iron")
cure_text = REAGENT_IRON
cures = list(REAGENT_ID_IRON)
agent = "Fukkos Miracos"
viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 0.75

4
code/datums/diseases/roanoake.dm
View File

@@ -4,9 +4,9 @@
stage_prob = 2
spread_text = "Blood and close contact"
spread_flags = BLOOD
cure_text = "Spaceacillin"
cure_text = REAGENT_SPACEACILLIN
agent = "Chimera cells"
cures = list("spaceacillin")
cures = list(REAGENT_ID_SPACEACILLIN)
cure_chance = 10
viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated, subject will become a xenochimera upon perishing."