From 1504ab64bb008cc9d76e745ce8bedaae24e2a734 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Fri, 22 Nov 2013 01:33:28 -0300 Subject: [PATCH] Observing before the round stops loading won't generate runtimes anymore by ghosts making querys for the station's name. The station name will wait warmly and finally be created properly by the master controller. --- code/__HELPERS/names.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 85c8648f0dd..b894a997d47 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -47,16 +47,17 @@ var/religion_name = null if (station_name) return station_name - var/short_name = pick("Station", "Fortress", "Frontier", "Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard","Spess Junk", "Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb", "Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker", "Roost", "Fat Camp") + if(events) + var/short_name = pick("Station", "Fortress", "Frontier", "Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard","Spess Junk", "Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb", "Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker", "Roost", "Fat Camp") - station_name = new_station_name() + station_name = new_station_name() - if (config && config.server_name) - world.name = "[config.server_name]: [short_name]" - else - world.name = station_name + if (config && config.server_name) + world.name = "[config.server_name]: [short_name]" + else + world.name = station_name - return station_name + return station_name /proc/new_station_name() var/random = rand(1,5)