Adds in Ether

This commit is contained in:
Fox-McCloud
2015-06-28 20:39:26 -04:00
parent 2a34b600a9
commit a89ddd5a7d
17 changed files with 60 additions and 20 deletions
+1 -1
View File
@@ -1463,7 +1463,7 @@ datum
name = "Neurotoxin"
id = "neurotoxin"
result = "neurotoxin"
required_reagents = list("gargleblaster" = 1, "morphine" = 1)
required_reagents = list("gargleblaster" = 1, "ether" = 1)
result_amount = 2
snowwhite
+1 -1
View File
@@ -297,7 +297,7 @@
starting_chems = list("silver_sulfadiazine","styptic_powder","charcoal")
/obj/item/weapon/gun/dartgun/vox/raider
starting_chems = list("space_drugs","morphine","haloperidol")
starting_chems = list("space_drugs","ether","haloperidol")
/obj/effect/syringe_gun_dummy //moved this shitty thing here
name = ""
+30
View File
@@ -913,6 +913,36 @@ datum/reagent/haloperidol/on_mob_life(var/mob/living/M as mob)
result_amount = 4
mix_message = "The chemicals mix into an odd pink slush."
/datum/reagent/ether
name = "Ether"
id = "ether"
description = "A strong anesthetic and sedative."
reagent_state = LIQUID
color = "#96DEDE"
/datum/reagent/ether/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
switch(current_cycle)
if(0 to 15)
if(prob(5))
M.emote("yawn")
if(16 to 35)
M.drowsyness = max(M.drowsyness, 10)
if(36 to INFINITY)
M.Paralyse(10)
M.drowsyness = max(M.drowsyness, 15)
..()
return
/datum/chemical_reaction/ether
name = "Ether"
id = "ether"
result = "ether"
required_reagents = list("sacid" = 1, "ethanol" = 1, "oxygen" = 1)
result_amount = 1
mix_message = "The mixture yields a pungent odor, which makes you tired."
//////////////////////////////
// Synth-Meds //
//////////////////////////////
@@ -675,7 +675,7 @@
New()
..()
reagents.add_reagent("nutriment", 12)
reagents.add_reagent("morphine", 3)
reagents.add_reagent("ether", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/stuffing
@@ -3116,7 +3116,7 @@
New()
..()
reagents.add_reagent("nutriment", 12)
reagents.add_reagent("morphine", 3)
reagents.add_reagent("ether", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/stuffing
@@ -150,6 +150,15 @@
..()
reagents.add_reagent("morphine", 30)
/obj/item/weapon/reagent_containers/glass/bottle/ether
name = "Ether Bottle"
desc = "A small bottle. Contains ether."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
New()
..()
reagents.add_reagent("ether", 30)
/obj/item/weapon/reagent_containers/glass/bottle/charcoal
name = "Charcoal Bottle"
desc = "A small bottle. Contains charcoal."