Merge branch 'master' into weapon-removal

This commit is contained in:
Guti
2024-09-18 18:07:43 +02:00
482 changed files with 5086 additions and 35138 deletions
+2 -2
View File
@@ -14,11 +14,11 @@
/obj/structure/cult/pylon/swarm/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living))
var/mob/living/L = mover
if(L.faction == "swarmer")
if(L.faction == FACTION_SWARMER)
return TRUE
else if(istype(mover, /obj/item/projectile))
var/obj/item/projectile/P = mover
if(istype(P.firer) && P.firer.faction == "swarmer")
if(istype(P.firer) && P.firer.faction == FACTION_SWARMER)
return TRUE
return ..()