From bd09972ae85d823728bd7466061357e329e3bf19 Mon Sep 17 00:00:00 2001 From: =vero Date: Sun, 24 Mar 2024 15:38:07 -0700 Subject: [PATCH 1/5] fixes teleport bug --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 240b003ed1a8..fb086970c627 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -166,11 +166,14 @@ if(ismob(G.grabbed_thing)) var/mob/M = G.grabbed_thing var/atom/blocker = LinkBlocked(user, user.loc, loc) + if(!src.Adjacent(M)) + visible_message(SPAN_DANGER("[M] is too far to place onto the [src]")) + return FALSE if(blocker) to_chat(user, SPAN_WARNING("\The [blocker] is in the way!")) - else - to_chat(user, SPAN_NOTICE("You place [M] on [src].")) - M.forceMove(loc) + return FALSE + to_chat(user, SPAN_NOTICE("You place [M] on [src].")) + M.forceMove(loc) return TRUE else From 80da2c7157274721c31495de2623e6c33b8283d8 Mon Sep 17 00:00:00 2001 From: =vero Date: Sun, 24 Mar 2024 16:06:19 -0700 Subject: [PATCH 2/5] checks if the mob is on an adjacent tile before slamming them onto the table --- 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 a1542f7baf75..e72ef9759cd6 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -270,6 +270,9 @@ var/obj/item/grab/G = W if(istype(G.grabbed_thing, /mob/living)) var/mob/living/M = G.grabbed_thing + if(!src.Adjacent(M)) + visible_message(SPAN_DANGER("[M] is too far to place onto [src]")) + return if(user.a_intent == INTENT_HARM) if(user.grab_level > GRAB_AGGRESSIVE) if (prob(15)) From c3020a68f0ed2db116eb82207b67ee6ad371d46a Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:40:24 -0400 Subject: [PATCH 3/5] Update code/game/objects/structures/stool_bed_chair_nest/bed.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index fb086970c627..86412dbdb9c9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -167,7 +167,7 @@ var/mob/M = G.grabbed_thing var/atom/blocker = LinkBlocked(user, user.loc, loc) if(!src.Adjacent(M)) - visible_message(SPAN_DANGER("[M] is too far to place onto the [src]")) + visible_message(SPAN_DANGER("[M] is too far to place onto [src].")) return FALSE if(blocker) to_chat(user, SPAN_WARNING("\The [blocker] is in the way!")) From 59788198fd73067f8992044fecb1761a6aa6aaba Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:40:31 -0400 Subject: [PATCH 4/5] Update code/game/objects/structures/stool_bed_chair_nest/bed.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 86412dbdb9c9..eb9b5aa5e418 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -166,7 +166,7 @@ if(ismob(G.grabbed_thing)) var/mob/M = G.grabbed_thing var/atom/blocker = LinkBlocked(user, user.loc, loc) - if(!src.Adjacent(M)) + if(!Adjacent(M)) visible_message(SPAN_DANGER("[M] is too far to place onto [src].")) return FALSE if(blocker) From 60b1ea26a876d755e899a3e3efe20b0af5cf8395 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:49:29 -0400 Subject: [PATCH 5/5] Update tables_racks.dm --- code/game/objects/structures/tables_racks.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index e72ef9759cd6..a1542f7baf75 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -270,9 +270,6 @@ var/obj/item/grab/G = W if(istype(G.grabbed_thing, /mob/living)) var/mob/living/M = G.grabbed_thing - if(!src.Adjacent(M)) - visible_message(SPAN_DANGER("[M] is too far to place onto [src]")) - return if(user.a_intent == INTENT_HARM) if(user.grab_level > GRAB_AGGRESSIVE) if (prob(15))