diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 9dce620e25..e335669acc 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -581,43 +581,6 @@ SUBSYSTEM_DEF(ticker)
CHECK_TICK
- //Borers
- var/borerwin = FALSE
- if(GLOB.borers.len)
- var/borertext = "
The borers were:"
- for(var/mob/living/simple_animal/borer/B in GLOB.borers)
- if((B.key || B.controlling) && B.stat != DEAD)
- borertext += "
[B.controlling ? B.victim.key : B.key] was [B.truename] ("
- var/turf/location = get_turf(B)
- if(location.z == ZLEVEL_CENTCOM && B.victim)
- borertext += "escaped with host"
- else
- borertext += "failed"
- borertext += ")"
- to_chat(world, borertext)
-
- var/total_borers = 0
- for(var/mob/living/simple_animal/borer/B in GLOB.borers)
- if((B.key || B.victim) && B.stat != DEAD)
- total_borers++
- if(total_borers)
- var/total_borer_hosts = 0
- for(var/mob/living/carbon/C in GLOB.mob_list)
- var/mob/living/simple_animal/borer/D = C.has_brain_worms()
- var/turf/location = get_turf(C)
- if(location.z == ZLEVEL_CENTCOM && D && D.stat != DEAD)
- total_borer_hosts++
- if(GLOB.total_borer_hosts_needed <= total_borer_hosts)
- borerwin = TRUE
- to_chat(world, "There were [total_borers] borers alive at round end!")
- to_chat(world, "A total of [total_borer_hosts] borers with hosts escaped on the shuttle alive. The borers needed [GLOB.total_borer_hosts_needed] hosts to escape.")
- if(borerwin)
- to_chat(world, "The borers were successful!")
- else
- to_chat(world, "The borers have failed!")
-
- CHECK_TICK
-
mode.declare_station_goal_completion()
CHECK_TICK
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 4c03417aa9..f71bb2cf45 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -264,6 +264,43 @@
send2irc("Server", "Round just ended.")
if(cult.len && !istype(SSticker.mode,/datum/game_mode/cult))
datum_cult_completion()
+
+ if(GLOB.borers.len)
+ var/borerwin = FALSE
+ var/borertext = "
The borers were:"
+ for(var/mob/living/simple_animal/borer/B in GLOB.borers)
+ if((B.key || B.controlling) && B.stat != DEAD)
+ borertext += "
[B.controlling ? B.victim.key : B.key] was [B.truename] ("
+ var/turf/location = get_turf(B)
+ if(location.z == ZLEVEL_CENTCOM && B.victim)
+ borertext += "escaped with host"
+ else
+ borertext += "failed"
+ borertext += ")"
+ to_chat(world, borertext)
+
+ var/total_borers = 0
+ for(var/mob/living/simple_animal/borer/B in GLOB.borers)
+ if((B.key || B.victim) && B.stat != DEAD)
+ total_borers++
+ if(total_borers)
+ var/total_borer_hosts = 0
+ for(var/mob/living/carbon/C in GLOB.mob_list)
+ var/mob/living/simple_animal/borer/D = C.has_brain_worms()
+ var/turf/location = get_turf(C)
+ if(location.z == ZLEVEL_CENTCOM && D && D.stat != DEAD)
+ total_borer_hosts++
+ if(GLOB.total_borer_hosts_needed <= total_borer_hosts)
+ borerwin = TRUE
+ to_chat(world, "There were [total_borers] borers alive at round end!")
+ to_chat(world, "A total of [total_borer_hosts] borers with hosts escaped on the shuttle alive. The borers needed [GLOB.total_borer_hosts_needed] hosts to escape.")
+ if(borerwin)
+ to_chat(world, "The borers were successful!")
+ else
+ to_chat(world, "The borers have failed!")
+
+ CHECK_TICK
+
return 0