From a2092b1685f378d9aed4756877b760e9d1059376 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 2 Mar 2018 00:46:34 -0500 Subject: [PATCH 1/3] You can no longer push someone onto a table that's across the entire fuckin map --- code/game/objects/structures/tables_racks.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 230c1a32950..86f1c571cb3 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -62,6 +62,8 @@ /obj/structure/table/attack_hand(mob/living/user) if(user.a_intent == INTENT_GRAB && user.pulling && isliving(user.pulling)) var/mob/living/pushed_mob = user.pulling + if(!Adjacent(pushed_mob) && !Adjacent(user)) + return if(pushed_mob.buckled) to_chat(user, "[pushed_mob] is buckled to [pushed_mob.buckled]!") return From 6f7e7f1a5950146092668fe94bb52910fee1433e Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 2 Mar 2018 12:30:30 -0500 Subject: [PATCH 2/3] nerfs criticism --- code/game/objects/structures/tables_racks.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 86f1c571cb3..583139d6bef 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -60,10 +60,8 @@ attack_hand(user) /obj/structure/table/attack_hand(mob/living/user) - if(user.a_intent == INTENT_GRAB && user.pulling && isliving(user.pulling)) + if(user.a_intent == INTENT_GRAB && Adjacent(user) && user.pulling && isliving(user.pulling)) var/mob/living/pushed_mob = user.pulling - if(!Adjacent(pushed_mob) && !Adjacent(user)) - return if(pushed_mob.buckled) to_chat(user, "[pushed_mob] is buckled to [pushed_mob.buckled]!") return From 6aa21c1dea5527bf7fb5cb5f0de6feaf5e03f7a8 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 7 Mar 2018 20:45:06 -0500 Subject: [PATCH 3/3] Update tables_racks.dm --- code/game/objects/structures/tables_racks.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 583139d6bef..6c72734457a 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -73,6 +73,9 @@ else ..() +/obj/structure/table/attack_tk() + return FALSE + /obj/structure/table/CanPass(atom/movable/mover, turf/target) if(istype(mover) && (mover.pass_flags & PASSTABLE)) return 1