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

[MIRROR] Global chem blacklist + SM addition to blacklist (#10936)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-05-19 23:13:09 -07:00
committed by GitHub
parent cbc509ce77
commit b66793f9c7
4 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/_helpers/global_lists.dm
View File

@@ -416,6 +416,17 @@ var/global/list/item_digestion_blacklist = list(
/obj/item/mmi/digital/robot,
/obj/item/rig/protean)
///A list of chemicals that are banned from being obtainable through means that generate chemicals. These chemicals are either lame, annoying, pref-breaking, or OP (This list does NOT include reactions)
GLOBAL_LIST_INIT(obtainable_chemical_blacklist, list(
REAGENT_ID_ADMINORDRAZINE,
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
REAGENT_ID_MAGICDUST,
REAGENT_ID_SUPERMATTER
))
var/global/list/item_tf_spawnpoints = list() // Global variable tracking which items are item tf spawnpoints
// Options for transforming into a different mob in virtual reality.

16
code/modules/hydroponics/seed.dm
View File

@@ -461,23 +461,15 @@
var/additional_chems = rand(0,5)
if(additional_chems)
// VOREStation Edit Start: Modified exclusion list
var/list/banned_chems = list(
REAGENT_ID_ADMINORDRAZINE,
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
REAGENT_ID_MAGICDUST
)
// VOREStation Edit End: Modified exclusion list
for(var/x=1;x<=additional_chems;x++)
var/new_chem = pick(SSchemistry.chemical_reagents)
if(new_chem in banned_chems)
var/list/currently_banned_chems = list()
currently_banned_chems += GLOB.obtainable_chemical_blacklist
if(new_chem in currently_banned_chems)
continue
banned_chems += new_chem
currently_banned_chems += new_chem
chems[new_chem] = list(rand(1,10),rand(10,20))
if(prob(5))

15
code/modules/xenoarcheaology/finds/find_spawning.dm
View File

@@ -617,21 +617,14 @@
//However, in that case Initialize will set the maximum volume to the volume for us, so we don't need to do anything.
S.reagents?.maximum_volume = 15
item_type = new_item.name
//Taken from hydroponics/seed.dm...This should be a global list at some point and reworked in both places.
var/list/banned_chems = list(
REAGENT_ID_ADMINORDRAZINE,
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
REAGENT_ID_MAGICDUST
)
var/additional_chems = 5 //5 random chems added to the syringe! 15u of RANDOM stuff! (I tried to keep this 30, but this was...Horribly bugged. There is no icon_state for 16-30, so the icon was invisible when filled.)
for(var/x=1;x<=additional_chems;x++)
var/new_chem = pick(SSchemistry.chemical_reagents)
if(new_chem in banned_chems)
var/list/currently_banned_chems = list()
currently_banned_chems += GLOB.obtainable_chemical_blacklist
if(new_chem in currently_banned_chems)
continue
banned_chems += new_chem
currently_banned_chems += new_chem
S.reagents.add_reagent(new_chem, 3)
if(ARCHAEO_RING)

14
code/modules/xenoarcheaology/finds/special.dm
View File

@@ -1,6 +1,3 @@
//endless reagents!
/obj/item/reagent_containers/glass/replenishing
var/spawning_id
@@ -8,18 +5,9 @@
/obj/item/reagent_containers/glass/replenishing/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
//Taken from hydroponics/seed.dm...This should be a global list at some point and reworked in both places.
var/list/banned_chems = list(
REAGENT_ID_ADMINORDRAZINE,
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
REAGENT_ID_MAGICDUST
)
for(var/x=1;x<=10;x++) //You got 10 chances to hit a reagent that is NOT banned.
var/new_chem = pick(SSchemistry.chemical_reagents)
if(new_chem in banned_chems)
if(new_chem in GLOB.obtainable_chemical_blacklist)
continue
else
spawning_id = new_chem