diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 74ffcd044a..e4bcbd8527 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -217,7 +217,7 @@ /obj/item/storage/box/syndie_kit/chemical/PopulateContents() new /obj/item/reagent_containers/glass/bottle/polonium(src) new /obj/item/reagent_containers/glass/bottle/venom(src) - new /obj/item/reagent_containers/glass/bottle/neurotoxin2(src) + new /obj/item/reagent_containers/glass/bottle/fentanyl(src) new /obj/item/reagent_containers/glass/bottle/formaldehyde(src) new /obj/item/reagent_containers/glass/bottle/spewium(src) new /obj/item/reagent_containers/glass/bottle/cyanide(src) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index a451be476c..6ede798e0b 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -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) diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index 7809262ee0..ee31fb1a93 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -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 = "After sparks, fire, and the smell of mindbreaker, the mix is constantly spinning with no stop in sight." /datum/chemical_reaction/skewium diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 0dec687f68..edd0096935 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 749031b367..4b797cbd73 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -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"