Merge pull request #11772 from Couls/constructable-rechargers

[READY] Constructable Rechargers and machinery tweaks
This commit is contained in:
variableundefined
2019-08-23 09:16:37 -04:00
committed by GitHub
9 changed files with 54 additions and 4 deletions
@@ -91,6 +91,12 @@
if(climber)
climber.Weaken(2)
climber.visible_message("<span class='warning'>[climber.name] has been knocked off the table", "You've been knocked off the table", "You see [climber.name] get knocked off the table</span>")
else if(user.pulling.pass_flags & PASSTABLE)
user.Move_Pulled(src)
if (user.pulling.loc == loc)
user.visible_message("<span class='notice'>[user] places [user.pulling] onto [src].</span>",
"<span class='notice'>You place [user.pulling] onto [src].</span>")
user.stop_pulling()
/obj/structure/table/attack_tk() // no telehulk sorry
return