From ef950400a451705cc9787997fc1ef907b830aade Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 20 Jan 2021 15:50:41 +0200 Subject: [PATCH 1/2] Fixes the space tackling meme --- code/datums/components/tackle.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index c69df4f5e3..f09cd06cfd 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -85,6 +85,10 @@ to_chat(user, "You're not ready to tackle!") return + if(!user.mob_has_gravity() ||!user.loc.has_gravity() || istype(user.loc, /turf/open/space)) + to_chat(user, "You can't find your footing without gravity!") + return + if(user.has_status_effect(STATUS_EFFECT_TASED)) // can't tackle if you just got tased to_chat(user, "You can't tackle while tased!") return From 5aa710ffd7df15775fff4f78938b012a5d4c0329 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 20 Jan 2021 16:05:20 +0200 Subject: [PATCH 2/2] spess --- code/datums/components/tackle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index f09cd06cfd..10ff5bda3d 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -85,7 +85,7 @@ to_chat(user, "You're not ready to tackle!") return - if(!user.mob_has_gravity() ||!user.loc.has_gravity() || istype(user.loc, /turf/open/space)) + if(!user.mob_has_gravity() ||!user.loc.has_gravity() || isspaceturf(user.loc)) to_chat(user, "You can't find your footing without gravity!") return