From 7dcce3c08702373777ec29724603040371ce6fa1 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 19 Oct 2016 17:43:58 -0200 Subject: [PATCH 1/2] Makes shuttles great again --- code/modules/shuttle/shuttle.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index d513b4c3dd..a3222594aa 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -539,15 +539,10 @@ M.pulledby.stop_pulling() M.stop_pulling() M.visible_message("[M] is hit by \ - a hyperspace ripple[M.anchored ? "":" and is thrown clear"]!", + a hyperspace ripple!", "You feel an immense \ crushing pressure as the space around you ripples.") - if(M.anchored) - M.gib() - else - step(M, dir) - M.Paralyse(10) - M.ex_act(2) + M.gib() else //non-living mobs shouldn't be affected by shuttles, which is why this is an else if(istype(AM, /obj/singularity) && !istype(AM, /obj/singularity/narsie)) //it's a singularity but not a god, ignore it. From 5f15879bbf4dedfdd16d27d82fd2c530013aa7b9 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 21 Oct 2016 23:09:05 -0200 Subject: [PATCH 2/2] Removes now unused variable --- code/modules/shuttle/shuttle.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index a3222594aa..c0a5b9ee18 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -518,7 +518,6 @@ name = "Shuttle Import" /obj/docking_port/mobile/proc/roadkill(list/L0, list/L1, dir) - var/list/hurt_mobs = list() for(var/i in 1 to L0.len) var/turf/T0 = L0[i] var/turf/T1 = L1[i] @@ -530,8 +529,7 @@ for(var/atom/movable/AM in T1) if(ismob(AM)) - if(isliving(AM) && !(AM in hurt_mobs)) - hurt_mobs |= AM + if(isliving(AM)) var/mob/living/M = AM if(M.buckled) M.buckled.unbuckle_mob(M, 1)