bunch of fixes

This commit is contained in:
Kashargul
2024-12-06 23:29:36 +01:00
parent c64a251504
commit 0b303a3ae5
25 changed files with 251 additions and 204 deletions
+1 -1
View File
@@ -92,7 +92,7 @@
descriptors |= "hallucinogenic"
if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
descriptors |= "medicinal"
if(reagents.has_reagent("gold") || reagents.has_reagent("earthsblood"))
if(reagents.has_reagent(REAGENT_ID_GOLD) || reagents.has_reagent("earthsblood"))
descriptors |= "shiny"
if(reagents.has_reagent("lube"))
descriptors |= "slippery"
+1 -1
View File
@@ -462,7 +462,7 @@
if(additional_chems)
// VOREStation Edit Start: Modified exclusion list
var/list/banned_chems = list(
"adminordrazine",
REAGENT_ID_ADMINORDRAZINE,
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
+1 -1
View File
@@ -31,7 +31,7 @@
display_name = "gold apple tree"
kitchen_tag = "goldapple"
mutants = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "gold" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_GOLD = list(1,5))
/datum/seed/apple/gold/New()
..()
+5 -5
View File
@@ -74,7 +74,7 @@
"ammonia" = 1,
"diethylamine" = 2,
REAGENT_ID_NUTRIMENT = 1,
"adminordrazine" = 1,
REAGENT_ID_ADMINORDRAZINE = 1,
"eznutrient" = 1,
"robustharvest" = 1,
"left4zed" = 1
@@ -87,16 +87,16 @@
REAGENT_ID_SACID = -2,
REAGENT_ID_PACID = -4,
"plantbgone" = -8,
"adminordrazine" = -5
REAGENT_ID_ADMINORDRAZINE = -5
)
var/static/list/pestkiller_reagents = list(
REAGENT_ID_SUGAR = 2,
"diethylamine" = -2,
"adminordrazine" = -5
REAGENT_ID_ADMINORDRAZINE = -5
)
var/static/list/water_reagents = list(
REAGENT_ID_WATER = 1,
"adminordrazine" = 1,
REAGENT_ID_ADMINORDRAZINE = 1,
"milk" = 0.9,
"beer" = 0.7,
REAGENT_ID_FLUORINE = -0.5,
@@ -121,7 +121,7 @@
"diethylamine" = list( 1, 0, 0 ),
REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ),
REAGENT_ID_RADIUM = list( -1.5, 0, 0.2),
"adminordrazine" = list( 1, 1, 1 ),
REAGENT_ID_ADMINORDRAZINE = list( 1, 1, 1 ),
"robustharvest" = list( 0, 0.2, 0 ),
"left4zed" = list( 0, 0, 0.2)
)