From faf90c3fdcf080813c376f95684d8f99ab946f01 Mon Sep 17 00:00:00 2001 From: Markolie Date: Tue, 6 Jan 2015 22:07:42 +0100 Subject: [PATCH] Proper drone solution (I shouldn't code at late night) --- .../mob/living/silicon/robot/drone/drone_manufacturer.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 f9dbce1c52f..80485a0cd77 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -100,11 +100,14 @@ return var/deathtime = world.time - src.timeofdeath + var/joinedasobserver = 0 if(istype(src,/mob/dead/observer)) var/mob/dead/observer/G = src if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted) usr << "\blue Upon using the antagHUD you forfeited the ability to join the round." return + if(G.started_as_observer == 1) + joinedasobserver = 1 var/deathtimeminutes = round(deathtime / 600) var/pluralcheck = "minute" @@ -116,7 +119,7 @@ pluralcheck = " [deathtimeminutes] minutes and" var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1) - if (deathtime < 6000) + if (deathtime < 6000 && joinedasobserver == 0) if(istype(src,/mob/dead/observer)) var/mob/dead/observer/O = src if(O.started_as_observer == 0)