cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +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/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