cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes space syndis being unable to navigate space (#12405)

Browse Source
This commit is contained in:
Kyep
2019-09-26 04:37:04 +00:00
committed by variableundefined
parent 6bd0d0813a
commit 92db0fd32b
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/syndicate.dm
+11 -5
View File
@@ -116,7 +116,9 @@
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/Aggro()
. = ..()
if(target && istype(depotarea))
if(!istype(depotarea))
return
if(target)
if(!seen_enemy)
seen_enemy = TRUE
if(!ranged)
@@ -148,11 +150,13 @@
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/handle_automated_movement()
. = ..()
if(!istype(depotarea))
return
if(seen_enemy)
aggro_cycles++
if(alert_on_timeout && !raised_alert && aggro_cycles >= 60)
raise_alert("[name] has reported contact with hostile entity: [seen_enemy_name]")
if(scan_cycles >= 15 && istype(depotarea))
if(scan_cycles >= 15)
scan_cycles = 0
if(!atoms_share_level(src, spawn_turf))
if(istype(loc, /obj/structure/closet))
@@ -187,6 +191,8 @@
depotarea.increase_alert(reason)
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/death()
if(!istype(depotarea))
return ..()
if(alert_on_death)
if(seen_enemy_name)
raise_alert("[name] has died in combat with [seen_enemy_name].")
@@ -288,7 +294,7 @@
alert_on_spacing = FALSE
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space/Process_Spacemove(var/movement_dir = 0)
return
return TRUE
@@ -302,7 +308,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando, /obj/item/melee/energy/sword/saber/red, /obj/item/shield/energy)
/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(var/movement_dir = 0)
return
return TRUE
/mob/living/simple_animal/hostile/syndicate/ranged
@@ -326,7 +332,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando, /obj/item/gun/projectile/automatic/c20r)
/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(var/movement_dir = 0)
return
return TRUE
/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib
loot = list()//gonna gibe, no loot.