cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 12:35:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons

Browse Source
This commit is contained in:
Jordie0608
2015-05-17 01:58:46 +10:00
parent 112e1d0810
commit 2b9c8ac98c
19 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+1 -1
View File
@@ -431,7 +431,7 @@
icon_state = "glass_brown"
name = "Glass of bilk"
desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
if("fuel")
if("welding_fuel")
icon_state = "dr_gibb_glass"
name = "Glass of welder fuel"
desc = "Unless you're an industrial tool, this is probably not safe for consumption."
code/modules/food&drinks/recipes/drinks_recipes.dm
+1 -1
View File
@@ -206,7 +206,7 @@
name = "Hooch"
id = "hooch"
result = "hooch"
required_reagents = list ("ethanol" = 2, "fuel" = 1)
required_reagents = list ("ethanol" = 2, "welding_fuel" = 1)
required_catalysts = list("enzyme" = 1)
result_amount = 3
code/modules/hydroponics/seeds.dm
+1 -1
View File
@@ -1372,7 +1372,7 @@
if(prob(20))
mutations.Remove(pick(temp_mut_list))
temp_mut_list.Cut()
if(S.has_reagent("fuel", 5))
if(S.has_reagent("welding_fuel", 5))
for(var/datum/spacevine_mutation/SM in mutations)
if(SM.quality == POSITIVE)
temp_mut_list += SM
code/modules/reagents/Chemistry-Machinery.dm
+2 -2
View File
@@ -21,7 +21,7 @@
var/uiname = "Chem Dispenser 5000"
var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine",
"sodium","aluminium","silicon","phosphorus","sulfur","chlorine","potassium","iron",
"copper","mercury","radium","water","ethanol","sugar","sacid","fuel","silver","iodine","bromine","stable_plasma")
"copper","mercury","radium","water","ethanol","sugar","sacid","welding_fuel","silver","iodine","bromine","stable_plasma")
/obj/machinery/chem_dispenser/proc/recharge()
if(stat & (BROKEN|NOPOWER)) return
@@ -192,7 +192,7 @@
dispensable_reagents = list()
var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen", "water"),
list("lithium", "sugar", "sacid", "copper", "mercury", "sodium","iodine","bromine"),
list("ethanol", "chlorine", "potassium", "aluminium", "radium", "fluorine", "iron", "fuel","silver","stable_plasma"))
list("ethanol", "chlorine", "potassium", "aluminium", "radium", "fluorine", "iron", "welding_fuel","silver","stable_plasma"))
/obj/machinery/chem_dispenser/constructable/New()
..()
code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
+1 -1
View File
@@ -518,7 +518,7 @@ datum/reagent/silicon
datum/reagent/fuel
name = "Welding fuel"
id = "fuel"
id = "welding_fuel"
description = "Required for welders. Flamable."
color = "#660000" // rgb: 102, 0, 0
code/modules/reagents/Chemistry-Recipes/Drugs.dm
+2 -2
View File
@@ -9,7 +9,7 @@
name = "Crank"
id = "crank"
result = "crank"
required_reagents = list("diphenhydramine" = 1, "ammonia" = 1, "lithium" = 1, "sacid" = 1, "fuel" = 1)
required_reagents = list("diphenhydramine" = 1, "ammonia" = 1, "lithium" = 1, "sacid" = 1, "welding_fuel" = 1)
result_amount = 5
mix_message = "The mixture violently reacts, leaving behind a few crystalline shards."
required_temp = 390
@@ -19,7 +19,7 @@
name = "Krokodil"
id = "krokodil"
result = "krokodil"
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "fuel" = 1)
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "welding_fuel" = 1)
result_amount = 6
mix_message = "The mixture dries into a pale blue powder."
required_temp = 380
code/modules/reagents/Chemistry-Recipes/Medicine.dm
+1 -1
View File
@@ -92,7 +92,7 @@
name = "Pentetic Acid"
id = "pen_acid"
result = "pen_acid"
required_reagents = list("fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
required_reagents = list("welding_fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
result_amount = 6
/datum/chemical_reaction/sal_acid
code/modules/reagents/Chemistry-Recipes/Others.dm
+2 -2
View File
@@ -249,7 +249,7 @@ datum/chemical_reaction/pestkiller
name = "acetone"
id = "acetone"
result = "acetone"
required_reagents = list("oil" = 1, "fuel" = 1, "oxygen" = 1)
required_reagents = list("oil" = 1, "welding_fuel" = 1, "oxygen" = 1)
result_amount = 3
/datum/chemical_reaction/carpet
@@ -264,7 +264,7 @@ datum/chemical_reaction/pestkiller
name = "Oil"
id = "oil"
result = "oil"
required_reagents = list("fuel" = 1, "carbon" = 1, "hydrogen" = 1)
required_reagents = list("welding_fuel" = 1, "carbon" = 1, "hydrogen" = 1)
result_amount = 3
/datum/chemical_reaction/phenol
code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
+1 -1
View File
@@ -325,7 +325,7 @@
name = "Napalm"
id = "napalm"
result = "napalm"
required_reagents = list("sugar" = 1, "fuel" = 1, "ethanol" = 1 )
required_reagents = list("sugar" = 1, "welding_fuel" = 1, "ethanol" = 1 )
result_amount = 3
code/modules/reagents/Chemistry-Recipes/Toxins.dm
+1 -1
View File
@@ -27,7 +27,7 @@
name = "Itching Powder"
id = "itching_powder"
result = "itching_powder"
required_reagents = list("fuel" = 1, "ammonia" = 1, "charcoal" = 1)
required_reagents = list("welding_fuel" = 1, "ammonia" = 1, "charcoal" = 1)
result_amount = 3
/datum/chemical_reaction/facid
code/modules/reagents/reagent_dispenser.dm
+1 -1
View File
@@ -91,7 +91,7 @@
amount_per_transfer_from_this = 10
New()
..()
reagents.add_reagent("fuel",1000)
reagents.add_reagent("welding_fuel",1000)
/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj)