From 4745a3260ecfb11d2ea68da927c7b216db826ce7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 9 Oct 2020 18:32:06 +0200 Subject: [PATCH] [MIRROR] Mice properly spawn in maintenance during the migration event. (#1223) * Mice properly spawn in maintenance during the migration event. (#54243) fix: Mice properly spawn during the mouse migration event. Fixes #54242 . * Mice properly spawn in maintenance during the migration event. Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> --- code/controllers/subsystem/minor_mapping.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm index eca7502c0ca..355d9916462 100644 --- a/code/controllers/subsystem/minor_mapping.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -13,21 +13,21 @@ SUBSYSTEM_DEF(minor_mapping) /datum/controller/subsystem/minor_mapping/proc/trigger_migration(num_mice=10) var/list/exposed_wires = find_exposed_wires() - var/mob/living/simple_animal/M + var/mob/living/simple_animal/mouse/mouse var/turf/proposed_turf while((num_mice > 0) && exposed_wires.len) proposed_turf = pick_n_take(exposed_wires) if(prob(PROB_MOUSE_SPAWN)) - if(!M) - M = new(proposed_turf) + if(!mouse) + mouse = new(proposed_turf) else - M.forceMove(proposed_turf) + mouse.forceMove(proposed_turf) else - M = new /mob/living/simple_animal/hostile/regalrat/controlled(proposed_turf) - if(M.environment_air_is_safe()) + mouse = new /mob/living/simple_animal/hostile/regalrat/controlled(proposed_turf) + if(mouse.environment_air_is_safe()) num_mice -= 1 - M = null + mouse = null /datum/controller/subsystem/minor_mapping/proc/place_satchels(amount=10) var/list/turfs = find_satchel_suitable_turfs()