cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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

62
code/modules/xenobio2/_xeno_setup.dm
View File

@@ -48,36 +48,36 @@
#define MINOR_MALEABLE 1
#define MIN_MALEABLE 0
var/global/list/xenoChemList = list("mutationtoxin",
"psilocybin",
"mindbreaker",
"impedrezene",
"cryptobiolin",
"bliss",
"chloralhydrate",
"stoxin",
"mutagen",
"lexorin",
"pacid",
"cyanide",
"phoron",
"plasticide",
"amatoxin",
"carbon",
"radium",
"sacid",
"sugar",
"kelotane",
"dermaline",
"anti_toxin",
"dexalin",
"synaptizine",
"alkysine",
"imidazoline",
"peridaxon",
"rezadone",
"mutationtoxin",
"docilitytoxin")
var/global/list/xenoChemList = list(REAGENT_ID_MUTATIONTOXIN,
REAGENT_ID_PSILOCYBIN,
REAGENT_ID_MINDBREAKER,
REAGENT_ID_IMPEDREZENE,
REAGENT_ID_CRYPTOBIOLIN,
REAGENT_ID_BLISS,
REAGENT_ID_CHLORALHYDRATE,
REAGENT_ID_STOXIN,
REAGENT_ID_MUTAGEN,
REAGENT_ID_LEXORIN,
REAGENT_ID_PACID,
REAGENT_ID_CYANIDE,
REAGENT_ID_PHORON,
REAGENT_ID_PLASTICIDE,
REAGENT_ID_AMATOXIN,
REAGENT_ID_CARBON,
REAGENT_ID_RADIUM,
REAGENT_ID_SACID,
REAGENT_ID_SUGAR,
REAGENT_ID_KELOTANE,
REAGENT_ID_DERMALINE,
REAGENT_ID_ANTITOXIN,
REAGENT_ID_DEXALIN,
REAGENT_ID_SYNAPTIZINE,
REAGENT_ID_ALKYSINE,
REAGENT_ID_IMIDAZOLINE,
REAGENT_ID_PERIDAXON,
REAGENT_ID_REZADONE,
REAGENT_ID_MUTATIONTOXIN,
REAGENT_ID_MUTATIONTOXIN)
/datum/xeno/traits
var/list/traits = list()
@@ -212,5 +212,3 @@ var/global/list/xenoChemList = list("mutationtoxin",
var/genetype //Label for specifying what gene is used.
var/list/values //What's going to be put into specific traits
var/list/chems

128
code/modules/xenobio2/_xeno_setup_vr.dm
View File

@@ -1,65 +1,65 @@
/hook/startup/proc/xenochems_vr() //A chemical whitelist. Adds on to the other chemical whitelist. This is required, as you don't want users getting certain chemicals (See: Adminordizine) and also don't want them to just get pure stock chemicals, as that'd be boring for the player.
xenoChemList += "inaprovaline"
xenoChemList += "bicaridine"
xenoChemList += "dylovene"
xenoChemList += "dexalinp"
xenoChemList += "tricordrazine"
xenoChemList += "cryoxadone"
xenoChemList += "clonexadone"
xenoChemList += "paracetamol"
xenoChemList += "tramadol"
xenoChemList += "oxycodone"
xenoChemList += "ryetalyn"
xenoChemList += "hyperzine"
xenoChemList += "ethylredoxrazine"
xenoChemList += "hyronalin"
xenoChemList += "arithrazine"
xenoChemList += "spaceacillin"
xenoChemList += "sterilizine"
xenoChemList += "leporazine"
xenoChemList += "methylphenidate"
xenoChemList += "citalopram"
xenoChemList += "paroxetine"
xenoChemList += "macrocillin"
xenoChemList += "microcillin"
xenoChemList += "normalcillin"
xenoChemList += "sizeoxadone"
xenoChemList += "ickypak"
xenoChemList += "unsorbitol"
xenoChemList += "toxin"
xenoChemList += "carpotoxin"
xenoChemList += "potassium_chloride"
xenoChemList += "potassium_chlorophoride"
xenoChemList += "zombiepowder"
xenoChemList += "fertilizer"
xenoChemList += "eznutrient"
xenoChemList += "left4zed"
xenoChemList += "robustharvest"
xenoChemList += "plantbgone"
xenoChemList += "serotrotium"
xenoChemList += "nicotine"
xenoChemList += "uranium"
xenoChemList += "silver"
xenoChemList += "gold"
xenoChemList += "adrenaline"
xenoChemList += "holywater"
xenoChemList += "ammonia"
xenoChemList += "diethylamine"
xenoChemList += "fluorosurfactant"
xenoChemList += "foaming_agent"
xenoChemList += "thermite"
xenoChemList += "cleaner"
xenoChemList += "lube"
xenoChemList += "silicate"
xenoChemList += "glycerol"
xenoChemList += "coolant"
xenoChemList += "luminol"
xenoChemList += "nutriment"
xenoChemList += "cornoil"
xenoChemList += "lipozine"
xenoChemList += "sodiumchloride"
xenoChemList += "frostoil"
xenoChemList += "capsaicin"
xenoChemList += "condensedcapsaicin"
xenoChemList += "neurotoxin"
return 1
xenoChemList += REAGENT_ID_INAPROVALINE
xenoChemList += REAGENT_ID_BICARIDINE
xenoChemList += REAGENT_ID_ANTITOXIN
xenoChemList += REAGENT_ID_DEXALINP
xenoChemList += REAGENT_ID_TRICORDRAZINE
xenoChemList += REAGENT_ID_CRYOXADONE
xenoChemList += REAGENT_ID_CLONEXADONE
xenoChemList += REAGENT_ID_PARACETAMOL
xenoChemList += REAGENT_ID_TRAMADOL
xenoChemList += REAGENT_ID_OXYCODONE
xenoChemList += REAGENT_ID_RYETALYN
xenoChemList += REAGENT_ID_HYPERZINE
xenoChemList += REAGENT_ID_ETHYLREDOXRAZINE
xenoChemList += REAGENT_ID_HYRONALIN
xenoChemList += REAGENT_ID_ARITHRAZINE
xenoChemList += REAGENT_ID_SPACEACILLIN
xenoChemList += REAGENT_ID_STERILIZINE
xenoChemList += REAGENT_ID_LEPORAZINE
xenoChemList += REAGENT_ID_METHYLPHENIDATE
xenoChemList += REAGENT_ID_CITALOPRAM
xenoChemList += REAGENT_ID_PAROXETINE
xenoChemList += REAGENT_ID_MACROCILLIN
xenoChemList += REAGENT_ID_MICROCILLIN
xenoChemList += REAGENT_ID_NORMALCILLIN
xenoChemList += REAGENT_ID_SIZEOXADONE
xenoChemList += REAGENT_ID_ICKYPAK
xenoChemList += REAGENT_ID_UNSORBITOL
xenoChemList += REAGENT_ID_TOXIN
xenoChemList += REAGENT_ID_CARPOTOXIN
xenoChemList += REAGENT_ID_POTASSIUMCHLORIDE
xenoChemList += REAGENT_ID_POTASSIUMCHLOROPHORIDE
xenoChemList += REAGENT_ID_ZOMBIEPOWDER
xenoChemList += REAGENT_ID_FERTILIZER
xenoChemList += REAGENT_ID_EZNUTRIENT
xenoChemList += REAGENT_ID_LEFT4ZED
xenoChemList += REAGENT_ID_ROBUSTHARVEST
xenoChemList += REAGENT_ID_PLANTBGONE
xenoChemList += REAGENT_ID_SEROTROTIUM
xenoChemList += REAGENT_ID_NICOTINE
xenoChemList += REAGENT_ID_URANIUM
xenoChemList += REAGENT_ID_SILVER
xenoChemList += REAGENT_ID_GOLD
xenoChemList += REAGENT_ID_ADRENALINE
xenoChemList += REAGENT_ID_HOLYWATER
xenoChemList += REAGENT_ID_AMMONIA
xenoChemList += REAGENT_ID_DIETHYLAMINE
xenoChemList += REAGENT_ID_FLUOROSURFACTANT
xenoChemList += REAGENT_ID_FOAMINGAGENT
xenoChemList += REAGENT_ID_THERMITE
xenoChemList += REAGENT_ID_CLEANER
xenoChemList += REAGENT_ID_LUBE
xenoChemList += REAGENT_ID_SILICATE
xenoChemList += REAGENT_ID_GLYCEROL
xenoChemList += REAGENT_ID_COOLANT
xenoChemList += REAGENT_ID_LUMINOL
xenoChemList += REAGENT_ID_NUTRIMENT
xenoChemList += REAGENT_ID_CORNOIL
xenoChemList += REAGENT_ID_LIPOZINE
xenoChemList += REAGENT_ID_SODIUMCHLORIDE
xenoChemList += REAGENT_ID_FROSTOIL
xenoChemList += REAGENT_ID_CAPSAICIN
xenoChemList += REAGENT_ID_CONDENSEDCAPSAICIN
xenoChemList += REAGENT_ID_NEUROTOXIN
return 1

6
code/modules/xenobio2/mob/slime/slime procs.dm
View File

@@ -29,7 +29,7 @@ Slime specific procs go here.
if(prob(40))
var/hasMutToxin
for(var/R in traitdat.chems)
if(R == "mutationtoxin")
if(R == REAGENT_ID_MUTATIONTOXIN)
hasMutToxin = 1
var/chemamount
if(hasMutToxin)
@@ -40,7 +40,7 @@ Slime specific procs go here.
traitdat.chems[chemtype] = chemamount
else
chemamount = rand(1,5)
traitdat.chems["mutationtoxin"] = chemamount
traitdat.chems[REAGENT_ID_MUTATIONTOXIN] = chemamount
/mob/living/simple_mob/xeno/slime/proc/GrowUp()
GenerateAdult()
@@ -115,7 +115,7 @@ Slime specific procs go here.
return
if(reagents.total_volume <= 0)
return
if(reagents.has_reagent("docilitytoxin")) //Toxin that makes them docile? Good for quelling angry mobs.
if(reagents.has_reagent(REAGENT_ID_MUTATIONTOXIN)) //Toxin that makes them docile? Good for quelling angry mobs.
hostile = 0
traitdat.traits[TRAIT_XENO_HOSTILE] = 0
..()

68
code/modules/xenobio2/mob/slime/slime.dm
View File

@@ -21,7 +21,7 @@ Slime definitions, Life and New live here.
var/growthpoint = 25 //At what point they grow up.
var/shiny = 0
move_to_delay = 17 //Slimes shouldn't be able to go faster than humans.
default_chems = list("slimejelly" = 5)
default_chems = list(REAGENT_ID_SLIMEJELLY = 5)
attacktext = list("absorbed some of")
response_help = "pats"
response_disarm = "tries to stop"
@@ -46,39 +46,39 @@ Slime definitions, Life and New live here.
//Overlay information
var/overlay = 1 // 1 = normal lighting, 0 = shiny, 2 = too shiny, -1 = no overlay
chemreact = list( "nutriment" = list("nutr" = 0.5),
"radium" = list("toxic" = 0.3, "mut" = 1),
"mutagen" = list("nutr" = 0.4, "mut" = 2),
"water" = list("nutr" = -0.1),
"milk" = list("nutr" = 0.3),
"sacid" = list("toxic" = 1),
"pacid" = list("toxic" = 2),
"chlorine" = list("toxic" = 0.5),
"ammonia" = list("toxic" = 0.5),
"sodawater" = list("toxic" = 0.1, "nutr" = -0.1),
"beer" = list("nutr" = 0.6),
"diethylamine" = list("nutr" = 0.9),
"sugar" = list("toxic" = 0.4, "nutr" = 0.2),
"eznutrient" = list("nutr" = 0.8),
"cryoxadone" = list("toxic" = 0.4),
"flourine" = list("toxic" = 0.1),
"robustharvest" = list("nutr" = 1.5),
"glucose" = list("nutr" = 0.5),
"blood" = list("nutr" = 0.75, "toxic" = 0.05, "mut" = 0.45),
"fuel" = list("toxic" = 0.4),
"toxin" = list("toxic" = 0.5),
"carpotoxin" = list("toxic" = 1, "mut" = 1.5),
"phoron" = list("toxic" = 1.5, "mut" = 0.03),
"virusfood" = list("nutr" = 1.5, "mut" = 0.32),
"cyanide" = list("toxic" = 3.5),
"slimejelly" = list("nutr" = 0.5),
"amutationtoxin" = list("toxic" = 0.1, "heal" = 1.5, "mut" = 3),
"mutationtoxin" = list("toxic" = 0.1, "heal" = 1, "mut" = 1.5),
"gold" = list("heal" = 0.3, "nutr" = 0.7, "mut" = 0.3),
"uranium" = list("heal" = 0.3, "toxic" = 0.7, "mut" = 1.2),
"glycerol" = list("nutr" = 0.6),
"woodpulp" = list("heal" = 0.1, "nutr" = 0.7),
"docilitytoxin" = list("nutr" = 0.3) )
chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5),
REAGENT_ID_RADIUM = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1),
REAGENT_ID_MUTAGEN = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2),
REAGENT_ID_WATER = list(XENO_CHEM_NUTRI = -0.1),
REAGENT_ID_MILK = list(XENO_CHEM_NUTRI = 0.3),
REAGENT_ID_SACID = list(XENO_CHEM_TOXIC = 1),
REAGENT_ID_PACID = list(XENO_CHEM_TOXIC = 2),
REAGENT_ID_CHLORINE = list(XENO_CHEM_TOXIC = 0.5),
REAGENT_ID_AMMONIA = list(XENO_CHEM_TOXIC = 0.5),
REAGENT_ID_SODAWATER = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1),
REAGENT_ID_BEER = list(XENO_CHEM_NUTRI = 0.6),
REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9),
REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2),
REAGENT_ID_EZNUTRIENT = list(XENO_CHEM_NUTRI = 0.8),
REAGENT_ID_CRYOXADONE = list(XENO_CHEM_TOXIC = 0.4),
"flourine" = list(XENO_CHEM_TOXIC = 0.1),
REAGENT_ID_ROBUSTHARVEST = list(XENO_CHEM_NUTRI = 1.5),
REAGENT_ID_GLUCOSE = list(XENO_CHEM_NUTRI = 0.5),
REAGENT_ID_BLOOD = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45),
REAGENT_ID_FUEL = list(XENO_CHEM_TOXIC = 0.4),
REAGENT_ID_TOXIN = list(XENO_CHEM_TOXIC = 0.5),
REAGENT_ID_CARPOTOXIN = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5),
REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03),
REAGENT_ID_VIRUSFOOD = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32),
REAGENT_ID_CYANIDE = list(XENO_CHEM_TOXIC = 3.5),
REAGENT_ID_SLIMEJELLY = list(XENO_CHEM_NUTRI = 0.5),
"amutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1.5, XENO_CHEM_MUT = 3),
REAGENT_ID_MUTATIONTOXIN = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1, XENO_CHEM_MUT = 1.5),
REAGENT_ID_GOLD = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3),
REAGENT_ID_URANIUM = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2),
REAGENT_ID_GLYCEROL = list(XENO_CHEM_NUTRI = 0.6),
REAGENT_ID_WOODPULP = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7),
REAGENT_ID_MUTATIONTOXIN = list(XENO_CHEM_NUTRI = 0.3) )
/mob/living/simple_mob/xeno/slime/New()
..()

