mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 05:23:22 +01:00
Materials subsystem, material defines instead of strings, structure materials. (#8447)
The shitcode crusade begins.
This commit is contained in:
@@ -198,7 +198,7 @@
|
||||
fallback_specific_heat = 0.241
|
||||
|
||||
/datum/reagent/uranium
|
||||
name ="Uranium"
|
||||
name = "Uranium"
|
||||
id = "uranium"
|
||||
description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
|
||||
reagent_state = SOLID
|
||||
|
||||
@@ -1884,7 +1884,7 @@
|
||||
name = "Goldschlager"
|
||||
id = "goldschlager"
|
||||
result = "goldschlager"
|
||||
required_reagents = list("vodka" = 10, "gold" = 1)
|
||||
required_reagents = list("vodka" = 10, MATERIAL_GOLD = 1)
|
||||
mix_message = null
|
||||
reaction_sound = 'sound/effects/pour.ogg'
|
||||
result_amount = 10
|
||||
@@ -1893,7 +1893,7 @@
|
||||
name = "Patron"
|
||||
id = "patron"
|
||||
result = "patron"
|
||||
required_reagents = list("tequilla" = 10, "silver" = 1)
|
||||
required_reagents = list("tequilla" = 10, MATERIAL_SILVER = 1)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/drink/bilk
|
||||
@@ -3386,7 +3386,7 @@
|
||||
name = "Transmutation: Gold"
|
||||
id = "transmutation_gold"
|
||||
result = null
|
||||
required_reagents = list("aluminum" = 5, "silver" = 5)
|
||||
required_reagents = list("aluminum" = 5, MATERIAL_SILVER = 5)
|
||||
catalysts = list("philosopher_stone" = 1)
|
||||
result_amount = 1
|
||||
|
||||
@@ -3400,7 +3400,7 @@
|
||||
name = "Transmutation: Diamond"
|
||||
id = "transmutation_diamond"
|
||||
result = null
|
||||
required_reagents = list("carbon" = 5, "gold" = 5)
|
||||
required_reagents = list("carbon" = 5, MATERIAL_GOLD = 5)
|
||||
catalysts = list("philosopher_stone" = 1)
|
||||
result_amount = 1
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
|
||||
force = 5
|
||||
var/smash_duration = 5 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets)
|
||||
matter = list("glass" = 800)
|
||||
matter = list(MATERIAL_GLASS = 800)
|
||||
|
||||
var/obj/item/reagent_containers/glass/rag/rag = null
|
||||
var/rag_underlay = "rag"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
volume = 30
|
||||
unacidable = 1 //glass
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
matter = list("glass" = 300)
|
||||
matter = list(MATERIAL_GLASS = 300)
|
||||
|
||||
on_reagent_change()
|
||||
/*if(reagents.reagent_list.len > 1 )
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
desc = "A glass jar. You can put the lid back on and use it for other things."
|
||||
icon = 'icons/obj/drinks.dmi'
|
||||
icon_state = "jar"
|
||||
matter = list("glass" = 5000)
|
||||
matter = list(MATERIAL_GLASS = 5000)
|
||||
center_of_mass = list("x"=15, "y"=8)
|
||||
w_class = 3.0
|
||||
amount_per_transfer_from_this = 20
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
icon_state = "beaker"
|
||||
item_state = "beaker"
|
||||
center_of_mass = list("x" = 15,"y" = 11)
|
||||
matter = list("glass" = 500)
|
||||
matter = list(MATERIAL_GLASS = 500)
|
||||
drop_sound = 'sound/items/drop/glass.ogg'
|
||||
fragile = 4
|
||||
|
||||
@@ -149,7 +149,7 @@
|
||||
desc = "A large beaker."
|
||||
icon_state = "beakerlarge"
|
||||
center_of_mass = list("x" = 16,"y" = 11)
|
||||
matter = list("glass" = 5000)
|
||||
matter = list(MATERIAL_GLASS = 5000)
|
||||
volume = 120
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5,10,15,25,30,60,120)
|
||||
@@ -175,7 +175,7 @@
|
||||
desc = "A cryostasis beaker that allows for chemical storage without reactions."
|
||||
icon_state = "beakernoreact"
|
||||
center_of_mass = list("x" = 16,"y" = 13)
|
||||
matter = list("glass" = 500)
|
||||
matter = list(MATERIAL_GLASS = 500)
|
||||
volume = 60
|
||||
amount_per_transfer_from_this = 10
|
||||
flags = OPENCONTAINER | NOREACT
|
||||
@@ -186,7 +186,7 @@
|
||||
desc = "A bluespace beaker, powered by experimental bluespace technology."
|
||||
icon_state = "beakerbluespace"
|
||||
center_of_mass = list("x" = 16,"y" = 11)
|
||||
matter = list("glass" = 5000)
|
||||
matter = list(MATERIAL_GLASS = 5000)
|
||||
volume = 300
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5,10,15,25,30,60,120,300)
|
||||
@@ -198,7 +198,7 @@
|
||||
desc = "A small glass vial."
|
||||
icon_state = "vial"
|
||||
center_of_mass = list("x" = 15,"y" = 9)
|
||||
matter = list("glass" = 250)
|
||||
matter = list(MATERIAL_GLASS = 250)
|
||||
volume = 30
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = list(5,10,15,25)
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
var/armorcheck = 1
|
||||
var/time = 3 SECONDS
|
||||
var/image/filling //holds a reference to the current filling overlay
|
||||
matter = list("glass" = 400, DEFAULT_WALL_MATERIAL = 200)
|
||||
matter = list(MATERIAL_GLASS = 400, DEFAULT_WALL_MATERIAL = 200)
|
||||
|
||||
/obj/item/reagent_containers/hypospray/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
slot_flags = SLOT_BELT
|
||||
center_of_mass = null
|
||||
var/used = FALSE
|
||||
matter = list("glass" = 400, DEFAULT_WALL_MATERIAL = 200)
|
||||
matter = list(MATERIAL_GLASS = 400, DEFAULT_WALL_MATERIAL = 200)
|
||||
|
||||
/obj/item/reagent_containers/inhaler/Initialize()
|
||||
. =..()
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
item_state = "syringe_0"
|
||||
icon_state = "0"
|
||||
center_of_mass = list("x" = 16,"y" = 14)
|
||||
matter = list("glass" = 150)
|
||||
matter = list(MATERIAL_GLASS = 150)
|
||||
amount_per_transfer_from_this = 5
|
||||
possible_transfer_amounts = null
|
||||
volume = 15
|
||||
|
||||
Reference in New Issue
Block a user