From a75a1165dc9ba8e58073450a3a28faaebe023bcc Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 20 Jun 2015 15:21:24 -0400 Subject: [PATCH] Sarin->Tabun --- code/datums/uplink_item.dm | 8 ++++---- .../items/weapons/grenades/chem_grenade.dm | 8 ++++---- .../items/weapons/storage/uplink_kits.dm | 12 +++++------ code/modules/reagents/newchem/medicine.dm | 2 +- code/modules/reagents/newchem/toxins.dm | 20 +++++++++---------- .../reagent_containers/glass/bottle.dm | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 24bbaa3b2d8..5f79615f4b9 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -293,10 +293,10 @@ var/list/uplink_items = list() gamemodes = list("nuclear emergency") surplus = 35 -/datum/uplink_item/dangerous/saringrenades - name = "Sarin Gas Grenades" - desc = "A box of four (4) grenades filled with sarin, a deadly neurotoxin. Use extreme caution when handling and be sure to vacate the premise after using; ensure communication is maintaind with team to avoid accidental gassings." - item = /obj/item/weapon/storage/box/syndie_kit/sarin +/datum/uplink_item/dangerous/tabungrenades + name = "Tabun Gas Grenades" + desc = "A box of four (4) grenades filled with tabun, a deadly neurotoxin. Use extreme caution when handling and be sure to vacate the premise after using; ensure communication is maintaind with team to avoid accidental gassings." + item = /obj/item/weapon/storage/box/syndie_kit/tabun cost = 15 gamemodes = list("nuclear emergency") surplus = 0 diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 37353662f00..9adf9cf5d4b 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -479,9 +479,9 @@ beakers += B2 update_icon() -/obj/item/weapon/grenade/chem_grenade/saringas - payload_name = "saringas" - desc = "Contains sarin gas; extremely deadly and fast acting; use with extreme caution." +/obj/item/weapon/grenade/chem_grenade/tabungas + payload_name = "tabungas" + desc = "Contains tabun gas; extremely deadly and fast acting; use with extreme caution." stage = READY New() @@ -489,7 +489,7 @@ var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("sarin", 25) + B1.reagents.add_reagent("tabun", 25) B1.reagents.add_reagent("potassium", 25) B2.reagents.add_reagent("phosphorus", 25) B2.reagents.add_reagent("sugar", 25) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index efc648d1dbf..09fa9b17db8 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -199,12 +199,12 @@ new /obj/item/weapon/implanter/emp/(src) new /obj/item/device/flashlight/emp/(src) -/obj/item/weapon/storage/box/syndie_kit/sarin - name = "Sarin Gas Grenades" +/obj/item/weapon/storage/box/syndie_kit/tabun + name = "Tabun Gas Grenades" New() ..() - new /obj/item/weapon/grenade/chem_grenade/saringas(src) - new /obj/item/weapon/grenade/chem_grenade/saringas(src) - new /obj/item/weapon/grenade/chem_grenade/saringas(src) - new /obj/item/weapon/grenade/chem_grenade/saringas(src) \ No newline at end of file + new /obj/item/weapon/grenade/chem_grenade/tabungas(src) + new /obj/item/weapon/grenade/chem_grenade/tabungas(src) + new /obj/item/weapon/grenade/chem_grenade/tabungas(src) + new /obj/item/weapon/grenade/chem_grenade/tabungas(src) \ No newline at end of file diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index a4f712ba524..defbb6246ab 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -560,7 +560,7 @@ datum/reagent/atropine/on_mob_life(var/mob/living/M as mob) M.losebreath = 5 if(M.confused > 60) M.confused += 5 - M.reagents.remove_reagent("sarin",10) + M.reagents.remove_reagent("tabun",10) ..() return diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index ca38bf6de7f..410aa5be2e2 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -502,25 +502,25 @@ datum/reagent/curare/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/sarin - name = "Sarin" - id = "sarin" +datum/reagent/tabun + name = "Tabun" + id = "tabun" description = "An extremely deadly neurotoxin." reagent_state = LIQUID color = "#C7C7C7" metabolization_rate = 0.1 penetrates_skin = 1 -/datum/chemical_reaction/sarin - name = "sarin" - id = "sarin" - result = "sarin" - required_reagents = list("chlorine" = 1, "fluorine" = 1, "hydrogen" = 1, "oxygen" = 1, "phosphorus" = 1, "fuel" = 1, "acetone" = 1, "atrazine" = 1) - result_amount = 3 +/datum/chemical_reaction/tabun + name = "tabun" + id = "tabun" + result = "tabun" + required_reagents = list("phenol" = 1, "diethylamine" = 1, "phosphorus" = 1, "oxygen" = 1, "chlorine" = 1, "sodiumchloride" = 1, "ethanol" = 1, "cyanide" = 1) + result_amount = 8 mix_message = "The mixture yields a colorless, odorless liquid." required_temp = 374 -datum/reagent/sarin/on_mob_life(var/mob/living/M as mob) +datum/reagent/tabun/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.adjustFireLoss(1) if(prob(20)) diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 3c5c213eef3..f6a4d019fc4 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -275,4 +275,4 @@ New() ..() - reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide"), 40) \ No newline at end of file + reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","tabun","histamine","venom","cyanide"), 40) \ No newline at end of file