cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-09 16:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Station Charter now keeps the server name in the game's window name after renaming the station (#21030)

Browse Source 
* Charter now keeps the server name after renaming the station

* Changes instances of "world.name" to use the proper proc to get the station name.
This commit is contained in:
Leo
2016-10-19 01:54:22 -02:00
committed by oranges
parent 44c558d438
commit 9cd27d136a
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/miniantags/abduction/abduction.dm
View File

@@ -19,7 +19,7 @@
/datum/game_mode/abduction/announce()
world << "<B>The current game mode is - Abduction!</B>"
world << "There are alien <b>abductors</b> sent to [world.name] to perform nefarious experiments!"
world << "There are alien <b>abductors</b> sent to [station_name()] to perform nefarious experiments!"
world << "<b>Abductors</b> - kidnap the crew and replace their organs with experimental ones."
world << "<b>Crew</b> - don't get abducted and stop the abductors."

11
code/game/objects/items/charter.dm
View File

@@ -80,14 +80,17 @@
response_timer_id = null
/obj/item/station_charter/proc/rename_station(designation, mob/user)
if(config && config.server_name)
world.name = "[config.server_name]: [designation]"
else
world.name = designation
station_name = designation
minor_announce("[user.real_name] has designated your station as [world.name]", "Captain's Charter", 0)
log_game("[key_name(user)] has renamed the station as [world.name]")
minor_announce("[user.real_name] has designated your station as [station_name()]", "Captain's Charter", 0)
log_game("[key_name(user)] has renamed the station as [station_name()].")
name = "station charter for [world.name]"
name = "station charter for [station_name()]"
desc = "An official document entrusting the governance of \
[world.name] and surrounding space to Captain [user]."
[station_name()] and surrounding space to Captain [user]."
if(!unlimited_uses)
used = TRUE

2
code/modules/events/shuttle_loan.dm
View File

@@ -64,7 +64,7 @@
if(ANTIDOTE_NEEDED)
SSshuttle.centcom_message += "Virus samples incoming."
if(PIZZA_DELIVERY)
SSshuttle.centcom_message += "Pizza delivery for [world.name]"
SSshuttle.centcom_message += "Pizza delivery for [station_name()]"
/datum/round_event/shuttle_loan/tick()
if(dispatched)

2
code/modules/stock_market/computer.dm
View File

@@ -10,7 +10,7 @@
/obj/machinery/computer/stockexchange/New()
..()
logged_in = "[world.name] Cargo Department"
logged_in = "[station_name()] Cargo Department"
/obj/machinery/computer/stockexchange/proc/balance()
if (!logged_in)