From 520699c4ae3ba6932355effd64a7a09114796619 Mon Sep 17 00:00:00 2001 From: Krausus Date: Mon, 11 May 2015 07:16:34 -0400 Subject: [PATCH] Fixes spawning as NPC/drone before game start --- .../mob/living/silicon/robot/drone/drone_manufacturer.dm | 4 ++++ code/modules/mob/mob.dm | 4 ++++ 2 files changed, 8 insertions(+) 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 0220dcc4d17..b0912774424 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -97,6 +97,10 @@ if(jobban_isbanned(src,"nonhumandept") || jobban_isbanned(src,"Drone")) usr << "\red You are banned from playing drones and cannot spawn as a drone." return + + if(!ticker || ticker.current_state < 3) + src << "You can't join as a drone before the game starts!" + return var/drone_age = 14 // 14 days to play as a drone var/player_age_check = check_client_age(usr.client, drone_age) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ac726058103..368c79ca93b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1337,6 +1337,10 @@ mob/proc/yank_out_object() usr << "You are banned from playing as NPC's." return + if(!ticker || ticker.current_state < 3) + src << "You can't respawn as an NPC before the game starts!" + return + if((usr in respawnable_list) && (stat==2 || istype(usr,/mob/dead/observer))) var/list/creatures = list("Mouse") for(var/mob/living/L in living_mob_list)