From 64045ac7c27af8d5fe2c735375087e1227979dba Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Mon, 9 Sep 2019 19:23:07 -0400 Subject: [PATCH 1/3] The gravity catapult no longer affects ghosts --- code/game/mecha/equipment/tools/other_tools.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index 4cfbc5c8143..5944ac9f536 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -119,6 +119,7 @@ atoms = orange(3, target) for(var/atom/movable/A in atoms) if(A.anchored) continue + if(isobserver(A)) continue spawn(0) var/iter = 5-get_dist(A,target) for(var/i=0 to iter) From f5d3b92a70479357c8ab99a2c7bc3504e8e30f7f Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Mon, 9 Sep 2019 20:08:34 -0400 Subject: [PATCH 2/3] move_resist == INFINITY --- code/game/mecha/equipment/tools/other_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index 5944ac9f536..e5d00901849 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -119,7 +119,7 @@ atoms = orange(3, target) for(var/atom/movable/A in atoms) if(A.anchored) continue - if(isobserver(A)) continue + if(A.move_resist == INFINITY) continue spawn(0) var/iter = 5-get_dist(A,target) for(var/i=0 to iter) From 6d24c1ff09f9046e1112606909fb181f7cdbaf21 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Mon, 9 Sep 2019 21:59:53 -0400 Subject: [PATCH 3/3] yes --- code/game/mecha/equipment/tools/other_tools.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index e5d00901849..664927b1d3a 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -118,8 +118,7 @@ else atoms = orange(3, target) for(var/atom/movable/A in atoms) - if(A.anchored) continue - if(A.move_resist == INFINITY) continue + if(A.anchored || A.move_resist == INFINITY) continue spawn(0) var/iter = 5-get_dist(A,target) for(var/i=0 to iter)