[Goonchem] Tweaks, Fixes, etc.

This commit is contained in:
Fox-McCloud
2015-03-28 21:16:13 -04:00
parent e2a4ccc8a6
commit 796dbf233a
26 changed files with 118 additions and 88 deletions
+1 -1
View File
@@ -25,7 +25,7 @@
var/unhack_message = "You re-enable the safety safeguards, enabling the \"NT Standard\" mode."
var/list/broken_requirements = list()
var/broken_on_spawn = 0
var/recharge_delay = 15
var/recharge_delay = 5
var/image/icon_beaker = null //cached overlay
+9 -23
View File
@@ -858,20 +858,6 @@ datum
..()
return
acetaminophen
name = "Acetaminophenl"
id = "acetaminophen"
description = "Most probably know this as Tylenol. This chemical is a mild, simple painkiller."
reagent_state = LIQUID
color = "#C855DC"
shock_reduction = 40
metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units
on_mob_life(var/mob/living/M as mob) // what the fuck are you idiots smoking
if(!M) M = holder.my_atom
..()
return
mutagen
name = "Unstable mutagen"
id = "mutagen"
@@ -901,7 +887,7 @@ datum
return
hydrocodone
name = "Hydrocodone-Acetaminophen"
name = "Hydrocodone"
id = "hydrocodone"
description = "An extremely effective painkiller; may have long term abuse consequences."
reagent_state = LIQUID
@@ -1246,9 +1232,9 @@ datum
..()
return
inacusiate
name = "Inacusiate"
id = "inacusiate"
audioline
name = "Audioline"
id = "audioline"
description = "Heals ear damage."
reagent_state = LIQUID
color = "#6600FF" // rgb: 100, 165, 255
@@ -1260,10 +1246,10 @@ datum
..()
return
peridaxon
name = "Peridaxon"
id = "peridaxon"
description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
mitocholide
name = "Mitocholide"
id = "mitocholide"
description = "A specialized drugs that stimulates the mitochondria of cells to encourage healing of internal organs."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
@@ -1292,7 +1278,7 @@ datum
if(M.bodytemperature < 170)
M.adjustCloneLoss(-1)
M.adjustOxyLoss(-10)
M.heal_organ_damage(3,3)
M.heal_organ_damage(12,12)
M.adjustToxLoss(-3)
..()
return
+15 -31
View File
@@ -75,20 +75,12 @@ datum
result_amount = 3
mix_message = "The substance turns neon green and bubbles unnervingly."
acetaminophen
name = "Acetaminophen"
id = "acetaminophen"
result = "acetaminophen"
required_reagents = list("phenol" = 1, "sodium" = 1, "oxygen" = 1, "nitrogen" = 1, "sacid" = 1, "water" = 1)
result_amount = 6
mix_message = "The mixture becomes a fine white powder."
hydrocodone
name = "Hydrocodone"
id = "hydrocodone"
result = "hydrocodone"
required_reagents = list("morphine" = 1, "acetaminophen" = 1, "sacid" = 1, "water" = 1, "oil" = 1)
result_amount = 3
required_reagents = list("morphine" = 1, "sacid" = 1, "water" = 1, "oil" = 1)
result_amount = 2
thermite
name = "Thermite"
@@ -112,12 +104,11 @@ datum
required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
result_amount = 4
peridaxon
name = "Peridaxon"
id = "peridaxon"
result = "peridaxon"
required_reagents = list("styptic_powder" = 2, "clonexadone" = 2)
required_catalysts = list("plasma" = 5)
mitocholide
name = "mitocholide"
id = "mitocholide"
result = "mitocholide"
required_reagents = list("synthflesh" = 1, "clonexadone" = 1)
result_amount = 2
holy_water
@@ -127,13 +118,6 @@ datum
required_reagents = list("water" = 1, "mercury" = 1, "wine" = 1)
result_amount = 3
virus_food
name = "Virus Food"
id = "virusfood"
result = "virusfood"
required_reagents = list("water" = 1, "milk" = 1)
result_amount = 5
cryptobiolin
name = "Cryptobiolin"
id = "cryptobiolin"
@@ -164,12 +148,12 @@ datum
required_reagents = list("cryptobiolin" = 1, "epinephrine" = 1)
result_amount = 2
inacusiate
name = "inacusiate"
id = "inacusiate"
result = "inacusiate"
required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1)
result_amount = 2
Audioline
name = "Audioline"
id = "audioline"
result = "audioline"
required_reagents = list("spaceacillin" = 1, "salglu_solution" = 1, "epinephrine" = 1)
result_amount = 3
glycerol
name = "Glycerol"
@@ -230,8 +214,8 @@ datum
name = "Virus Food"
id = "virusfood"
result = "virusfood"
required_reagents = list("water" = 5, "milk" = 5, "oxygen" = 5)
result_amount = 15
required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
result_amount = 3
/*
mix_virus
name = "Mix Virus"
+1 -1
View File
@@ -8,7 +8,7 @@
idle_power_usage = 40
var/obj/item/weapon/reagent_containers/beaker = null
var/temperature = 300
var/rate = 10 //heating/cooling rate, default is 10 kelvin per tick
var/rate = 15 //heating/cooling rate, default is 10 kelvin per tick
var/on = FALSE
@@ -264,6 +264,7 @@ datum/reagent/sal_acid
description = "This is a is a standard salicylate pain reliever and fever reducer."
reagent_state = LIQUID
color = "#C8A5DC"
shock_reduction = 40
overdose_threshold = 25
datum/reagent/sal_acid/on_mob_life(var/mob/living/M as mob)
@@ -21,7 +21,7 @@
reagent_ids = list("styptic_powder", "epinephrine", "salbutamol")
/obj/item/weapon/reagent_containers/borghypo/crisis
reagent_ids = list("salglu_solution", "epinephrine", "acetaminophen")
reagent_ids = list("salglu_solution", "epinephrine", "sal_acid")
/obj/item/weapon/reagent_containers/borghypo/New()
..()
@@ -157,12 +157,12 @@
/obj/item/weapon/reagent_containers/food/condiment/syndisauce
name = "Chef Excellence's Special Sauce"
desc = "A potent sauce distilled from the toxin glands of 1000 Space Carp with an extra touch of LSD because why not?"
amount_per_transfer_from_this = 1
volume = 20
desc = "A potent sauce extracted from the potent amanita mushrooms. Death never tasted quite so delicious."
amount_per_transfer_from_this = 5
volume = 50
New()
..()
reagents.add_reagent("chefspecial", 20)
reagents.add_reagent("amanitin", 50)
//Food packs. To easily apply deadly toxi... delicious sauces to your food!
/obj/item/weapon/reagent_containers/food/condiment/pack
@@ -794,6 +794,23 @@
src.name = "donk-pocket"
return
/obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket
name = "Donk-pocket"
desc = "This donk-pocket is emitting a small amount of heat."
icon_state = "donkpocket"
filling_color = "#DEDEAB"
volume = 90
bitesize = 100 //nom the whole thing at once.
New()
..()
reagents.add_reagent("omnizine", 15)
reagents.add_reagent("teporone", 15)
reagents.add_reagent("synaptizine", 15)
reagents.add_reagent("salglu_solution", 15)
reagents.add_reagent("salbutamol", 15)
reagents.add_reagent("methamphetamine", 15)
/obj/item/weapon/reagent_containers/food/snacks/brainburger
name = "brainburger"
desc = "A strange looking burger. It looks almost sentient."
@@ -242,4 +242,12 @@
icon_state = "rbottle6"
New()
..()
reagents.add_reagent("sacid", 50)
reagents.add_reagent("sacid", 50)
/obj/item/weapon/reagent_containers/glass/bottle/reagent/formaldehyde
name = "Formaldehyde Bottle"
desc = "A reagent bottle. Contains formaldehyde."
icon_state = "rbottle"
New()
..()
reagents.add_reagent("formaldehyde", 50)