From 8f410429dec22c19bec1a73085a3e20458bff4d6 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 13 Jul 2019 07:08:03 +0200 Subject: [PATCH] Ports "Renames SSsqueak to SSminor_mapping" --- code/__DEFINES/subsystems.dm | 2 +- .../subsystem/{squeak.dm => minor_mapping.dm} | 22 +++++++++---------- code/modules/events/mice_migration.dm | 2 +- tgstation.dme | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) rename code/controllers/subsystem/{squeak.dm => minor_mapping.dm} (66%) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index ecd1ef1e21..19d0540e0e 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -81,7 +81,7 @@ #define INIT_ORDER_STICKY_BAN -10 #define INIT_ORDER_LIGHTING -20 #define INIT_ORDER_SHUTTLE -21 -#define INIT_ORDER_SQUEAK -40 +#define INIT_ORDER_MINOR_MAPPING -40 #define INIT_ORDER_PATH -50 #define INIT_ORDER_PERSISTENCE -100 diff --git a/code/controllers/subsystem/squeak.dm b/code/controllers/subsystem/minor_mapping.dm similarity index 66% rename from code/controllers/subsystem/squeak.dm rename to code/controllers/subsystem/minor_mapping.dm index 861bb0d8d5..a06d48a1de 100644 --- a/code/controllers/subsystem/squeak.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -1,19 +1,14 @@ -// The Squeak -// because this is about placement of mice mobs, and nothing to do with -// mice - the computer peripheral - -SUBSYSTEM_DEF(squeak) - name = "Squeak" - init_order = INIT_ORDER_SQUEAK +SUBSYSTEM_DEF(minor_mapping) + name = "Minor Mapping" + init_order = INIT_ORDER_MINOR_MAPPING flags = SS_NO_FIRE - var/list/exposed_wires = list() - -/datum/controller/subsystem/squeak/Initialize(timeofday) +/datum/controller/subsystem/minor_mapping/Initialize(timeofday) trigger_migration(CONFIG_GET(number/mice_roundstart)) return ..() -/datum/controller/subsystem/squeak/proc/trigger_migration(num_mice=10) +/datum/controller/subsystem/minor_mapping/proc/trigger_migration(num_mice=10) + var/list/exposed_wires = find_exposed_wires() if(!num_mice) return find_exposed_wires() @@ -31,7 +26,8 @@ SUBSYSTEM_DEF(squeak) num_mice -= 1 M = null -/datum/controller/subsystem/squeak/proc/find_exposed_wires() +/proc/find_exposed_wires() + var/list/exposed_wires = list() exposed_wires.Cut() var/list/all_turfs for (var/z in SSmapping.levels_by_trait(ZTRAIT_STATION)) @@ -41,3 +37,5 @@ SUBSYSTEM_DEF(squeak) continue if(locate(/obj/structure/cable) in T) exposed_wires += T + + return shuffle(exposed_wires) \ No newline at end of file diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm index b01ff4237e..48a9f00423 100644 --- a/code/modules/events/mice_migration.dm +++ b/code/modules/events/mice_migration.dm @@ -32,4 +32,4 @@ P.update_icon() /datum/round_event/mice_migration/start() - SSsqueak.trigger_migration(rand(minimum_mice, maximum_mice)) + SSminor_mapping.trigger_migration(rand(minimum_mice, maximum_mice)) diff --git a/tgstation.dme b/tgstation.dme index 3a14a0700b..3e493d7135 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -244,6 +244,7 @@ #include "code\controllers\subsystem\machines.dm" #include "code\controllers\subsystem\mapping.dm" #include "code\controllers\subsystem\medals.dm" +#include "code\controllers\subsystem\minor_mapping.dm" #include "code\controllers\subsystem\mobs.dm" #include "code\controllers\subsystem\moods.dm" #include "code\controllers\subsystem\nightshift.dm" @@ -260,7 +261,6 @@ #include "code\controllers\subsystem\server_maint.dm" #include "code\controllers\subsystem\shuttle.dm" #include "code\controllers\subsystem\spacedrift.dm" -#include "code\controllers\subsystem\squeak.dm" #include "code\controllers\subsystem\stickyban.dm" #include "code\controllers\subsystem\sun.dm" #include "code\controllers\subsystem\tgui.dm"