Merge branch 'master' into development

This commit is contained in:
skull132
2017-09-14 22:59:07 +03:00
10 changed files with 38 additions and 12 deletions
@@ -506,6 +506,7 @@
/obj/structure/sink/puddle //splishy splashy ^_^
name = "puddle"
icon_state = "puddle"
desc = "A small pool of some liquid, ostensibly water."
/obj/structure/sink/puddle/attack_hand(mob/M as mob)
icon_state = "puddle-splash"