Merge branch 'Citadel-Station-13:master' into Projectile_Rework

This commit is contained in:
Solaris-Shade
2022-04-04 16:58:17 -04:00
committed by GitHub
4 changed files with 29 additions and 9 deletions
+3
View File
@@ -352,6 +352,9 @@
if(!(get_dir(loc, target) == dir)) //Make sure looking at appropriate border
return TRUE
/obj/machinery/door/firedoor/border_only/CanAStarPass(obj/item/card/id/ID, to_dir)
return !density || (dir != to_dir)
/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target)
if(get_dir(loc, target) == dir)
return !density
+2 -2
View File
@@ -120,10 +120,10 @@
var/obj/item/bodypart/head/as_head = AM
var/obj/item/mmi/as_mmi = AM
if(istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /obj/item/dullahan_relay))
living_detected = living_detected || AM
living_detected = living_detected ? living_detected : AM
nom += AM
else if(isliving(AM))
living_detected = living_detected || TRUE
living_detected = living_detected ? living_detected : AM
crunchy_nom += AM
var/not_eaten = to_eat.len - nom.len - crunchy_nom.len
if(living_detected) // First, check if we have any living beings detected.