Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

This commit is contained in:
LatD
2016-05-28 01:37:55 +03:00
211 changed files with 927 additions and 1328 deletions
@@ -69,24 +69,7 @@
add_implants()
ready = 1
src.updateUsrDialog()
return
/obj/machinery/implantchair/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(!ismob(G.affecting))
return
var/mob/M = G.affecting
if(M.buckled_mobs.len)
user << "[M] will not fit into [src] because they have a creature on them!"
return
if(put_mob(M))
qdel(G)
updateUsrDialog()
else
return ..()
updateUsrDialog()
/obj/machinery/implantchair/go_out(mob/M)