cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Global chem blacklist + SM addition to blacklist (#17724)

Browse Source 
* Chem blacklist

* immunoGLOBulins
This commit is contained in:
Cameron Lennox
2025-05-19 13:53:34 -07:00
committed by GitHub
parent 43ee57dc22
commit 00c53c10f7
4 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed.dm
+4 -12
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))
code/modules/xenoarcheaology/finds/find_spawning.dm
+4 -11
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)
code/modules/xenoarcheaology/finds/special.dm
+1 -13
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