Forgot Nicotine in cigs

This commit is contained in:
Fox-McCloud
2015-03-28 05:38:15 -04:00
parent 6b96276637
commit 361554d3b2
8 changed files with 10 additions and 42 deletions
@@ -1464,13 +1464,6 @@ datum
reagent_state = SOLID
color = "#664B63" // rgb: 102, 75, 99
nicotine
name = "Nicotine"
id = "nicotine"
description = "A highly addictive stimulant extracted from the tobacco plant."
reagent_state = LIQUID
color = "#181818" // rgb: 24, 24, 24
ammonia
name = "Ammonia"
id = "ammonia"
@@ -1735,32 +1728,6 @@ datum
..()
return
amatoxin
name = "Amanitin"
id = "amatoxin"
description = "A powerful poison derived from certain species of mushroom."
color = "#792300" // rgb: 121, 35, 0
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
..()
return
Del()
if(holder)
if (istype(holder.my_atom,/mob/living))
var/mob/living/M as mob
var/to_remove = 0
if (holder.has_reagent("charcoal"))
to_remove = min(holder.get_reagent_amount("charcoal"),data)
holder.remove_reagent("charcoal", to_remove, 0)
data -= to_remove
if(M)
M.adjustToxLoss((data-1)*rand(2,4))
..()
psilocybin
name = "Psilocybin"
id = "psilocybin"
@@ -1073,7 +1073,7 @@
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("amatoxin", 3)
reagents.add_reagent("amanitin", 3)
reagents.add_reagent("psilocybin", 1)
bitesize = 3
@@ -1408,7 +1408,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("amatoxin", 6)
reagents.add_reagent("amanitin", 6)
reagents.add_reagent("psilocybin", 3)
bitesize = 3