Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling

This commit is contained in:
DZD
2015-04-25 13:46:41 -04:00
14 changed files with 269 additions and 229 deletions
@@ -321,6 +321,19 @@ datum
..()
return
spider_venom
name = "Spider venom"
id = "spidertoxin"
description = "A toxic venom injected by spacefaring arachnids."
reagent_state = LIQUID
color = "#CF3600" // rgb: 207, 54, 0
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.adjustToxLoss(1.5)
..()
return
plasticide
name = "Plasticide"
id = "plasticide"