cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 08:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

bunch of fixes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/food/condiment.dm
+9 -9
View File
@@ -432,31 +432,31 @@
volume = 10
/obj/item/reagent_containers/food/condiment/small/packet/crayon/generic/Initialize()
. = ..()
reagents.add_reagent("crayon_dust", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUST, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/red/Initialize()
. = ..()
reagents.add_reagent("crayon_dust_red", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUSTRED, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/orange/Initialize()
. = ..()
reagents.add_reagent("crayon_dust_orange", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUSTORANGE, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/yellow/Initialize()
. = ..()
reagents.add_reagent("crayon_dust_yellow", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUSTYELLOW, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/green/Initialize()
. = ..()
reagents.add_reagent("crayon_dust_green", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUSTGREEN, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/blue/Initialize()
. = ..()
reagents.add_reagent("crayon_dust_blue", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUSTBLUE, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/purple/Initialize()
. = ..()
reagents.add_reagent("crayon_dust_purple", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUSTPURPLE, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/grey/Initialize()
. = ..()
reagents.add_reagent("crayon_dust_grey", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUSTGREY, 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/brown/Initialize()
. = ..()
reagents.add_reagent("crayon_dust_brown", 10)
reagents.add_reagent(REAGENT_ID_CRAYONDUSTBROWN, 10)
//End of MRE stuff.
code/modules/food/food/snacks.dm
+1 -1
View File
@@ -2412,7 +2412,7 @@
/obj/item/reagent_containers/food/snacks/appletart/Initialize()
. = ..()
reagents.add_reagent("gold", 5)
reagents.add_reagent(REAGENT_ID_GOLD, 5)
///////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////Soups/////////////////////////////////////////////////
code/modules/food/glass/bottle.dm
+1 -1
View File
@@ -154,7 +154,7 @@
desc = "A small bottle. Contains the liquid essence of the gods."
icon = 'icons/obj/drinks.dmi'
icon_state = "holyflask"
prefill = list("adminordrazine" = 60)
prefill = list(REAGENT_ID_ADMINORDRAZINE = 60)
/obj/item/reagent_containers/glass/bottle/capsaicin
name = "capsaicin bottle"
code/modules/hydroponics/grown.dm
+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"
code/modules/hydroponics/seed.dm
+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,
code/modules/hydroponics/seedtypes/apples.dm
+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()
..()
code/modules/hydroponics/trays/tray.dm
+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)
)
code/modules/mining/alloys_vr.dm
+9 -9
View File
@@ -1,9 +1,9 @@
/datum/alloy/plastitanium
metaltag = MAT_PLASTITANIUM
requires = list(
"rutile" = 1,
"platinum" = 1,
REAGENT_ID_CARBON = 2,
ORE_RUTILE = 1,
ORE_PLATINUM = 1,
ORE_CARBON = 2,
)
product_mod = 0.3
product = /obj/item/stack/material/plastitanium
@@ -11,8 +11,8 @@
/datum/alloy/tiglass
metaltag = MAT_TITANIUMGLASS
requires = list(
"rutile" = 1,
"sand" = 2
ORE_RUTILE = 1,
ORE_SAND = 2
)
product_mod = 1
product = /obj/item/stack/material/glass/titanium
@@ -20,10 +20,10 @@
/datum/alloy/plastiglass
metaltag = MAT_PLASTITANIUMGLASS
requires = list(
"rutile" = 1,
"sand" = 2,
"platinum" = 1,
REAGENT_ID_CARBON = 2,
ORE_RUTILE = 1,
ORE_SAND = 2,
ORE_PLATINUM = 1,
ORE_CARBON = 2,
)
product_mod = 1
product = /obj/item/stack/material/glass/plastitanium
code/modules/reagents/machinery/grinder.dm
+9 -9
View File
@@ -16,21 +16,21 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by
/obj/item/stack/material/deuterium = list(REAGENT_ID_HYDROGEN),
/obj/item/stack/material/glass/phoronrglass = list(REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_PHORON,REAGENT_ID_PHORON),
/obj/item/stack/material/diamond = list(REAGENT_ID_CARBON),
/obj/item/stack/material/durasteel = list(REAGENT_ID_IRON,REAGENT_ID_IRON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"platinum"),
/obj/item/stack/material/durasteel = list(REAGENT_ID_IRON,REAGENT_ID_IRON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_PLATINUM),
/obj/item/stack/material/wax = list(REAGENT_ID_ETHANOL,"triglyceride"),
/obj/item/stack/material/iron = list(REAGENT_ID_IRON),
/obj/item/stack/material/uranium = list("uranium"),
/obj/item/stack/material/phoron = list(REAGENT_ID_PHORON),
/obj/item/stack/material/gold = list("gold"),
/obj/item/stack/material/silver = list("silver"),
/obj/item/stack/material/platinum = list("platinum"),
/obj/item/stack/material/gold = list(REAGENT_ID_GOLD),
/obj/item/stack/material/silver = list(REAGENT_ID_SILVER),
/obj/item/stack/material/platinum = list(REAGENT_ID_PLATINUM),
/obj/item/stack/material/mhydrogen = list(REAGENT_ID_HYDROGEN),
/obj/item/stack/material/steel = list(REAGENT_ID_IRON, REAGENT_ID_CARBON),
/obj/item/stack/material/plasteel = list(REAGENT_ID_IRON, REAGENT_ID_IRON, REAGENT_ID_CARBON, REAGENT_ID_CARBON, "platinum"), //8 iron, 8 carbon, 4 platinum,
/obj/item/stack/material/plasteel = list(REAGENT_ID_IRON, REAGENT_ID_IRON, REAGENT_ID_CARBON, REAGENT_ID_CARBON, REAGENT_ID_PLATINUM), //8 iron, 8 carbon, 4 platinum,
/obj/item/stack/material/snow = list(REAGENT_ID_WATER),
/obj/item/stack/material/sandstone = list(REAGENT_ID_SILICON, REAGENT_ID_OXYGEN),
/obj/item/stack/material/glass = list(REAGENT_ID_SILICON),
/obj/item/stack/material/glass/phoronglass = list("platinum", REAGENT_ID_SILICON, REAGENT_ID_SILICON, REAGENT_ID_SILICON), //5 platinum, 15 silicon,
/obj/item/stack/material/glass/phoronglass = list(REAGENT_ID_PLATINUM, REAGENT_ID_SILICON, REAGENT_ID_SILICON, REAGENT_ID_SILICON), //5 platinum, 15 silicon,
/obj/item/stack/material/supermatter = list("supermatter")
)
var/global/list/ore_reagents = list( //have a number of reageents divisible by REAGENTS_PER_ORE (default 20) unless you like decimals.
@@ -38,12 +38,12 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
/obj/item/ore/iron = list(REAGENT_ID_IRON),
/obj/item/ore/coal = list(REAGENT_ID_CARBON),
/obj/item/ore/phoron = list(REAGENT_ID_PHORON),
/obj/item/ore/silver = list("silver"),
/obj/item/ore/gold = list("gold"),
/obj/item/ore/silver = list(REAGENT_ID_SILVER),
/obj/item/ore/gold = list(REAGENT_ID_GOLD),
/obj/item/ore/marble = list(REAGENT_ID_SILICON,REAGENT_ID_ALUMINIUM,REAGENT_ID_ALUMINIUM,REAGENT_ID_SODIUM,REAGENT_ID_CALCIUM), // Some nice variety here
/obj/item/ore/uranium = list("uranium"),
/obj/item/ore/diamond = list(REAGENT_ID_CARBON),
/obj/item/ore/osmium = list("platinum"), // should contain osmium
/obj/item/ore/osmium = list(REAGENT_ID_PLATINUM), // should contain osmium
/obj/item/ore/lead = list(REAGENT_ID_LEAD),
/obj/item/ore/hydrogen = list(REAGENT_ID_HYDROGEN),
/obj/item/ore/verdantium = list(REAGENT_ID_RADIUM,REAGENT_ID_PHORON,REAGENT_ID_NITROGEN,REAGENT_ID_PHOSPHORUS,REAGENT_ID_SODIUM), // Some fun stuff to be useful with
code/modules/reagents/reactions/instant/drinks.dm
+3 -3
View File
@@ -51,14 +51,14 @@
name = "Goldschlager"
id = "goldschlager"
result = "goldschlager"
required_reagents = list("vodka" = 10, "gold" = 1)
required_reagents = list("vodka" = 10, REAGENT_ID_GOLD = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/patron
name = "Patron"
id = "patron"
result = "patron"
required_reagents = list("tequilla" = 10, "silver" = 1)
required_reagents = list("tequilla" = 10, REAGENT_ID_SILVER = 1)
result_amount = 10
/decl/chemical_reaction/instant/drinks/bilk
@@ -1254,7 +1254,7 @@
name = "Angel Ichor"
id = "holywine"
result = "holywine"
required_reagents = list("grapejuice" = 5, "gold" = 5)
required_reagents = list("grapejuice" = 5, REAGENT_ID_GOLD = 5)
catalysts = list("holywater" = 5)
result_amount = 10
code/modules/reagents/reactions/instant/instant.dm
+34 -34
View File
@@ -575,21 +575,21 @@
/decl/chemical_reaction/instant/solidification/silver
name = "Solid Silver"
id = "solidsilver"
required_reagents = list("frostoil" = 5, "silver" = REAGENTS_PER_SHEET)
required_reagents = list("frostoil" = 5, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/silver
/decl/chemical_reaction/instant/solidification/gold
name = "Solid Gold"
id = "solidgold"
required_reagents = list("frostoil" = 5, "gold" = REAGENTS_PER_SHEET)
required_reagents = list("frostoil" = 5, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/gold
/decl/chemical_reaction/instant/solidification/platinum
name = "Solid Platinum"
id = "solidplatinum"
required_reagents = list("frostoil" = 5, "platinum" = REAGENTS_PER_SHEET)
required_reagents = list("frostoil" = 5, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/platinum
@@ -898,8 +898,8 @@
/decl/chemical_reaction/instant/red_paint
name = "Red paint"
id = "red_paint"
result = "paint"
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_red" = 1)
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKRED = 1)
result_amount = 5
/decl/chemical_reaction/instant/red_paint/send_data()
@@ -908,8 +908,8 @@
/decl/chemical_reaction/instant/orange_paint
name = "Orange paint"
id = "orange_paint"
result = "paint"
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_orange" = 1)
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKORANGE = 1)
result_amount = 5
/decl/chemical_reaction/instant/orange_paint/send_data()
@@ -918,8 +918,8 @@
/decl/chemical_reaction/instant/yellow_paint
name = "Yellow paint"
id = "yellow_paint"
result = "paint"
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_yellow" = 1)
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKYELLOW = 1)
result_amount = 5
/decl/chemical_reaction/instant/yellow_paint/send_data()
@@ -928,8 +928,8 @@
/decl/chemical_reaction/instant/green_paint
name = "Green paint"
id = "green_paint"
result = "paint"
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_green" = 1)
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREEN = 1)
result_amount = 5
/decl/chemical_reaction/instant/green_paint/send_data()
@@ -938,8 +938,8 @@
/decl/chemical_reaction/instant/blue_paint
name = "Blue paint"
id = "blue_paint"
result = "paint"
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_blue" = 1)
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBLUE = 1)
result_amount = 5
/decl/chemical_reaction/instant/blue_paint/send_data()
@@ -948,8 +948,8 @@
/decl/chemical_reaction/instant/purple_paint
name = "Purple paint"
id = "purple_paint"
result = "paint"
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_purple" = 1)
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKPURPLE = 1)
result_amount = 5
/decl/chemical_reaction/instant/purple_paint/send_data()
@@ -958,8 +958,8 @@
/decl/chemical_reaction/instant/grey_paint //mime
name = "Grey paint"
id = "grey_paint"
result = "paint"
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_grey" = 1)
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREY = 1)
result_amount = 5
/decl/chemical_reaction/instant/grey_paint/send_data()
@@ -968,8 +968,8 @@
/decl/chemical_reaction/instant/brown_paint
name = "Brown paint"
id = "brown_paint"
result = "paint"
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_brown" = 1)
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBROWN = 1)
result_amount = 5
/decl/chemical_reaction/instant/brown_paint/send_data()
@@ -978,7 +978,7 @@
/decl/chemical_reaction/instant/blood_paint
name = "Blood paint"
id = "blood_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2)
result_amount = 5
@@ -991,7 +991,7 @@
/decl/chemical_reaction/instant/milk_paint
name = "Milk paint"
id = "milk_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "milk" = 5)
result_amount = 5
@@ -1001,7 +1001,7 @@
/decl/chemical_reaction/instant/orange_juice_paint
name = "Orange juice paint"
id = "orange_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5)
result_amount = 5
@@ -1011,7 +1011,7 @@
/decl/chemical_reaction/instant/tomato_juice_paint
name = "Tomato juice paint"
id = "tomato_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5)
result_amount = 5
@@ -1021,7 +1021,7 @@
/decl/chemical_reaction/instant/lime_juice_paint
name = "Lime juice paint"
id = "lime_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "limejuice" = 5)
result_amount = 5
@@ -1031,7 +1031,7 @@
/decl/chemical_reaction/instant/carrot_juice_paint
name = "Carrot juice paint"
id = "carrot_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5)
result_amount = 5
@@ -1041,7 +1041,7 @@
/decl/chemical_reaction/instant/berry_juice_paint
name = "Berry juice paint"
id = "berry_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5)
result_amount = 5
@@ -1051,7 +1051,7 @@
/decl/chemical_reaction/instant/grape_juice_paint
name = "Grape juice paint"
id = "grape_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5)
result_amount = 5
@@ -1061,7 +1061,7 @@
/decl/chemical_reaction/instant/poisonberry_juice_paint
name = "Poison berry juice paint"
id = "poisonberry_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5)
result_amount = 5
@@ -1071,7 +1071,7 @@
/decl/chemical_reaction/instant/watermelon_juice_paint
name = "Watermelon juice paint"
id = "watermelon_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5)
result_amount = 5
@@ -1081,7 +1081,7 @@
/decl/chemical_reaction/instant/lemon_juice_paint
name = "Lemon juice paint"
id = "lemon_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5)
result_amount = 5
@@ -1091,7 +1091,7 @@
/decl/chemical_reaction/instant/banana_juice_paint
name = "Banana juice paint"
id = "banana_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "banana" = 5)
result_amount = 5
@@ -1101,7 +1101,7 @@
/decl/chemical_reaction/instant/potato_juice_paint
name = "Potato juice paint"
id = "potato_juice_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5)
result_amount = 5
@@ -1111,7 +1111,7 @@
/decl/chemical_reaction/instant/carbon_paint
name = "Carbon paint"
id = "carbon_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARBON = 1)
result_amount = 5
@@ -1121,7 +1121,7 @@
/decl/chemical_reaction/instant/aluminum_paint
name = "Aluminum paint"
id = "aluminum_paint"
result = "paint"
result = REAGENT_ID_PAINT
required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1)
result_amount = 5
code/modules/reagents/reagent_containers/pill.dm
+1 -1
View File
@@ -156,7 +156,7 @@
/obj/item/reagent_containers/pill/adminordrazine/Initialize()
. = ..()
reagents.add_reagent("adminordrazine", 5)
reagents.add_reagent(REAGENT_ID_ADMINORDRAZINE, 5)
/obj/item/reagent_containers/pill/stox
code/modules/reagents/reagents/other.dm
+48 -48
View File
@@ -1,8 +1,8 @@
/* Paint and crayons */
/datum/reagent/crayon_dust
name = "Crayon dust"
id = "crayon_dust"
name = REAGENT_CRAYONDUST
id = REAGENT_ID_CRAYONDUST
description = "Intensely coloured powder obtained by grinding crayons."
taste_description = "powdered wax"
reagent_state = LIQUID
@@ -10,48 +10,48 @@
overdose = 5
/datum/reagent/crayon_dust/red
name = "Red crayon dust"
id = "crayon_dust_red"
name = REAGENT_CRAYONDUSTRED
id = REAGENT_ID_CRAYONDUSTRED
color = "#FE191A"
/datum/reagent/crayon_dust/orange
name = "Orange crayon dust"
id = "crayon_dust_orange"
name = REAGENT_CRAYONDUSTORANGE
id = REAGENT_ID_CRAYONDUSTORANGE
color = "#FFBE4F"
/datum/reagent/crayon_dust/yellow
name = "Yellow crayon dust"
id = "crayon_dust_yellow"
name = REAGENT_CRAYONDUSTYELLOW
id = REAGENT_ID_CRAYONDUSTYELLOW
color = "#FDFE7D"
/datum/reagent/crayon_dust/green
name = "Green crayon dust"
id = "crayon_dust_green"
name = REAGENT_CRAYONDUSTGREEN
id = REAGENT_ID_CRAYONDUSTGREEN
color = "#18A31A"
/datum/reagent/crayon_dust/blue
name = "Blue crayon dust"
id = "crayon_dust_blue"
name = REAGENT_CRAYONDUSTBLUE
id = REAGENT_ID_CRAYONDUSTBLUE
color = "#247CFF"
/datum/reagent/crayon_dust/purple
name = "Purple crayon dust"
id = "crayon_dust_purple"
name = REAGENT_CRAYONDUSTPURPLE
id = REAGENT_ID_CRAYONDUSTPURPLE
color = "#CC0099"
/datum/reagent/crayon_dust/grey //Mime
name = "Grey crayon dust"
id = "crayon_dust_grey"
name = REAGENT_CRAYONDUSTGREY
id = REAGENT_ID_CRAYONDUSTGREY
color = "#808080"
/datum/reagent/crayon_dust/brown //Rainbow
name = "Brown crayon dust"
id = "crayon_dust_brown"
name = REAGENT_CRAYONDUSTBROWN
id = REAGENT_ID_CRAYONDUSTBROWN
color = "#846F35"
/datum/reagent/marker_ink
name = "Marker ink"
id = "marker_ink"
name = REAGENT_MARKERINK
id = REAGENT_ID_MARKERINK
description = "Intensely coloured ink used in markers."
taste_description = "extremely bitter"
reagent_state = LIQUID
@@ -59,53 +59,53 @@
overdose = 5
/datum/reagent/marker_ink/black
name = "Black marker ink"
id = "marker_ink_black"
name = REAGENT_MARKERINKBLACK
id = REAGENT_ID_MARKERINKBLACK
color = "#000000"
/datum/reagent/marker_ink/red
name = "Red marker ink"
id = "marker_ink_red"
name = REAGENT_MARKERINKRED
id = REAGENT_ID_MARKERINKRED
color = "#FE191A"
/datum/reagent/marker_ink/orange
name = "Orange marker ink"
id = "marker_ink_orange"
name = REAGENT_MARKERINKORANGE
id = REAGENT_ID_MARKERINKORANGE
color = "#FFBE4F"
/datum/reagent/marker_ink/yellow
name = "Yellow marker ink"
id = "marker_ink_yellow"
name = REAGENT_MARKERINKYELLOW
id = REAGENT_ID_MARKERINKYELLOW
color = "#FDFE7D"
/datum/reagent/marker_ink/green
name = "Green marker ink"
id = "marker_ink_green"
name = REAGENT_MARKERINKGREEN
id = REAGENT_ID_MARKERINKGREEN
color = "#18A31A"
/datum/reagent/marker_ink/blue
name = "Blue marker ink"
id = "marker_ink_blue"
name = REAGENT_MARKERINKBLUE
id = REAGENT_ID_MARKERINKBLUE
color = "#247CFF"
/datum/reagent/marker_ink/purple
name = "Purple marker ink"
id = "marker_ink_purple"
name = REAGENT_MARKERINKPURPLE
id = REAGENT_ID_MARKERINKPURPLE
color = "#CC0099"
/datum/reagent/marker_ink/grey //Mime
name = "Grey marker ink"
id = "marker_ink_grey"
name = REAGENT_MARKERINKGREY
id = REAGENT_ID_MARKERINKGREY
color = "#808080"
/datum/reagent/marker_ink/brown //Rainbow
name = "Brown marker ink"
id = "marker_ink_brown"
name = REAGENT_MARKERINKBROWN
id = REAGENT_ID_MARKERINKBROWN
color = "#846F35"
/datum/reagent/paint
name = "Paint"
id = "paint"
name = REAGENT_PAINT
id = REAGENT_ID_PAINT
description = "This paint will stick to almost any object."
taste_description = "chalk"
reagent_state = LIQUID
@@ -164,8 +164,8 @@
/* Things that didn't fit anywhere else */
/datum/reagent/adminordrazine //An OP chemical for admins
name = "Adminordrazine"
id = "adminordrazine"
name = REAGENT_ADMINORDRAZINE
id = REAGENT_ID_ADMINORDRAZINE
description = "It's magic. We don't have to explain it."
taste_description = "bwoink"
reagent_state = LIQUID
@@ -232,24 +232,24 @@
O.wounds -= W
/datum/reagent/gold
name = "Gold"
id = "gold"
name = REAGENT_GOLD
id = REAGENT_ID_GOLD
description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
taste_description = "metal"
reagent_state = SOLID
color = "#F7C430"
/datum/reagent/silver
name = "Silver"
id = "silver"
name = REAGENT_SILVER
id = REAGENT_ID_SILVER
description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
taste_description = "metal"
reagent_state = SOLID
color = "#D0D0D0"
/datum/reagent/platinum
name = "Platinum"
id = "platinum"
name = REAGENT_PLATINUM
id = REAGENT_ID_PLATINUM
description = "Platinum is a dense, malleable, ductile, highly unreactive, precious, gray-white transition metal. It is very resistant to corrosion."
taste_description = "metal"
reagent_state = SOLID
code/modules/research/designs/bag_of_holding.dm
+5 -6
View File
@@ -36,7 +36,7 @@
desc = "Considerably more utilitarian than the Bag of Holding, the Trashbag of Holding is a janitor's best friend."
id = "trashbag_holding"
req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 5)
materials = list("gold" = 2000, "diamond" = 1000, "uranium" = 250)
materials = list(MAT_GOLD = 2000, MAT_DIAMOND = 1000, MAT_URANIUM = 250)
build_path = /obj/item/storage/bag/trash/holding
sort_string = "QAAAC"
@@ -45,17 +45,17 @@
desc = "Somehow compresses the storage of a backpack into a pouch-sized container!"
id = "pouch_holding"
req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 5)
materials = list("gold" = 3000, "diamond" = 2000, "uranium" = 250)
materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_URANIUM = 250)
build_path = /obj/item/storage/pouch/holding
sort_string = "QAAAD"
/datum/design/item/boh/belt_holding_med
name = "Medical Belt of Holding"
desc = "A belt that uses localized bluespace pockets to hold more items than expected!"
id = "belt_holding_med"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
materials = list("gold" = 3000, "diamond" = 2000, "titanium" = 500)
materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_TITANIUM = 500)
build_path = /obj/item/storage/belt/medical/holding
sort_string = "QAAAE"
@@ -64,7 +64,6 @@
desc = "A belt that uses localized bluespace pockets to hold more items than expected!"
id = "belt_holding_utility"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
materials = list("gold" = 3000, "diamond" = 2000, "titanium" = 500)
materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 2000, MAT_TITANIUM = 500)
build_path = /obj/item/storage/belt/utility/holding
sort_string = "QAAAF"
code/modules/vore/eating/living_vr.dm
+18 -18
View File
@@ -1044,20 +1044,20 @@
//List in list, define by material property of ore in code/mining/modules/ore.dm.
//50 nutrition = 5 ore to get 250 nutrition. 250 is the beginning of the 'well fed' range.
var/list/rock_munch = list(
MAT_URANIUM = list("nutrition" = 30, "remark" = "Crunching [O] in your jaws almost makes you wince, a horribly tangy and sour flavour radiating through your mouth. It goes down all the same.", "WTF" = FALSE),
"hematite" = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE),
REAGENT_ID_CARBON = list("nutrition" = 15, "remark" = "Utterly bitter, crunching down on [O] only makes you long for better things. But a snack's a snack...", "WTF" = FALSE),
"marble" = list("nutrition" = 40, "remark" = "A fitting dessert, the sweet and savoury [O] lingers on the palate and satisfies your hunger.", "WTF" = FALSE),
"sand" = list("nutrition" = 0, "remark" = "You crunch on [O] but its texture is almost gag-inducing. Stifling a cough, you somehow manage to swallow both [O] and your regrets.", "WTF" = FALSE),
MAT_PHORON = list("nutrition" = 30, "remark" = "Crunching [O] to dust between your jaw you find pleasant, comforting warmth filling your mouth that briefly spreads down the throat to your chest as you swallow.", "WTF" = FALSE),
MAT_SILVER = list("nutrition" = 40, "remark" = "[O] tastes quite nice indeed as you munch on it. A little tarnished, but that's just fine aging.", "WTF" = FALSE),
MAT_GOLD = list("nutrition" = 40, "remark" = "You taste supreme richness that exceeds expectations and satisfies your hunger.", "WTF" = FALSE),
MAT_DIAMOND = list("nutrition" = 50, "remark" = "The heavenly taste of [O] almost brings a tear to your eye. Its glimmering gloriousness is even better on the tongue than you imagined, so you savour it fondly.", "WTF" = FALSE),
"platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE),
MAT_METALHYDROGEN = list("nutrition" = 30, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE),
"rutile" = list("nutrition" = 50, "remark" = "A little... angular, you savour the light but chewy [O], finishing it quickly.", "WTF" = FALSE),
MAT_VERDANTIUM = list("nutrition" = 50, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE),
MAT_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE)
ORE_URANIUM = list("nutrition" = 30, "remark" = "Crunching [O] in your jaws almost makes you wince, a horribly tangy and sour flavour radiating through your mouth. It goes down all the same.", "WTF" = FALSE),
ORE_HEMATITE = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE),
ORE_CARBON = list("nutrition" = 15, "remark" = "Utterly bitter, crunching down on [O] only makes you long for better things. But a snack's a snack...", "WTF" = FALSE),
ORE_MARBLE = list("nutrition" = 40, "remark" = "A fitting dessert, the sweet and savoury [O] lingers on the palate and satisfies your hunger.", "WTF" = FALSE),
ORE_SAND = list("nutrition" = 0, "remark" = "You crunch on [O] but its texture is almost gag-inducing. Stifling a cough, you somehow manage to swallow both [O] and your regrets.", "WTF" = FALSE),
ORE_PHORON = list("nutrition" = 30, "remark" = "Crunching [O] to dust between your jaw you find pleasant, comforting warmth filling your mouth that briefly spreads down the throat to your chest as you swallow.", "WTF" = FALSE),
ORE_SILVER = list("nutrition" = 40, "remark" = "[O] tastes quite nice indeed as you munch on it. A little tarnished, but that's just fine aging.", "WTF" = FALSE),
ORE_GOLD = list("nutrition" = 40, "remark" = "You taste supreme richness that exceeds expectations and satisfies your hunger.", "WTF" = FALSE),
ORE_DIAMOND = list("nutrition" = 50, "remark" = "The heavenly taste of [O] almost brings a tear to your eye. Its glimmering gloriousness is even better on the tongue than you imagined, so you savour it fondly.", "WTF" = FALSE),
ORE_PLATINUM = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE),
ORE_MHYDROGEN = list("nutrition" = 30, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE),
ORE_RUTILE = list("nutrition" = 50, "remark" = "A little... angular, you savour the light but chewy [O], finishing it quickly.", "WTF" = FALSE),
ORE_VERDANTIUM = list("nutrition" = 50, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE),
ORE_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE)
)
if(O.material in rock_munch)
nom = rock_munch[O.material]
@@ -1085,18 +1085,18 @@
MAT_PLASTITANIUM = list("nutrition" = 60, "remark" = "A glorious marriage of richness and mildly sour with cool refreshing finish. [O] practically begs to be savoured, lingering on the palate long enough to tempt another bite.", "WTF" = FALSE),
MAT_PLASTITANIUMGLASS = list("nutrition" = 25, "remark" = "After some work, you grind [O] down with a satisfying crunch to unleash a sublime mixture of mildly sour richness and cooling refreshment. It readily entices you for another bite.", "WTF" = FALSE),
MAT_GLASS = list("nutrition" = 0, "remark" = "All crunch and nothing more, you effortlessly grind [O] down to find it only wets your appetite and dries the throat.", "WTF" = FALSE),
"rglass" = list("nutrition" = 5, "remark" = "With a satisfying crunch, you grind [O] down with ease. It is barely palatable with a subtle metallic tang.", "WTF" = FALSE),
MAT_RGLASS = list("nutrition" = 5, "remark" = "With a satisfying crunch, you grind [O] down with ease. It is barely palatable with a subtle metallic tang.", "WTF" = FALSE),
MAT_BOROSILICATE = list("nutrition" = 10, "remark" = "With a satisfying crunch, you grind [O] down with ease and find it somewhat palatable due to a subtle but familiar rush of phoronic warmth.", "WTF" = FALSE),
"reinforced borosilicate glass" = list("nutrition" = 15, "remark" = "With a satisfying crunch, you grind [O] down. It is quite palatable due to a subtle metallic tang and familiar rush of phoronic warmth.", "WTF" = FALSE),
MAT_RPGLASS = list("nutrition" = 15, "remark" = "With a satisfying crunch, you grind [O] down. It is quite palatable due to a subtle metallic tang and familiar rush of phoronic warmth.", "WTF" = FALSE),
MAT_GRAPHITE = list("nutrition" = 30, "remark" = "Satisfyingly metallic with a mildly savoury tartness, you chew [O] until its flavour is no more but are left longing for another.", "WTF" = FALSE),
MAT_OSMIUM = list("nutrition" = 45, "remark" = "Successive bites serve to almost chill your palate, a rush of rich and mildly sour flavour unlocked with the grinding of your powerful jaws. Delectable.", "WTF" = FALSE),
MAT_METALHYDROGEN = list("nutrition" = 35, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE),
"platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE),
MAT_PLATINUM = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE),
MAT_IRON = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE),
MAT_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE),
MAT_VERDANTIUM = list("nutrition" = 55, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE),
MAT_MORPHIUM = list("nutrition" = 75, "remark" = "The question, the answer and the taste: It all floods your mouth and your mind to momentarily overwhelm the senses. What the hell was that? Your mouth and throat are left tingling for a while.", "WTF" = 10),
"alienalloy" = list("nutrition" = 120, "remark" = "Working hard for so long to rend the material apart has left your jaw sore, but a veritable explosion of mind boggling indescribable flavour is unleashed. Completely alien sensations daze and overwhelm you while it feels like an interdimensional rift opened in your mouth, briefly numbing your face.", "WTF" = 15)
MAT_ALIENALLOY = list("nutrition" = 120, "remark" = "Working hard for so long to rend the material apart has left your jaw sore, but a veritable explosion of mind boggling indescribable flavour is unleashed. Completely alien sensations daze and overwhelm you while it feels like an interdimensional rift opened in your mouth, briefly numbing your face.", "WTF" = 15)
)
if(O.default_type in refined_taste)
var/obj/item/stack/material/stack = O.split(1) //A little off the top.
code/modules/xenoarcheaology/tools/geosample_scanner.dm
+1 -1
View File
@@ -57,7 +57,7 @@
coolant_reagents_purity["hyperzine"] = 0.8
coolant_reagents_purity["cryoxadone"] = 0.9
coolant_reagents_purity["coolant"] = 1
coolant_reagents_purity["adminordrazine"] = 2
coolant_reagents_purity[REAGENT_ID_ADMINORDRAZINE] = 2
/obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob)
if(scanning)
code/modules/xenobio/items/extracts.dm
+9 -9
View File
@@ -157,22 +157,22 @@
/decl/chemical_reaction/instant/metamorphic/silver
name = "Morph into Silver"
id = "morph_silver"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "silver" = REAGENTS_PER_SHEET)
result = "silver"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
result = REAGENT_ID_SILVER
/decl/chemical_reaction/instant/metamorphic/gold
name = "Morph into Gold"
id = "morph_gold"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "gold" = REAGENTS_PER_SHEET)
result = "gold"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
result = REAGENT_ID_GOLD
/decl/chemical_reaction/instant/metamorphic/platinum
name = "Morph into Platinum"
id = "morph_platinum"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "platinum" = REAGENTS_PER_SHEET)
result = "platinum"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
result = REAGENT_ID_PLATINUM
/decl/chemical_reaction/instant/metamorphic/uranium
@@ -236,7 +236,7 @@
/decl/chemical_reaction/instant/binding/plasteel // Two parts 'steel', one part platnium matches the smelter alloy recipe.
name = "Bind into Plasteel"
id = "bind_plasteel"
required_reagents = list("binding" = REAGENTS_PER_SHEET, "steel" = REAGENTS_PER_SHEET * 2, "platinum" = REAGENTS_PER_SHEET)
required_reagents = list("binding" = REAGENTS_PER_SHEET, "steel" = REAGENTS_PER_SHEET * 2, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
result = "plasteel"
/datum/reagent/plasteel
@@ -406,7 +406,7 @@
/decl/chemical_reaction/instant/slime/gold_gold
name = "Slime Gold"
id = "m_gold"
result = "gold"
result = REAGENT_ID_GOLD
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 5
required = /obj/item/slime_extract/gold
@@ -425,7 +425,7 @@
/decl/chemical_reaction/instant/slime/silver_silver
name = "Slime Silver"
id = "m_silver"
result = "silver"
result = REAGENT_ID_SILVER
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 5
required = /obj/item/slime_extract/silver
code/modules/xenobio2/_xeno_setup_vr.dm
+2 -2
View File
@@ -39,8 +39,8 @@
xenoChemList += "serotrotium"
xenoChemList += REAGENT_ID_NICOTINE
xenoChemList += "uranium"
xenoChemList += "silver"
xenoChemList += "gold"
xenoChemList += REAGENT_ID_SILVER
xenoChemList += REAGENT_ID_GOLD
xenoChemList += "adrenaline"
xenoChemList += "holywater"
xenoChemList += "ammonia"
code/modules/xenobio2/mob/slime/slime.dm
+1 -1
View File
@@ -74,7 +74,7 @@ Slime definitions, Life and New live here.
"slimejelly" = list(XENO_CHEM_NUTRI = 0.5),
"amutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1.5, XENO_CHEM_MUT = 3),
"mutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1, XENO_CHEM_MUT = 1.5),
"gold" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3),
REAGENT_ID_GOLD = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3),
"uranium" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2),
"glycerol" = list(XENO_CHEM_NUTRI = 0.6),
"woodpulp" = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7),