Merge pull request #10125 from Iamgoofball/patch-85

Buffs the traitor toxins
This commit is contained in:
phil235
2015-06-29 17:36:11 +02:00
@@ -363,9 +363,9 @@
..()
/datum/reagent/toxin/histamine/overdose_process(var/mob/living/M as mob)
M.adjustOxyLoss(1*REM)
M.adjustBruteLoss(1*REM)
M.adjustToxLoss(1*REM)
M.adjustOxyLoss(2*REM)
M.adjustBruteLoss(2*REM)
M.adjustToxLoss(2*REM)
..()
/datum/reagent/toxin/formaldehyde
@@ -375,7 +375,7 @@
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0.5
toxpwr = 1
/datum/reagent/toxin/formaldehyde/on_mob_life(var/mob/living/M as mob)
if(prob(5))
@@ -393,8 +393,8 @@
toxpwr = 0
/datum/reagent/toxin/venom/on_mob_life(var/mob/living/M as mob)
toxpwr = 0.05*volume
M.adjustBruteLoss((0.1*volume)*REM)
toxpwr = 0.2*volume
M.adjustBruteLoss((0.3*volume)*REM)
if(prob(15))
M.reagents.add_reagent("histamine",pick(5,10))
M.reagents.remove_reagent("venom",1)
@@ -424,12 +424,12 @@
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 0.75
toxpwr = 1.25
/datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob)
if(prob(5))
M.losebreath += 1
if(prob(4))
if(prob(8))
M << "You feel horrendously weak!"
M.Stun(2)
M.adjustToxLoss(2*REM)
@@ -483,7 +483,7 @@
toxpwr = 2.5
/datum/reagent/toxin/initropidril/on_mob_life(var/mob/living/M as mob)
if(prob(5))
if(prob(25))
var/picked_option = rand(1,3)
switch(picked_option)
if(1)
@@ -505,7 +505,7 @@
/datum/reagent/toxin/pancuronium
name = "Pancuronium"
id = "pancuronium"
description = "Knocks you out after 10 seconds, 7% chance to cause some oxygen loss."
description = "Knocks you out after 10 seconds, 20% chance to cause some oxygen loss."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -514,14 +514,14 @@
/datum/reagent/toxin/pancuronium/on_mob_life(var/mob/living/M as mob)
if(current_cycle >= 10)
M.SetParalysis(1)
if(prob(7))
if(prob(20))
M.losebreath += 4
..()
/datum/reagent/toxin/sodium_thiopental
name = "Sodium Thiopental"
id = "sodium_thiopental"
description = "Puts you to sleep after 30 seconds, along with some major stamina loss."
description = "Puts you to sleep after 10 seconds, along with some major stamina loss."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.75 * REAGENTS_METABOLISM
@@ -530,13 +530,13 @@
/datum/reagent/toxin/sodium_thiopental/on_mob_life(var/mob/living/M as mob)
if(current_cycle >= 10)
M.sleeping += 1
M.adjustStaminaLoss(5*REM)
M.adjustStaminaLoss(10*REM)
..()
/datum/reagent/toxin/sulfonal
name = "Sulfonal"
id = "sulfonal"
description = "Deals some toxin damage, and puts you to sleep after 66 seconds."
description = "Deals some toxin damage, and puts you to sleep after 22 seconds."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
@@ -585,10 +585,10 @@
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.06 * REAGENTS_METABOLISM
toxpwr = 1
toxpwr = 1.75
/datum/reagent/toxin/coniine/on_mob_life(var/mob/living/M as mob)
M.losebreath += 3
M.losebreath += 5
..()
/datum/reagent/toxin/curare
@@ -598,12 +598,12 @@
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 0.5
toxpwr = 1
/datum/reagent/toxin/curare/on_mob_life(var/mob/living/M as mob)
if(current_cycle >= 11)
M.Weaken(1)
M.adjustOxyLoss(0.5*REM)
M.adjustOxyLoss(1*REM)
..()