diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index de1d8fcb548..ccb17a1297f 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -105,6 +105,13 @@ stat = BROKEN can_salvage = FALSE // So you need to actually kill a turret to get the alien gun. +/obj/machinery/porta_turret/poi //These are always angry + enabled = TRUE + lethal = TRUE + ailock = TRUE + check_all = TRUE + can_salvage = FALSE // So you can't just twoshot a turret and get a fancy gun + /obj/machinery/porta_turret/New() ..() req_access.Cut() diff --git a/code/modules/mob/living/simple_animal/humanoids/syndicate.dm b/code/modules/mob/living/simple_animal/humanoids/syndicate.dm index 3bdec53535b..dc57fd00f90 100644 --- a/code/modules/mob/living/simple_animal/humanoids/syndicate.dm +++ b/code/modules/mob/living/simple_animal/humanoids/syndicate.dm @@ -62,9 +62,13 @@ var/corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier /mob/living/simple_animal/hostile/syndicate/death() - ..() if(corpse) + ..() new corpse (src.loc) + else + ..(0,"explodes!") + new /obj/effect/gibspawner/human(src.loc) + explosion(get_turf(src), -1, 0, 1, 3) qdel(src) return @@ -142,6 +146,24 @@ loot_list = list(/obj/item/weapon/gun/projectile/automatic/c20r = 100) +/mob/living/simple_animal/hostile/syndicate/ranged/laser + icon_state = "syndicateranged_laser" + icon_living = "syndicateranged_laser" + rapid = 0 + projectiletype = /obj/item/projectile/beam/midlaser + projectilesound = 'sound/weapons/Laser.ogg' + + loot_list = list(/obj/item/weapon/gun/energy/laser = 100) + +/mob/living/simple_animal/hostile/syndicate/ranged/ionrifle + icon_state = "syndicateranged_ionrifle" + icon_living = "syndicateranged_ionrifle" + rapid = 0 + projectiletype = /obj/item/projectile/ion + projectilesound = 'sound/weapons/Laser.ogg' + + loot_list = list(/obj/item/weapon/gun/energy/ionrifle = 100) + /mob/living/simple_animal/hostile/syndicate/ranged/space name = "syndicate sommando" icon_state = "syndicaterangedpsace" @@ -164,6 +186,42 @@ /mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(var/check_drift = 0) return +/////////////////////////////////////////////// +// POI Mobs +// Don't leave corpses, to help balance loot. +/////////////////////////////////////////////// + +/mob/living/simple_animal/hostile/syndicate/poi + loot_list = list() + corpse = null + +/mob/living/simple_animal/hostile/syndicate/melee/poi + loot_list = list() + corpse = null + +/mob/living/simple_animal/hostile/syndicate/melee/space/poi + loot_list = list() + corpse = null + +/mob/living/simple_animal/hostile/syndicate/ranged/poi + loot_list = list() + corpse = null + +/mob/living/simple_animal/hostile/syndicate/ranged/laser/poi + loot_list = list() + corpse = null + +/mob/living/simple_animal/hostile/syndicate/ranged/ionrifle/poi + loot_list = list() + corpse = null + +/mob/living/simple_animal/hostile/syndicate/ranged/space/poi + loot_list = list() + corpse = null + + +//Viscerators + /mob/living/simple_animal/hostile/viscerator name = "viscerator" desc = "A small, twin-bladed machine capable of inflicting very deadly lacerations." diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 7716fd30328..e503b0d1b9c 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