From 5be1242ce8155eff1ee24a50cf274f95511793ad Mon Sep 17 00:00:00 2001 From: Bxil Date: Tue, 23 Jan 2018 10:36:49 +0100 Subject: [PATCH 1/8] Syndicate shuttle now uses correct station name --- .../machinery/computer/syndicate_specops_shuttle.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 14a3fdb72ca..b1a278a8955 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -172,7 +172,7 @@ var/syndicate_elite_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived to [station_name]. Commence operation!") + to_chat(M, "You have arrived to [station_name()]. Commence operation!") /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 @@ -209,8 +209,8 @@ var/syndicate_elite_shuttle_timeleft = 0 dat = temp else dat = {"
Special Operations Shuttle
- \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
- [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name]
\n
"] + \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
+ [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -237,7 +237,7 @@ var/syndicate_elite_shuttle_timeleft = 0 to_chat(usr, "The Syndicate Elite shuttle is unable to leave.") return - to_chat(usr, "The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") + to_chat(usr, "The Syndicate Elite shuttle will arrive on [station_name()] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") temp = "Shuttle departing.

OK" updateUsrDialog() @@ -257,4 +257,4 @@ var/syndicate_elite_shuttle_timeleft = 0 add_fingerprint(usr) updateUsrDialog() - return \ No newline at end of file + return From 2370662fb15a7408b2dc73b6d0932310fb57fd89 Mon Sep 17 00:00:00 2001 From: Bxil Date: Tue, 23 Jan 2018 10:38:29 +0100 Subject: [PATCH 2/8] NT specops now uses correct station name --- code/game/machinery/computer/specops_shuttle.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index d50d0355d5c..b29d79f40d8 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -231,7 +231,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived to [station_name]. Commence operation!") + to_chat(M, "You have arrived to [station_name()]. Commence operation!") for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -275,8 +275,8 @@ var/specops_shuttle_timeleft = 0 dat = temp else dat += {"
Special Operations Shuttle
- \nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
- [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name]
\n
"] + \nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
+ [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -318,7 +318,7 @@ var/specops_shuttle_timeleft = 0 to_chat(usr, "The Special Operations shuttle is unable to leave.") return - to_chat(usr, "The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.") + to_chat(usr, "The Special Operations shuttle will arrive on [station_name()] in [(SPECOPS_MOVETIME/10)] seconds.") temp += "Shuttle departing.

OK" updateUsrDialog() @@ -337,4 +337,4 @@ var/specops_shuttle_timeleft = 0 add_fingerprint(usr) updateUsrDialog() - return \ No newline at end of file + return From ac5a54c304515beb532a5adbdc5bd9473eaead38 Mon Sep 17 00:00:00 2001 From: Bxil Date: Fri, 9 Feb 2018 07:51:41 +0100 Subject: [PATCH 3/8] Station, CC, Starsys corrections --- code/__HELPERS/names.dm | 40 +++------------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 6b90ace2489..6772af2228a 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -17,19 +17,7 @@ var/church_name = null var/command_name = null /proc/command_name() - if(command_name) - return command_name - - var/name = "Central Command" - - command_name = name - return name - -/proc/change_command_name(var/name) - - command_name = name - - return name ++ return using_map.dock_name var/religion_name = null /proc/religion_name() @@ -44,20 +32,10 @@ var/religion_name = null return capitalize(name) /proc/system_name() - return "Nyx" ++ return using_map.starsys_name /proc/station_name() - if(station_name) - return station_name - - var/name = "" - - if(config && config.server_name) - world.name = "[config.server_name]: [name]" - else - world.name = station_name - - return station_name + return using_map.station_name /proc/new_station_name() var/random = rand(1,5) @@ -102,18 +80,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) From 434cbfdb27c65e2b5bfaf1e6aee8df711fe2e465 Mon Sep 17 00:00:00 2001 From: Bxil Date: Fri, 9 Feb 2018 07:53:12 +0100 Subject: [PATCH 4/8] Cargo shuttle station name --- code/modules/shuttle/supply.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 4a060385dea..77d77c5706d 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -297,7 +297,7 @@ var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(_loc) playsound(_loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) reqform.name = "Requisition Form - [crates] '[object.name]' for [orderedby]" - reqform.info += "

[station_name] Supply Requisition Form

" + reqform.info += "

[station_name()] Supply Requisition Form

" reqform.info += "INDEX: #[shuttle_master.ordernum]
" reqform.info += "REQUESTED BY: [orderedby]
" reqform.info += "RANK: [orderedbyRank]
" From 660489f682bccfd0fd58e7fa69e6158989239ec0 Mon Sep 17 00:00:00 2001 From: Bxil Date: Fri, 9 Feb 2018 07:55:04 +0100 Subject: [PATCH 5/8] WE'VE BEEN DEFINING station_name TWICE FOR YEARS --- code/_globalvars/configuration.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm index 88d4594e740..d26dc711339 100644 --- a/code/_globalvars/configuration.dm +++ b/code/_globalvars/configuration.dm @@ -2,7 +2,6 @@ var/datum/configuration/config = null var/host = null var/join_motd = null -var/station_name = "NSS Cyberiad" var/game_version = "Custom ParaCode" var/changelog_hash = md5('html/changelog.html') //used to check if the CL changed var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544) From e568a6bd58c0bc47216d1b1889ba97c0877eca5c Mon Sep 17 00:00:00 2001 From: Bxil Date: Fri, 9 Feb 2018 07:57:10 +0100 Subject: [PATCH 6/8] World name = station name --- code/world.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/world.dm b/code/world.dm index 9d41a06c0fb..557b79dfa35 100644 --- a/code/world.dm +++ b/code/world.dm @@ -67,8 +67,12 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG map_name = "[using_map.name]" else map_name = "Unknown" - - + + + if(config && config.server_name) + name = "[config.server_name]: [station_name()]" + else + name = station_name() #undef RECOMMENDED_VERSION From db145bbcf00c36aec96a14ebd60a802b9aa5211f Mon Sep 17 00:00:00 2001 From: Bxil Date: Fri, 9 Feb 2018 08:10:27 +0100 Subject: [PATCH 7/8] Ryan is still an idiot --- code/__HELPERS/names.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 6772af2228a..d6ae4ea9b1b 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -17,7 +17,7 @@ var/church_name = null var/command_name = null /proc/command_name() -+ return using_map.dock_name + return using_map.dock_name var/religion_name = null /proc/religion_name() @@ -32,7 +32,7 @@ var/religion_name = null return capitalize(name) /proc/system_name() -+ return using_map.starsys_name + return using_map.starsys_name /proc/station_name() return using_map.station_name From cdf25e8577226673ec9cf1563969cd21d7c179a6 Mon Sep 17 00:00:00 2001 From: Bxil Date: Fri, 9 Feb 2018 08:20:21 +0100 Subject: [PATCH 8/8] No holidays fer u --- code/modules/holiday/holiday.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/holiday/holiday.dm b/code/modules/holiday/holiday.dm index 85162a75c2d..414df7f7589 100644 --- a/code/modules/holiday/holiday.dm +++ b/code/modules/holiday/holiday.dm @@ -349,10 +349,8 @@ holiday_master.holidays = list() holiday_master.holidays[H.name] = H - station_name = null - station_name() //update our hub status world.update_status() message_admins("ADMIN: Event: [key_name_admin(src)] force-set Holiday to \"[H]\"") - log_admin("[key_name(src)] force-set Holiday to \"[H]\"") \ No newline at end of file + log_admin("[key_name(src)] force-set Holiday to \"[H]\"")