From 7bdd4c45695e7fb571db26129c8c44215d6d5054 Mon Sep 17 00:00:00 2001 From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Thu, 24 Jul 2025 07:40:25 -0400 Subject: [PATCH] Adjusts BSH extra loot drop locations (#29699) --- code/_globalvars/mapping_vars.dm | 1 + .../objects/effects/spawners/random/maint_loot_spawners.dm | 2 ++ code/modules/station_goals/bluespace_tap.dm | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/_globalvars/mapping_vars.dm b/code/_globalvars/mapping_vars.dm index 50a8308f077..acc6042b5f0 100644 --- a/code/_globalvars/mapping_vars.dm +++ b/code/_globalvars/mapping_vars.dm @@ -40,6 +40,7 @@ GLOBAL_LIST_EMPTY(ninjastart) GLOBAL_LIST_EMPTY(carplist) //list of all carp-spawn landmarks GLOBAL_LIST_EMPTY(syndicateofficer) GLOBAL_LIST_EMPTY(roundstart_observer_start) +GLOBAL_LIST_EMPTY(maints_loot_spawns) //List of preloaded templates GLOBAL_LIST_EMPTY(map_templates) diff --git a/code/game/objects/effects/spawners/random/maint_loot_spawners.dm b/code/game/objects/effects/spawners/random/maint_loot_spawners.dm index 568389d8d2e..b58cd2c3cf0 100644 --- a/code/game/objects/effects/spawners/random/maint_loot_spawners.dm +++ b/code/game/objects/effects/spawners/random/maint_loot_spawners.dm @@ -9,6 +9,8 @@ /obj/effect/spawner/random/maintenance/Initialize(mapload) loot = GLOB.maintenance_loot_tables spawn_loot_count = rand(2, 4) + if(is_station_level(z)) + GLOB.maints_loot_spawns += loc if(HAS_TRAIT(SSstation, STATION_TRAIT_EMPTY_MAINT)) spawn_loot_chance -= TRAIT_CHANCE_DELTA diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm index 8c0c338cab5..7b153f42cae 100644 --- a/code/modules/station_goals/bluespace_tap.dm +++ b/code/modules/station_goals/bluespace_tap.dm @@ -457,7 +457,7 @@ radio.autosay("Power spike detected during Bluespace Harvester Operation. Large bluespace payload inbound.", name, "Engineering") // Build location list cache once var/list/possible_spawns = list() - var/list/random_spawns = GLOB.nukedisc_respawn + var/list/random_spawns = GLOB.maints_loot_spawns // Build list of spawn positions for(var/turf/current_target_turf in view(3, src)) possible_spawns.Add(current_target_turf) @@ -485,7 +485,7 @@ /obj/machinery/power/bluespace_tap/proc/find_spawn_location(random = FALSE) var/list/possible_spawns = list() if(random) - possible_spawns = GLOB.nukedisc_respawn + possible_spawns = GLOB.maints_loot_spawns else // Build list of spawn positions for(var/turf/current_target_turf in view(3, src))