16
code/modules/xenobio2/mob/xeno procs.dm
View File

@@ -68,17 +68,17 @@ Divergence proc, used in mutation to make unique datums.
if(!reagent_response)
continue // just skip this reagent, rather than clearing the whole thing
if(reagent_response["toxic"])
adjustToxLoss(reagent_response["toxic"] * reagent_total)
if(reagent_response[XENO_CHEM_TOXIC])
adjustToxLoss(reagent_response[XENO_CHEM_TOXIC] * reagent_total)
if(reagent_response["heal"])
heal_overall_damage(reagent_response["heal"] * reagent_total)
if(reagent_response[XENO_CHEM_HEAL])
heal_overall_damage(reagent_response[XENO_CHEM_HEAL] * reagent_total)
if(reagent_response["nutr"])
adjust_nutrition(reagent_response["nutr"] * reagent_total)
if(reagent_response[XENO_CHEM_NUTRI])
adjust_nutrition(reagent_response[XENO_CHEM_NUTRI] * reagent_total)
if(reagent_response["mut"])
mut_level += reagent_response["mut"] * reagent_total
if(reagent_response[XENO_CHEM_MUT])
mut_level += reagent_response[XENO_CHEM_MUT] * reagent_total
temp_chem_holder.reagents.clear_reagents()