From adbdb0b1a180c9218d5f658299e96dc881dbc4fb Mon Sep 17 00:00:00 2001 From: mikomyazaki Date: Sun, 20 Feb 2022 14:50:39 +0000 Subject: [PATCH] Maintenance drone spawners should reference current map instead of Aurora. --- code/__defines/misc.dm | 2 -- code/modules/ghostroles/spawner/atom/mining_drone.dm | 2 +- code/modules/ghostroles/spawner/simplemob/maintdrone.dm | 9 ++++++++- code/modules/mob/living/silicon/robot/drone/drone.dm | 3 ++- .../mob/living/silicon/robot/drone/drone_manufacturer.dm | 3 ++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 33d3b079543..43a335ca8e0 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -479,8 +479,6 @@ Define for getting a bitfield of adjacent turfs that meet a condition. #define COOK_CHECK_EXTRA 0 #define COOK_CHECK_EXACT 1 -#define STATION_TAG "Aurora" - //Planet habitability class #define HABITABILITY_IDEAL 1 #define HABITABILITY_OKAY 2 diff --git a/code/modules/ghostroles/spawner/atom/mining_drone.dm b/code/modules/ghostroles/spawner/atom/mining_drone.dm index f52656d0343..5871ee99cd8 100644 --- a/code/modules/ghostroles/spawner/atom/mining_drone.dm +++ b/code/modules/ghostroles/spawner/atom/mining_drone.dm @@ -22,5 +22,5 @@ var/designation = "[drone_tag]-[rand(100,999)]" M.set_name("NT-[designation]") M.designation = designation - assign_drone_to_matrix(M, STATION_TAG) + assign_drone_to_matrix(M, current_map.station_short) return M diff --git a/code/modules/ghostroles/spawner/simplemob/maintdrone.dm b/code/modules/ghostroles/spawner/simplemob/maintdrone.dm index 1d9c05c4bd4..826f880b1fc 100644 --- a/code/modules/ghostroles/spawner/simplemob/maintdrone.dm +++ b/code/modules/ghostroles/spawner/simplemob/maintdrone.dm @@ -1,7 +1,7 @@ /datum/ghostspawner/simplemob/maintdrone short_name = "maintdrone" name = "Maintenance Drone" - desc = "Maintain and Improve the Systems on the Aurora." + desc = "Maintain and improve systems" show_on_job_select = FALSE tags = list("Simple Mobs") @@ -11,6 +11,13 @@ //Vars regarding the mob to use spawn_mob = /mob/living/silicon/robot/drone //The mob that should be spawned +/datum/ghostspawner/simplemob/maintdrone/New() + . = ..() + if(current_map.station_name) + desc = "[desc] on the [current_map.station_name]." + else + desc = "[desc]." + // we fake it here to ensure it pops up and gets added to SSghostroles.spawners, handling of the fabricators is done below /datum/ghostspawner/simplemob/maintdrone/select_spawnlocation() return TRUE diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 4af001ca250..c2e94b39cbe 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -201,11 +201,12 @@ law_type = /datum/ai_laws/matriarch_drone can_swipe = FALSE - var/matrix_tag = STATION_TAG + var/matrix_tag /mob/living/silicon/robot/drone/construction/matriarch/Initialize() . = ..() check_add_to_late_firers() + matrix_tag = current_map.station_short /mob/living/silicon/robot/drone/construction/matriarch/shut_down() return diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 367997cf8f8..d41f119c2e3 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -18,7 +18,7 @@ idle_power_usage = 20 active_power_usage = 5000 - var/fabricator_tag = STATION_TAG + var/fabricator_tag var/drone_progress = 0 var/produce_drones = TRUE var/time_last_drone = 500 @@ -31,6 +31,7 @@ /obj/machinery/drone_fabricator/Initialize() . = ..() check_add_to_late_firers() + fabricator_tag = current_map.station_short /obj/machinery/drone_fabricator/do_late_fire() enable_drone_spawn()