[MIRROR] Renames neurotoxin2 (the toxin, not the drink) (#5666)

* fentanyl (#35882)

* Renames neurotoxin2 (the toxin, not the drink)
This commit is contained in:
CitadelStationBot
2018-02-22 23:43:23 -06:00
committed by Poojawa
parent afa88c7b31
commit 099157b8ff
5 changed files with 17 additions and 17 deletions
@@ -453,16 +453,16 @@
else
..()
/datum/reagent/toxin/neurotoxin2
name = "Neurotoxin"
id = "neurotoxin2"
description = "Neurotoxin will inhibit brain function and cause toxin damage before eventually knocking out its victim."
/datum/reagent/toxin/fentanyl
name = "Fentanyl"
id = "fentanyl"
description = "Fentanyl will inhibit brain function and cause toxin damage before eventually knocking out its victim."
reagent_state = LIQUID
color = "#64916E"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0
/datum/reagent/toxin/neurotoxin2/on_mob_life(mob/living/M)
/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/M)
M.adjustBrainLoss(3*REM, 150)
. = 1
if(M.toxloss <= 60)
@@ -6,10 +6,10 @@
required_reagents = list("ethanol" = 1, "oxygen" = 1, "silver" = 1)
required_temp = 420
/datum/chemical_reaction/neurotoxin2
name = "neurotoxin2"
id = "neurotoxin2"
results = list("neurotoxin2" = 1)
/datum/chemical_reaction/fentanyl
name = "fentanyl"
id = "fentanyl"
results = list("fentanyl" = 1)
required_reagents = list("space_drugs" = 1)
required_temp = 674
@@ -92,7 +92,7 @@
name = "Rotatium"
id = "Rotatium"
results = list("rotatium" = 3)
required_reagents = list("mindbreaker" = 1, "teslium" = 1, "neurotoxin2" = 1)
required_reagents = list("mindbreaker" = 1, "teslium" = 1, "fentanyl" = 1)
mix_message = "<span class='danger'>After sparks, fire, and the smell of mindbreaker, the mix is constantly spinning with no stop in sight.</span>"
/datum/chemical_reaction/skewium
@@ -231,7 +231,7 @@ Borg Shaker
/obj/item/reagent_containers/borghypo/peace/hacked
desc = "Everything's peaceful in death!"
icon_state = "borghypo_s"
reagent_ids = list("dizzysolution","tiresolution","synthpax","tirizene","sulfonal","sodium_thiopental","cyanide","neurotoxin2")
reagent_ids = list("dizzysolution","tiresolution","synthpax","tirizene","sulfonal","sodium_thiopental","cyanide","fentanyl")
accepts_reagent_upgrades = FALSE
/obj/item/reagent_containers/borghypo/epi
@@ -137,7 +137,7 @@
/obj/item/reagent_containers/glass/bottle/traitor/Initialize()
. = ..()
extra_reagent = pick("polonium", "histamine", "formaldehyde", "venom", "neurotoxin2", "cyanide")
extra_reagent = pick("polonium", "histamine", "formaldehyde", "venom", "fentanyl", "cyanide")
reagents.add_reagent("[extra_reagent]", 3)
/obj/item/reagent_containers/glass/bottle/polonium
@@ -155,10 +155,10 @@
desc = "A small bottle. Contains Venom."
list_reagents = list("venom" = 30)
/obj/item/reagent_containers/glass/bottle/neurotoxin2
name = "neurotoxin bottle"
desc = "A small bottle. Contains Neurotoxin."
list_reagents = list("neurotoxin2" = 30)
/obj/item/reagent_containers/glass/bottle/fentanyl
name = "fentanyl bottle"
desc = "A small bottle. Contains Fentanyl."
list_reagents = list("fentanyl" = 30)
/obj/item/reagent_containers/glass/bottle/formaldehyde
name = "formaldehyde bottle"