From 7f3af0a1ca66a7a656fd186ba13d47061e8dbf11 Mon Sep 17 00:00:00 2001 From: IK3I Date: Sat, 14 May 2016 22:07:23 -0500 Subject: [PATCH] Adds pod lock busters The CE and the Armory now have specialized drills for stubborn pod flying criminals. Also fixes a few bugs and oversights --- code/game/machinery/computer/pod_tracking_console.dm | 4 +++- code/modules/mob/living/simple_animal/hostile/hostile.dm | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 371c3af366d..6817d265a0f 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -25,8 +25,10 @@ if(my_pod.pilot || my_pod.passengers) if(my_pod.pilot) chairs += list("pilot" = my_pod.pilot.name) + var/i = 1 for(var/mob/M in my_pod.passengers) - chairs += list("passenger" = M.name) + chairs += list("passenger [i]" = M.name) + i++ pods.Add(list(list("pod" = "\ref[my_pod]", "name" = podname) + chairs + list("x" = my_pod.x, "y" = my_pod.y, "z" = my_pod.z))) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 6e34ff4b8b0..53dd934cb6a 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -119,9 +119,8 @@ if(istype(the_target, /obj/spacepod)) var/obj/spacepod/S = the_target if(S.pilot) //Just so we don't attack empty pods - for(var/mob/M in S.pilot) - if(CanAttack(M)) - return 1 + if(CanAttack(S.pilot)) + return 1 if(isliving(the_target)) var/mob/living/L = the_target var/faction_check = 0