From 4436cb995a1c624ddcfc43b2833a6456f9a4240f Mon Sep 17 00:00:00 2001 From: Twinmold Date: Wed, 20 Jul 2016 02:38:34 -0500 Subject: [PATCH] Pod Disabler and Grab Fixes Fixes the bug that lets you destroy pods with stamina damage weapons by adding in a check, as well as fixes the bug that makes it possible to pull someone out of a pod they are not in anymore. Fixes #5088 :cl: Twinmold Fix: Can no longer destroy pods with disablers and other stamina damage weapons. Fix: Can no longer pull someone out of a pod when no one is actually in the pod. /:cl: --- code/modules/spacepods/spacepod.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm index a7cd09b63ac..dc28b8099ac 100644 --- a/code/modules/spacepods/spacepod.dm +++ b/code/modules/spacepods/spacepod.dm @@ -130,7 +130,7 @@ light_color = icon_light_color[src.icon_state] /obj/spacepod/bullet_act(var/obj/item/projectile/P) - if(P.damage && !P.nodamage) + if(P.damage && !P.nodamage && P.damage_type != STAMINA) deal_damage(P.damage) else if(P.flag == "energy" && istype(P,/obj/item/projectile/ion)) //needed to make sure ions work properly empulse(src, 1, 1) @@ -370,7 +370,10 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment if(do_after(user, 50, target = src)) target.forceMove(get_turf(src)) target.Stun(1) - passengers -= target + if(pilot) + pilot = null + else + passengers -= target target.visible_message("[user] flings the door open and tears [target] out of the [src]", "The door flies open and you are thrown out of the [src] and to the ground!") return