Use station_name proc where possible, mapfix

code/controllers/shuttle_controller.dm

@@ -217,8 +217,8 @@ var/global/datum/shuttle_controller/shuttle_controller
 		)
 
 	VS.announcer = "NSV Icarus"
-	VS.arrival_message = "Attention, Cyberiad, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not."
-	VS.departure_message = "Your guests are pulling away, Cyberiad - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip."
+	VS.arrival_message = "Attention, [station_name()], we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not."
+	VS.departure_message = "Your guests are pulling away, [station_name()] - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip."
 	VS.interim = locate(/area/vox_station/transit)
 
 	VS.warmup_time = 0
@@ -240,8 +240,8 @@ var/global/datum/shuttle_controller/shuttle_controller
 		)
 
 	MS.announcer = "NSV Icarus"
-	MS.arrival_message = "Attention, Cyberiad, you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors."
-	MS.departure_message = "Your visitors are on their way out of the system, Cyberiad, burning delta-v like it's nothing. Good riddance."
+	MS.arrival_message = "Attention, [station_name()], you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors."
+	MS.departure_message = "Your visitors are on their way out of the system, [station_name()], burning delta-v like it's nothing. Good riddance."
 	MS.interim = locate(/area/syndicate_station/transit)
 
 	MS.warmup_time = 0

code/game/objects/items/flag.dm

@@ -95,7 +95,7 @@
 
 /obj/item/flag/pony
 	name = "Equestria flag"
-	desc = "The flag of the independant, sovereign nation of Equestria, whatever the fuck that is."
+	desc = "The flag of the independent, sovereign nation of Equestria, whatever the fuck that is."
 	icon_state = "ponyflag"
 
 /obj/item/flag/ian
@@ -160,32 +160,32 @@
 
 /obj/item/flag/cargo
 	name = "Cargonia flag"
-	desc = "The flag of the independant, sovereign nation of Cargonia."
+	desc = "The flag of the independent, sovereign nation of Cargonia."
 	icon_state = "cargoflag"
 
 /obj/item/flag/med
 	name = "Medistan flag"
-	desc = "The flag of the independant, sovereign nation of Medistan."
+	desc = "The flag of the independent, sovereign nation of Medistan."
 	icon_state = "medflag"
 
 /obj/item/flag/sec
 	name = "Brigston flag"
-	desc = "The flag of the independant, sovereign nation of Brigston."
+	desc = "The flag of the independent, sovereign nation of Brigston."
 	icon_state = "secflag"
 
 /obj/item/flag/rnd
 	name = "Scientopia flag"
-	desc = "The flag of the independant, sovereign nation of Scientopia."
+	desc = "The flag of the independent, sovereign nation of Scientopia."
 	icon_state = "rndflag"
 
 /obj/item/flag/atmos
 	name = "Atmosia flag"
-	desc = "The flag of the independant, sovereign nation of Atmosia."
+	desc = "The flag of the independent, sovereign nation of Atmosia."
 	icon_state = "atmosflag"
 
 /obj/item/flag/command
 	name = "Command flag"
-	desc = "The flag of the independant, sovereign nation of Command."
+	desc = "The flag of the independent, sovereign nation of Command."
 	icon_state = "ntflag"
 
 //Antags

code/game/objects/items/weapons/manuals.dm

@@ -77,9 +77,6 @@
 	dat = {"Engineering notes on single-stage Supermatter engine,</br>
 			-Waleed Asad</br>
 
-			Station,</br>
-			Cyberiad</br>
-
 			A word of caution, do not enter the engine room, for any reason, without radiation protection and mesons on. The status of the engine may be unpredictable even when you believe it is .off.. This is an important level of personal protection.</br></br>
 
 			The engine has two basic modes of functionality. He has observed that it is capable of both a safe level of operation and a modified, high output mode.</br></br>

code/modules/admin/admin.dm

@@ -913,7 +913,7 @@ var/global/nologevent = 0
 			usr << "<b>AI [key_name(S, usr)]'s laws:</b>"
 		else if(isrobot(S))
 			var/mob/living/silicon/robot/R = S
-			usr << "<b>CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independant)"]: laws:</b>"
+			usr << "<b>CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independent)"]: laws:</b>"
 		else if (ispAI(S))
 			usr << "<b>pAI [key_name(S, usr)]'s laws:</b>"
 		else

code/modules/admin/verbs/onlyoneteam.dm

@@ -17,7 +17,7 @@
 				continue
 			del(I)
 
-		H << "<B>You are part of the Cyberiad dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.</B>"
+		H << "<B>You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.</B>"
 
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
 //		H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head)

code/modules/clothing/under/miscellaneous.dm

@@ -94,7 +94,7 @@
 	displays_id = 0
 
 /obj/item/clothing/under/rank/centcom/blueshield
-	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant\" and bears \"N.C.S. Cyberiad\" on the left shounder."
+	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant\" and bears \"N.S.S. Cyberiad\" on the left shounder."
 	name = "\improper Nanotrasen Navy Uniform"
 	icon_state = "officer"
 	item_state = "g_suit"
@@ -103,7 +103,7 @@
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/centcom/representative
-	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.C.S. Cyberiad\" on the left shounder."
+	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.S.S. Cyberiad\" on the left shounder."
 	name = "\improper Nanotrasen Navy Uniform"
 	icon_state = "officer"
 	item_state = "g_suit"

code/modules/economy/Economy_TradeDestinations.dm

@@ -43,7 +43,7 @@ var/list/weighted_mundaneevent_locations = list()
 
 /datum/trade_destination/icarus
 	name = "NMV Icarus"
-	description = "Corvette assigned to patrol NSS Cyberiad local space."
+	description = "Corvette assigned to patrol the station's local space."
 	distance = 0.1
 	willing_to_buy = list()
 	willing_to_sell = list()

code/modules/mob/mob_helpers.dm

@@ -150,6 +150,11 @@ proc/isorgan(A)
 		if(L && L.implanted)
 			return 1
 	return 0
+	
+proc/isnewplayer(A)
+	if(istype(A, /mob/new_player))
+		return 1
+	return 0
 
 proc/hasorgans(A)
 	return ishuman(A)