Merge branch 'master' into development

This commit is contained in:
skull132
2017-05-16 14:46:36 +03:00
22 changed files with 132 additions and 14 deletions

View File

@@ -234,7 +234,7 @@
if(istype(W, /obj/item/weapon/weldingtool))
playsound(loc, 'sound/items/Welder.ogg', 100, 1)
if("brute")
if(prob(30))
if(prob(30) && !issilicon(user))
visible_message("<span class='danger'>\The [W] gets caught in the gelatinous folds of \the [src]</span>")
user.drop_from_inventory(W)
W.forceMove(src.loc)