From bf490b96d1502ce7f40fbafd8e8e27d0e6458416 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 21 Mar 2021 18:04:06 -0900 Subject: [PATCH] Merge pull request #7993 from MistakeNot4892/tachikoma Removed inactive platforms from the end of round laws output, gives them pilot access. --- code/controllers/subsystems/ticker.dm | 5 +++++ .../living/silicon/robot/subtypes/thinktank/_thinktank.dm | 5 +++++ maps/southern_cross/southern_cross_overrides.dm | 1 + 3 files changed, 11 insertions(+) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 750f6807cca..d499f03d4d6 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -477,6 +477,11 @@ var/global/datum/controller/subsystem/ticker/ticker for (var/mob/living/silicon/robot/robo in mob_list) + if(istype(robo, /mob/living/silicon/robot/platform)) + var/mob/living/silicon/robot/platform/tank = robo + if(!tank.has_had_player) + continue + if(istype(robo,/mob/living/silicon/robot/drone) && !istype(robo,/mob/living/silicon/robot/drone/swarm)) dronecount++ continue diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm index 79279af6dd3..f777fe7996c 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm @@ -33,6 +33,7 @@ mob_push_flags = HEAVY mob_size = MOB_LARGE + var/has_had_player = FALSE var/const/platform_respawn_time = 3 MINUTES var/tmp/last_recharge_state = FALSE @@ -54,6 +55,10 @@ /obj/machinery/power/supermatter ) +/mob/living/silicon/robot/platform/Login() + . = ..() + has_had_player = TRUE + /mob/living/silicon/robot/platform/SetName(pickedName) . = ..() if(mind) diff --git a/maps/southern_cross/southern_cross_overrides.dm b/maps/southern_cross/southern_cross_overrides.dm index 6525446b1fd..71dd04da38b 100644 --- a/maps/southern_cross/southern_cross_overrides.dm +++ b/maps/southern_cross/southern_cross_overrides.dm @@ -7,3 +7,4 @@ /obj/item/weapon/card/id/platform/Initialize() . = ..() access |= access_explorer + access |= access_pilot