mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 14:07:51 +01:00
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
This commit is contained in:
@@ -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)))
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user