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] var/global/list -> GLOB. conversion (#11193)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-07-15 15:24:42 -07:00
committed by GitHub
parent 6f8cbcf612
commit 2c9453b5c3
423 changed files with 2496 additions and 2498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,37 +48,6 @@
#define MINOR_MALEABLE 1
#define MIN_MALEABLE 0
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()
var/list/chemlist = list()

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

@@ -1,65 +0,0 @@
/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 += 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

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

@@ -33,7 +33,7 @@ Slime specific procs go here.
hasMutToxin = 1
var/chemamount
if(hasMutToxin)
var/list/chemchoices = (xenoChemList - traitdat.chems)
var/list/chemchoices = (GLOB.xenoChemList - traitdat.chems)
var/chemtype = pick(chemchoices)
chemamount = rand(1,5)

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

@@ -97,10 +97,10 @@ Divergence proc, used in mutation to make unique datums.
if((COLORMUT & mutable))
traitdat.traits[TRAIT_XENO_COLOR] = "#"
for(var/i=0, i<6, i++)
traitdat.traits[TRAIT_XENO_COLOR] += pick(hexNums)
traitdat.traits[TRAIT_XENO_COLOR] += pick(GLOB.hexNums)
traitdat.traits[TRAIT_XENO_BIO_COLOR] = "#"
for(var/i=0, i<6, i++)
traitdat.traits[TRAIT_XENO_BIO_COLOR] += pick(hexNums)
traitdat.traits[TRAIT_XENO_BIO_COLOR] += pick(GLOB.hexNums)
RandomChemicals()
//if(SPECIESMUT & mutable)
@@ -153,7 +153,7 @@ Divergence proc, used in mutation to make unique datums.
traitdat.chems.Cut() //Clear the amount first.
var/num_chems = round(rand(1,4))
var/list/chemchoices = xenoChemList
var/list/chemchoices = GLOB.xenoChemList
for(var/i = 1 to num_chems)
var/chemtype = pick(chemchoices)