From 11cef88fd0ed8008478bc33ced11b1925e4c0653 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sat, 23 Aug 2014 21:32:00 -0600 Subject: [PATCH 1/4] Station Name will always be Space Station 13 Similar to how we removed randomized Centcom names for clarity, I'd like to remove randomized station names so there's no confusion as to what "North Death-Trap Delta" is. --- code/__HELPERS/names.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index b894a997d47..48b4300e06b 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -50,7 +50,7 @@ var/religion_name = null 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 = "Space Station 13" if (config && config.server_name) world.name = "[config.server_name]: [short_name]" From 6866407dd3212b6d27cd948e9ba166da224a6fb0 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sun, 24 Aug 2014 10:06:47 -0600 Subject: [PATCH 2/4] Made the station name on cargo manifests consistent with station names printed elsewhere --- code/controllers/supply_shuttle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/supply_shuttle.dm b/code/controllers/supply_shuttle.dm index 3f6af30ac58..3f8238177f0 100644 --- a/code/controllers/supply_shuttle.dm +++ b/code/controllers/supply_shuttle.dm @@ -354,7 +354,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle var/obj/item/weapon/paper/manifest/slip = new /obj/item/weapon/paper/manifest(A) - var printed_station_name = world.name // World name is available in the title bar, station_name can be different based on config. + var printed_station_name = station_name() if(prob(5)) printed_station_name = new_station_name() slip.erroneous |= MANIFEST_ERROR_NAME // They got our station name wrong. BASTARDS! From 8744b83ae1958f2ba1d12d0d0e48602d0c770ee3 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sun, 24 Aug 2014 17:36:27 -0600 Subject: [PATCH 3/4] It's now a config option --- code/__HELPERS/names.dm | 20 +++++--------------- code/controllers/configuration.dm | 5 ++++- config/config.txt | 5 ++++- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 48b4300e06b..bad23efef85 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -48,12 +48,13 @@ var/religion_name = null return station_name 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 = "Space Station 13" + if (config && config.station_name) + station_name = config.station_name + else + station_name = new_station_name() if (config && config.server_name) - world.name = "[config.server_name]: [short_name]" + world.name = config.server_name else world.name = station_name @@ -108,17 +109,6 @@ var/religion_name = null new_station_name += pick("13","XIII","Thirteen") return new_station_name -/proc/world_name(var/name) - - station_name = name - - if (config && config.server_name) - world.name = "[config.server_name]: [name]" - else - world.name = name - - return name - var/syndicate_name = null /proc/syndicate_name() if (syndicate_name) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 2cde6a019a7..b74828c83f0 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -6,7 +6,8 @@ #define EVERYONE_HAS_MAINT_ACCESS 4 /datum/configuration - var/server_name = null // server name (for world name / status) + var/server_name = null // server name (the name of the game window) + var/station_name = null // station name (the name of the station in-game) var/server_suffix = 0 // generate numeric suffix based on server port var/lobby_countdown = 120 // In between round countdown. @@ -234,6 +235,8 @@ config.respawn = 0 if("servername") config.server_name = value + if("stationname") + config.station_name = value if("serversuffix") config.server_suffix = 1 if("hostedby") diff --git a/config/config.txt b/config/config.txt index d886eef1e80..a4e9469997f 100644 --- a/config/config.txt +++ b/config/config.txt @@ -1,6 +1,9 @@ -## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice +## Server name: This appears at the top of the screen in-game. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice # SERVERNAME tgstation +## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead. +STATIONNAME Space Station 13 + # Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready. LOBBY_COUNTDOWN 120 From 94c290c6976b4cefbd512d519814371d054a2e79 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sun, 24 Aug 2014 17:52:20 -0600 Subject: [PATCH 4/4] -Station name will always be reported on the game window. -Round-start will report the station name --- code/__HELPERS/names.dm | 2 +- code/game/gamemodes/gameticker.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index bad23efef85..f7caa812336 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -54,7 +54,7 @@ var/religion_name = null station_name = new_station_name() if (config && config.server_name) - world.name = config.server_name + world.name = "[config.server_name][config.server_name==station_name ? "" : ": [station_name]"]" else world.name = station_name diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 55357a20be6..daf9f4e707f 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -137,7 +137,7 @@ var/round_start_time = 0 //Deleting Startpoints but we need the ai point to AI-ize people later if (S.name != "AI") qdel(S) - world << "Enjoy the game!" + world << "Welcome to [station_name()], enjoy your stay!" world << sound('sound/AI/welcome.ogg') // Skie //Holiday Round-start stuff ~Carn if(events.holiday)