diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 9ea5857858d..63cc703decc 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -1022,7 +1022,7 @@ var/list/turret_icons /obj/machinery/porta_turret/syndicate/shootAt(mob/living/target) var/area/syndicate_depot/depotarea = areaMaster - if(depotarea) + if(istype(depotarea)) depotarea.add_hostile(target) depotarea.declare_started() return ..(target) diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm index 98153722ec9..65cf24d5ffb 100644 --- a/code/game/objects/effects/spawners/random_spawners.dm +++ b/code/game/objects/effects/spawners/random_spawners.dm @@ -279,27 +279,18 @@ spawn_nothing_percentage = 0 // Loot schema: high-power weapons (m90, esword, ebow, revolver), devices that negate depot challenges (thermal glasses, chameleon device), explosives result = list( - // Syndicate Longarms and other high-power weapons /obj/item/gun/projectile/automatic/c20r = 1, /obj/item/gun/projectile/automatic/m90 = 1, - /obj/item/gun/projectile/automatic/sniper_rifle/syndicate = 1, - // Standard syndicate weapons /obj/item/melee/energy/sword/saber = 1, /obj/item/gun/energy/kinetic_accelerator/crossbow = 1, /obj/item/gun/projectile/revolver = 1, - // Job-Restricted Weapons /obj/item/clothing/gloves/color/yellow/power = 1, /obj/item/twohanded/chainsaw = 1, /obj/item/bee_briefcase = 1, /obj/item/twohanded/energizedfireaxe = 1, - // Devices that negate depot challenges /obj/item/clothing/glasses/thermal = 1, /obj/item/chameleon = 1, /obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1, - // Military defense items - /obj/item/shield/energy = 1, - - // Grenades & Explosives /obj/item/storage/box/syndie_kit/atmosgasgrenades = 1, /obj/item/grenade/syndieminibomb = 1, /obj/item/grenade/plastic/x4 = 1,