Merge branch 'master' into upstream-merge-32183

This commit is contained in:
LetterJay
2017-11-15 10:22:40 -06:00
committed by GitHub
248 changed files with 13139 additions and 3311 deletions
+2
View File
@@ -14,6 +14,8 @@
return FALSE
if(TOOL_CROWBAR)
return target.crowbar_act(user, src)
if(TOOL_MULTITOOL)
return target.multitool_act(user, src)
if(TOOL_SCREWDRIVER)
return target.screwdriver_act(user, src)
if(TOOL_WRENCH)
-4
View File
@@ -66,10 +66,6 @@
// And here are some good things for free:
// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
/obj/effect/portal/attack_ghost(mob/user)
if(linked)
user.forceMove(get_turf(linked))
/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
if(awaygate)
user.forceMove(awaygate.loc)