From 53dcb0e8a9076798918a688ae6f03279adf2d79c Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Sun, 4 Feb 2024 14:56:43 -0500 Subject: [PATCH] fix 2 exploits (#791) --- code/game/turfs/turf.dm | 2 ++ code/modules/mob/living/carbon/carbon.dm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 56099f385566..f4c27fa0c341 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -215,6 +215,8 @@ GLOBAL_LIST_EMPTY(station_turfs) return if(!isliving(user)) return + if(user == victim) + return user.move_grabbed_atoms_towards(src) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index f27654e243d2..a603ff460fb7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -167,7 +167,7 @@ return release_grabs(I) else - if(!G.current_grab.can_throw || !isliving(G.affecting)) + if(!G.current_grab.can_throw || !isliving(G.affecting) || G.affecting == src) return var/mob/living/throwable_mob = G.affecting