Merge pull request #771 from Fox-McCloud/nukies

Nukies--Chemsprayer and New Grenades
This commit is contained in:
ZomgPonies
2015-04-09 16:22:19 -04:00
5 changed files with 35 additions and 29 deletions
@@ -1447,21 +1447,6 @@ datum
reagent_state = LIQUID
color = "#322D00"
Spores
name = "Spores"
id = "spores"
description = "A toxic spore cloud which blocks vision when ingested."
reagent_state = LIQUID
color = "#9ACD32" // rgb: 0, 51, 51
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.adjustToxLoss(0.5*REM)
..()
M.damageoverlaytemp = 60
M.eye_blurry = max(M.eye_blurry, 3)
return
beer2 //disguised as normal beer for use by emagged brobots
name = "Beer"
id = "beer2"
@@ -206,13 +206,6 @@
amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
user << "<span class='notice'>You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray.</span>"
/obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror/New()
..()
reagents.add_reagent("spores", 150)
reagents.add_reagent("cryptobiolin", 150)
reagents.add_reagent("mutagen", 150)
reagents.add_reagent("pancuronium", 150)
// Plant-B-Gone
/obj/item/weapon/reagent_containers/spray/plantbgone // -- Skie