Merge pull request #2455 from SpadesNeil/Naming-Consistency

Station Naming Inconsistency Fixes

code/controllers/shuttle_controller.dm

@@ -209,7 +209,7 @@ var/global/datum/shuttle_controller/shuttle_controller
 	shuttle.docking_controller_tag = "centcom_shuttle"
 	shuttle.dock_target_station = "centcom_shuttle_dock_airlock"
 	shuttle.dock_target_offsite = "centcom_shuttle_bay"
-	shuttles["Centcom"] = shuttle
+	shuttles["CentCom"] = shuttle
 	process_shuttles += shuttle
 
 	shuttle = new()

code/datums/ai_law_sets.dm

@@ -10,7 +10,7 @@
 	add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
 	..()
 
-/******************** Nanotrasen/Malf ********************/
+/******************** NanoTrasen/Malf ********************/
 /datum/ai_laws/nanotrasen
 	name = "NT Default"
 	selectable = 1
@@ -30,7 +30,7 @@
 	set_zeroth_law(config.law_zero)
 	..()
 
-/************* Nanotrasen Aggressive *************/
+/************* NanoTrasen Aggressive *************/
 /datum/ai_laws/nanotrasen_aggressive
 	name = "NT Aggressive"
 	selectable = 1

code/datums/locations/nyx.dm

@@ -43,15 +43,15 @@
 
 /datum/locations/exodus
 	name = "NSS Exodus"
-	desc = "A highly profitable research, mining, and supply dock for Nanotrasen that serves as one of their many facilities in exploiting the \
+	desc = "A highly profitable research, mining, and supply dock for NanoTrasen that serves as one of their many facilities in exploiting the \
 	wonders of phoron. It is currently orbiting around Erebus and maintains close contact with the NAS Crescent. The station itself has been \
-	a target for a large number of Mercenaries and other companies wishing to steal Nanotrasen's secrets."
+	a target for a large number of Mercenaries and other companies wishing to steal NanoTrasen's secrets."
 
 /datum/locations/crescent
 	name = "NAS Crescent"
-	desc = "The main hub for Nanotrasen in the Nyx system and is commonly referred to it by their workers as central command or \"Centcomm\". \
+	desc = "The main hub for NanoTrasen in the Nyx system and is commonly referred to it by their workers as central command or \"CentCom\". \
 	The Crescent refines and stores much of the products that stations (such as the Exodus) bring in. It is also a large refueling and supply \
-	station of phoron and tritium in the Nyx system due to Nanotrasen being able to outsell almost any other company."
+	station of phoron and tritium in the Nyx system due to NanoTrasen being able to outsell almost any other company."
 
 /datum/locations/emerald_habitation
 	name = "Emerald Habitation"

code/datums/locations/vir.dm

@@ -49,7 +49,7 @@
 
 /datum/locations/northern_star //Inception joke here
 	name = "Northern Star"
-	desc = "The Northern Star is an asteroid colony owned and operated by Nanotrasen, among many other asteroid installations. \
+	desc = "The Northern Star is an asteroid colony owned and operated by NanoTrasen, among many other asteroid installations. \
 	Originally conceived as 'just another pitstop' for weary asteroid miners, it has grown to become a significant installation in the Kara subsystem."
 
 /datum/locations/northern_star/New(var/creator)

code/game/area/Space Station 13 areas.dm

@@ -166,7 +166,7 @@ area/space/atmosalert()
 	icon_state = "shuttle2"
 
 /area/shuttle/escape/centcom
-	name = "\improper Emergency Shuttle Centcom"
+	name = "\improper Emergency Shuttle CentCom"
 	icon_state = "shuttle"
 
 /area/shuttle/escape/transit // the area to pass through for 3 minute transit
@@ -302,7 +302,7 @@ area/space/atmosalert()
 
 /area/shuttle/transport1/centcom
 	icon_state = "shuttle"
-	name = "\improper Transport Shuttle Centcom"
+	name = "\improper Transport Shuttle CentCom"
 
 /area/shuttle/transport1/station
 	icon_state = "shuttle"
@@ -344,7 +344,7 @@ area/space/atmosalert()
 	icon_state = "shuttlered2"
 
 /area/shuttle/administration/centcom
-	name = "\improper Administration Shuttle Centcom"
+	name = "\improper Administration Shuttle CentCom"
 	icon_state = "shuttlered"
 
 /area/shuttle/administration/station
@@ -352,7 +352,7 @@ area/space/atmosalert()
 	icon_state = "shuttlered2"
 
 /area/shuttle/trade/centcom
-	name = "\improper Trade Shuttle Centcom"
+	name = "\improper Trade Shuttle CentCom"
 	icon_state = "shuttlered"
 
 /area/shuttle/trade/station
@@ -412,34 +412,34 @@ area/space/atmosalert()
 // CENTCOM
 
 /area/centcom
-	name = "\improper Centcom"
+	name = "\improper CentCom"
 	icon_state = "centcom"
 	requires_power = 0
 	lighting_use_dynamic = 0
 
 /area/centcom/control
-	name = "\improper Centcom Control"
+	name = "\improper CentCom Control"
 
 /area/centcom/evac
-	name = "\improper Centcom Emergency Shuttle"
+	name = "\improper CentCom Emergency Shuttle"
 
 /area/centcom/suppy
-	name = "\improper Centcom Supply Shuttle"
+	name = "\improper CentCom Supply Shuttle"
 
 /area/centcom/ferry
-	name = "\improper Centcom Transport Shuttle"
+	name = "\improper CentCom Transport Shuttle"
 
 /area/centcom/shuttle
-	name = "\improper Centcom Administration Shuttle"
+	name = "\improper CentCom Administration Shuttle"
 
 /area/centcom/test
-	name = "\improper Centcom Testing Facility"
+	name = "\improper CentCom Testing Facility"
 
 /area/centcom/living
-	name = "\improper Centcom Living Quarters"
+	name = "\improper CentCom Living Quarters"
 
 /area/centcom/specops
-	name = "\improper Centcom Special Ops"
+	name = "\improper CentCom Special Ops"
 
 /area/centcom/creed
 	name = "Creed's Office"
@@ -455,15 +455,15 @@ area/space/atmosalert()
 	name = "\improper Tram Station"
 
 /area/centcom/security
-	name = "\improper Centcom Security"
+	name = "\improper CentCom Security"
 	icon_state = "centcom_security"
 
 /area/centcom/medical
-	name = "\improper Centcom Medical"
+	name = "\improper CentCom Medical"
 	icon_state = "centcom_medical"
 
 /area/centcom/command
-	name = "\improper Centcom Command" //Central Command Command totally isn't RAS Syndrome in action.
+	name = "\improper CentCom Command" //Central Command Command totally isn't RAS Syndrome in action.
 	icon_state = "centcom_command"
 
 /area/centcom/main_hall
@@ -471,15 +471,15 @@ area/space/atmosalert()
 	icon_state = "centcom_hallway1"
 
 /area/centcom/bar
-	name = "\improper Centcom Bar"
+	name = "\improper CentCom Bar"
 	icon_state = "centcom_crew"
 
 /area/centcom/restaurant
-	name = "\improper Centcom Restaurant"
+	name = "\improper CentCom Restaurant"
 	icon_state = "centcom_crew"
 
 /area/centcom/bathroom
-	name = "\improper Centcom Bathroom"
+	name = "\improper CentCom Bathroom"
 	icon_state = "centcom_crew"
 
 //SYNDICATES
@@ -2527,20 +2527,20 @@ area/space/atmosalert()
 	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
 
 /area/tcommsat/entrance
-	name = "\improper Telecoms Teleporter"
+	name = "\improper Telecomms Teleporter"
 	icon_state = "tcomsatentrance"
 
 /area/tcommsat/chamber
-	name = "\improper Telecoms Central Compartment"
+	name = "\improper Telecomms Central Compartment"
 	icon_state = "tcomsatcham"
 
 /area/tcomsat
-	name = "\improper Telecoms Satellite"
+	name = "\improper Telecomms Satellite"
 	icon_state = "tcomsatlob"
 	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
 
 /area/tcomfoyer
-	name = "\improper Telecoms Foyer"
+	name = "\improper Telecomms Foyer"
 	icon_state = "tcomsatentrance"
 	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
 
@@ -2555,7 +2555,7 @@ area/space/atmosalert()
 	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
 
 /area/tcommsat/computer
-	name = "\improper Telecoms Control Room"
+	name = "\improper Telecomms Control Room"
 	icon_state = "tcomsatcomp"
 
 /area/tcommsat/lounge
@@ -2627,7 +2627,7 @@ area/space/atmosalert()
 	requires_power = 0
 
 /area/awaymission/spacebattle/cruiser
-	name = "\improper Nanotrasen Cruiser"
+	name = "\improper NanoTrasen Cruiser"
 
 /area/awaymission/spacebattle/syndicate1
 	name = "\improper Syndicate Assault Ship 1"

code/game/gamemodes/newobjective.dm

@@ -264,7 +264,7 @@ datum
 				target = targeta
 				job = joba
 				weight = get_points(job)
-				explanation_text = "Frame [target.current.real_name], the [target.assigned_role] for a crime and make sure they are arrested and brought back to the Centcom station alive.  We'll handle the rest from there."
+				explanation_text = "Frame [target.current.real_name], the [target.assigned_role] for a crime and make sure they are arrested and brought back to the CentCom station alive.  We'll handle the rest from there."
 
 			check_completion()
 				if(!emergency_shuttle.returned())

code/game/jobs/access.dm

@@ -237,10 +237,10 @@ proc/get_all_job_icons() //For all existing HUD icons
 			return I.rank
 
 		var/centcom = get_all_centcom_jobs()
-		if(I.assignment	in centcom) //Return with the NT logo if it is a Centcom job
+		if(I.assignment	in centcom) //Return with the NT logo if it is a CentCom job
-			return "Centcom"
+			return "CentCom"
 		if(I.rank in centcom)
-			return "Centcom"
+			return "CentCom"
 	else
 		return
 

code/game/machinery/camera/tracking.dm

@@ -222,7 +222,7 @@ mob/living/proc/near_camera()
 
 /mob/living/proc/tracking_status()
 	// Easy checks first.
-	// Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this.
+	// Don't detect mobs on CentCom. Since the wizard den is on CentCom, we only need this.
 	var/obj/item/weapon/card/id/id = GetIdCard()
 	if(id && id.prevent_tracking())
 		return TRACKING_TERMINATE

code/game/machinery/computer/communications.dm

@@ -173,7 +173,7 @@
 			src.updateDialog()
 
 		// OMG CENTCOMM LETTERHEAD
-		if("MessageCentcomm")
+		if("MessageCentCom")
 			if(src.authenticated==2)
 				if(centcomm_message_cooldown)
 					usr << "\red Arrays recycling.  Please stand by."
@@ -181,7 +181,7 @@
 				var/input = sanitize(input("Please choose a message to transmit to [boss_short] via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", ""))
 				if(!input || !(usr in view(1,src)))
 					return
-				Centcomm_announce(input, usr)
+				CentCom_announce(input, usr)
 				usr << "\blue Message transmitted."
 				log_say("[key_name(usr)] has made an IA [boss_short] announcement: [input]")
 				centcomm_message_cooldown = 1
@@ -295,7 +295,7 @@
 				if (src.authenticated==2)
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=announce'>Make An Announcement</A> \]"
 					if(src.emagged == 0)
-						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageCentcomm'>Send an emergency message to [boss_short]</A> \]"
+						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageCentCom'>Send an emergency message to [boss_short]</A> \]"
 					else
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageSyndicate'>Send an emergency message to \[UNKNOWN\]</A> \]"
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=RestoreBackup'>Restore Backup Routing Data</A> \]"

code/game/machinery/computer3/computers/communications.dm

@@ -22,8 +22,8 @@
 
 
 /datum/file/program/communications
-	name = "Centcom communications relay"
+	name = "CentCom communications relay"
-	desc = "Used to connect to Centcom."
+	desc = "Used to connect to CentCom."
 	active_state = "comm"
 	req_access = list(access_heads)
 
@@ -185,7 +185,7 @@
 			computer.updateDialog()
 
 		// OMG CENTCOMM LETTERHEAD
-		if("MessageCentcomm" in href_list)
+		if("MessageCentCom" in href_list)
 			if(!computer.radio.subspace)
 				return
 			if(authenticated==2)
@@ -195,7 +195,7 @@
 				var/input = sanitize(input("Please choose a message to transmit to [boss_short] via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response.", "To abort, send an empty message.", ""))
 				if(!input || !interactable())
 					return
-				Centcomm_announce(input, usr)
+				CentCom_announce(input, usr)
 				usr << "Message transmitted."
 				log_say("[key_name(usr)] has made a [boss_short] announcement: [input]")
 				centcomm_message_cooldown = 1
@@ -288,7 +288,7 @@
 			if (authenticated==2)
 				dat += "<BR>\[ <A HREF='?src=\ref[src];announce'>Make An Announcement</A> \]"
 				if(computer.emagged == 0)
-					dat += "<BR>\[ <A HREF='?src=\ref[src];MessageCentcomm'>Send an emergency message to [boss_short]</A> \]"
+					dat += "<BR>\[ <A HREF='?src=\ref[src];MessageCentCom'>Send an emergency message to [boss_short]</A> \]"
 				else
 					dat += "<BR>\[ <A HREF='?src=\ref[src];MessageSyndicate'>Send an emergency message to \[UNKNOWN\]</A> \]"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];RestoreBackup'>Restore Backup Routing Data</A> \]"

code/game/machinery/computer3/file.dm

@@ -62,13 +62,13 @@
 		return 1
 
 /*
-	Centcom root authorization certificate
+	CentCom root authorization certificate
 
 	Non-destructive, officially sanctioned.
 	Has the same effect on computers as an emag.
 */
 /datum/file/centcom_auth
-	name = "Centcom Root Access Token"
+	name = "CentCom Root Access Token"
 	extension = "auth"
 	volume = 100
 	copy()

code/game/machinery/computer3/lapvend.dm

@@ -178,7 +178,7 @@
 			else
 				usr << "\icon[src]<span class='warning'>Unable to access vendor account. Please record the machine ID and call [boss_short] Support.</span>"
 		else
-			usr << "\icon[src]<span class='warning'>Unable to access vendor account. Please record the machine ID and call CentComm Support.</span>"
+			usr << "\icon[src]<span class='warning'>Unable to access vendor account. Please record the machine ID and call CentCom Support.</span>"
 	else
 		transfer_and_vend(CH, C)
 
@@ -328,7 +328,7 @@
 				usr << "\icon[src]<span class='warning'>Unable to access vendor account. Please record the machine ID and call [boss_short] Support.</span>"
 				return 0
 		else
-			usr << "\icon[src]<span class='warning'>Unable to access vendor account. Please record the machine ID and call CentComm Support.</span>"
+			usr << "\icon[src]<span class='warning'>Unable to access vendor account. Please record the machine ID and call CentCom Support.</span>"
 			return 0
 	else
 		transfer_and_reimburse(CH)

code/game/machinery/telecomms/presets.dm

@@ -25,7 +25,7 @@
 	autolinkers = list("r_relay")
 
 /obj/machinery/telecomms/relay/preset/centcom
-	id = "Centcom Relay"
+	id = "CentCom Relay"
 	hide = 1
 	toggled = 1
 	//anchored = 1
@@ -44,7 +44,7 @@
 	"receiverA", "broadcasterA")
 
 /obj/machinery/telecomms/hub/preset_cent
-	id = "CentComm Hub"
+	id = "CentCom Hub"
 	network = "tcommsat"
 	produces_heat = 0
 	autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
@@ -65,7 +65,7 @@
 		..()
 
 /obj/machinery/telecomms/receiver/preset_cent
-	id = "CentComm Receiver"
+	id = "CentCom Receiver"
 	network = "tcommsat"
 	produces_heat = 0
 	autolinkers = list("receiverCent")
@@ -106,7 +106,7 @@
 	autolinkers = list("processor4", "engineering", "common")
 
 /obj/machinery/telecomms/bus/preset_cent
-	id = "CentComm Bus"
+	id = "CentCom Bus"
 	network = "tcommsat"
 	freq_listening = list(ERT_FREQ, DTH_FREQ)
 	produces_heat = 0
@@ -135,7 +135,7 @@
 	autolinkers = list("processor4")
 
 /obj/machinery/telecomms/processor/preset_cent
-	id = "CentComm Processor"
+	id = "CentCom Processor"
 	network = "tcommsat"
 	produces_heat = 0
 	autolinkers = list("processorCent")
@@ -200,7 +200,7 @@
 	autolinkers = list("security")
 
 /obj/machinery/telecomms/server/presets/centcomm
-	id = "CentComm Server"
+	id = "CentCom Server"
 	freq_listening = list(ERT_FREQ, DTH_FREQ)
 	produces_heat = 0
 	autolinkers = list("centcomm")
@@ -216,7 +216,7 @@
 	autolinkers = list("broadcasterA")
 
 /obj/machinery/telecomms/broadcaster/preset_cent
-	id = "CentComm Broadcaster"
+	id = "CentCom Broadcaster"
 	network = "tcommsat"
 	produces_heat = 0
 	autolinkers = list("broadcasterCent")

code/game/objects/effects/decals/posters/tgposters.dm

@@ -41,10 +41,10 @@
 
 /datum/poster/tg_9
 	name = "Missing Gloves"
-	desc = "This poster is about the uproar that followed Nanotrasen's financial cuts towards insulated-glove purchases."
+	desc = "This poster is about the uproar that followed NanoTrasen's financial cuts towards insulated-glove purchases."
 	icon_state="poster9"
 
 /datum/poster/tg_10
 	name = "Hacking Guide"
-	desc = "This poster details the internal workings of the common Nanotrasen airlock."
+	desc = "This poster details the internal workings of the common NanoTrasen airlock."
 	icon_state="poster10"

code/game/objects/items/weapons/storage/toolbox.dm

@@ -127,10 +127,10 @@
 	filled = TRUE
 
 /obj/item/weapon/storage/toolbox/lunchbox/nt
-	name = "Nanotrasen brand lunchbox"
+	name = "NanoTrasen brand lunchbox"
 	icon_state = "lunchbox_nanotrasen"
 	item_state_slots = list(slot_r_hand_str = "toolbox_blue", slot_l_hand_str = "toolbox_blue")
-	desc = "A little lunchbox. This one is branded with the Nanotrasen logo!"
+	desc = "A little lunchbox. This one is branded with the NanoTrasen logo!"
 
 /obj/item/weapon/storage/toolbox/lunchbox/nt/filled
 	filled = TRUE

code/game/objects/structures/crates_lockers/crates.dm

@@ -265,7 +265,7 @@
 
 /obj/structure/closet/crate/contraband
 	name = "Poster crate"
-	desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."
+	desc = "A random assortment of posters manufactured by providers NOT listed under NanoTrasen's whitelist."
 	icon_state = "crate"
 	icon_opened = "crateopen"
 	icon_closed = "crate"

code/global.dm

@@ -30,7 +30,7 @@ var/const/station_orig	= "Northern Star" //station_name can't be const due to ev
 var/const/station_short	= "Northern Star"
 var/const/dock_name		= "Vir Interstellar Spaceport"
 var/const/boss_name		= "Central Command"
-var/const/boss_short	= "Centcomm"
+var/const/boss_short	= "CentCom"
 var/const/company_name	= "NanoTrasen"
 var/const/company_short	= "NT"
 var/const/star_name		= "Vir"

code/modules/admin/topic.dm

@@ -1323,19 +1323,19 @@
 			M.Weaken(20)
 			M.stuttering = 20
 
-	else if(href_list["CentcommReply"])
+	else if(href_list["CentComReply"])
-		var/mob/living/L = locate(href_list["CentcommReply"])
+		var/mob/living/L = locate(href_list["CentComReply"])
 		if(!istype(L))
 			usr << "This can only be used on instances of type /mob/living/"
 			return
 
 		if(L.can_centcom_reply())
-			var/input = sanitize(input(src.owner, "Please enter a message to reply to [key_name(L)] via their headset.","Outgoing message from Centcomm", ""))
+			var/input = sanitize(input(src.owner, "Please enter a message to reply to [key_name(L)] via their headset.","Outgoing message from CentCom", ""))
 			if(!input)		return
 
 			src.owner << "You sent [input] to [L] via a secure channel."
-			log_admin("[src.owner] replied to [key_name(L)]'s Centcomm message with the message [input].")
+			log_admin("[src.owner] replied to [key_name(L)]'s CentCom message with the message [input].")
-			message_admins("[src.owner] replied to [key_name(L)]'s Centcom message with: \"[input]\"")
+			message_admins("[src.owner] replied to [key_name(L)]'s CentCom message with: \"[input]\"")
 			if(!isAI(L))
 				L << "<span class='info'>You hear something crackle in your headset for a moment before a voice speaks.</span>"
 			L << "<span class='info'>Please stand by for a message from Central Command.</span>"

code/modules/admin/verbs/pray.dm

@@ -27,8 +27,8 @@
 	feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	//log_admin("HELP: [key_name(src)]: [msg]")
 
-/proc/Centcomm_announce(var/msg, var/mob/Sender, var/iamessage)
+/proc/CentCom_announce(var/msg, var/mob/Sender, var/iamessage)
-	msg = "\blue <b><font color=orange>[uppertext(boss_short)]M[iamessage ? " IA" : ""]:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
+	msg = "\blue <b><font color=orange>[uppertext(boss_short)]M[iamessage ? " IA" : ""]:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentComReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 	for(var/client/C in admins)
 		if(R_ADMIN & C.holder.rights)
 			C << msg

code/modules/clothing/head/misc.dm

@@ -1,5 +1,5 @@
 /obj/item/clothing/head/centhat
-	name = "\improper CentComm. hat"
+	name = "\improper CentCom. hat"
 	icon_state = "centcom"
 	desc = "It's good to be emperor."
 	siemens_coefficient = 0.9

code/modules/economy/TradeDestinations.dm

@@ -18,7 +18,7 @@ var/list/weighted_mundaneevent_locations = list()
 
 //distance is measured in AU and co-relates to travel time
 /datum/trade_destination/centcomm
-	name = "CentComm"
+	name = "CentCom"
 	description = "NanoTrasen's administrative centre for Tau Ceti."
 	distance = 1.2
 	willing_to_buy = list()

code/modules/examine/descriptions/devices.dm

@@ -8,7 +8,7 @@
 	that while in space, across star systems, and that the consumer can afford and use without training, is much more recent, and is thanks to the backbone \
 	that is the Exonet.<br>\
 	<br>\
-	The Exonet is the predominant interstellar telecom system, servicing trillions of devices across a large portion of human-controlled space.  \
+	The Exonet is the predominant interstellar telecomm system, servicing trillions of devices across a large portion of human-controlled space.  \
 	It is distributed by a massive network of telecommunication satellites, some privately owned and others owned by the systems<6D> local governments, \
 	that utilize FTL technologies to bounce data between satellites at speeds that would not be possible at sub-light technology.  This communicator \
 	uses a protocol called Exonet Protocol Version 2, generally shortened to EPv2.<br>\

code/modules/examine/descriptions/telecomms.dm

@@ -30,7 +30,7 @@
 	Exonets at the root node(s), and is typically arranged in a tree structure.  The root node(s) are generally government-owned and are very secure \
 	and resilient to failure.<br>\
 	<br>\
-	This node is privately owned and maintained by Nanotrasen, and allows the colonists of the "+station_orig+" to have access to the Exonet."
+	This node is privately owned and maintained by NanoTrasen, and allows the colonists of the "+station_orig+" to have access to the Exonet."
 
 	description_antag = "An EMP will disable this device for a short period of time.  A longer downage can be achieved by turning it off, or rigging \
 	the APC it uses to turn off remotely, such as with a signaler in the right wire."

code/modules/mob/living/silicon/ai/ai.dm

@@ -400,7 +400,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
 	var/input = sanitize(input(usr, "Please choose a message to transmit to [boss_short] via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", ""))
 	if(!input)
 		return
-	Centcomm_announce(input, usr)
+	CentCom_announce(input, usr)
 	usr << "<span class='notice'>Message transmitted.</span>"
 	log_say("[key_name(usr)] has made an IA [boss_short] announcement: [input]")
 	emergency_message_cooldown = 1

code/modules/mob/living/silicon/ai/icons.dm

@@ -112,7 +112,7 @@ var/list/datum/ai_icon/ai_icons
 	alive_light = "#585858"
 
 /datum/ai_icon/nanotrasen
-	name = "Nanotrasen"
+	name = "NanoTrasen"
 	alive_icon = "ai-nanotrasen"
 	alive_light = "#000029"
 

code/modules/mob/new_player/new_player.dm

@@ -364,7 +364,7 @@
 	dat += "<b>Welcome, [name].<br></b>"
 	dat += "Round Duration: [roundduration2text()]<br>"
 
-	if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
+	if(emergency_shuttle) //In case NanoTrasen decides reposess CentCom's shuttles.
 		if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled
 			dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
 		if(emergency_shuttle.online())

code/modules/paperwork/adminpaper.dm

@@ -40,7 +40,7 @@
 	var/originhash = md5("[origin]")
 	var/timehash = copytext(md5("[world.time]"),1,10)
 	var/text = null
-	var/logo = alert(usr, "Do you want the header of your fax to have a Nanotrasen or SolGov logo?","Fax Logo","Nanotrasen","SolGov")
+	var/logo = alert(usr, "Do you want the header of your fax to have a NanoTrasen or SolGov logo?","Fax Logo","NanoTrasen","SolGov")
 	if(logo == "SolGov")
 		logo = "sglogo.png"
 	else

code/modules/paperwork/faxmachine.dm

@@ -181,11 +181,11 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 
 	//message badmins that a fax has arrived
 	if (destination == boss_name)
-		message_admins(sender, "[uppertext(boss_short)] FAX", rcvdcopy, "CentcommFaxReply", "#006100")
+		message_admins(sender, "[uppertext(boss_short)] FAX", rcvdcopy, "CentComFaxReply", "#006100")
 	else if ("Sif Governmental Authority")
-		message_admins(sender, "SIF GOVERNMENT FAX", rcvdcopy, "CentcommFaxReply", "#1F66A0")
+		message_admins(sender, "SIF GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0")
 	else if ("Supply")
-		message_admins(sender, "[uppertext(boss_short)] SUPPLY FAX", rcvdcopy, "CentcommFaxReply", "#5F4519")
+		message_admins(sender, "[uppertext(boss_short)] SUPPLY FAX", rcvdcopy, "CentComFaxReply", "#5F4519")
 	else
 		message_admins(sender, "[uppertext(destination)] FAX", rcvdcopy, "UNKNOWN")
 

code/modules/scripting/Implementations/Telecomms.dm

@@ -2,7 +2,7 @@
 
 
 /* --- Traffic Control Scripting Language --- */
-	// Nanotrasen TCS Language - Made by Doohl
+	// NanoTrasen TCS Language - Made by Doohl
 
 /n_Interpreter/TCS_Interpreter
 	var/datum/TCS_Compiler/Compiler

code/unit_tests/zas_tests.dm

@@ -78,7 +78,7 @@
 	return 1
 
 /datum/unit_test/zas_area_test/supply_centcomm
-	name = "ZAS: Supply Shuttle (CentComm)"
+	name = "ZAS: Supply Shuttle (CentCom)"
 	area_path = /area/supply/dock
 
 /datum/unit_test/zas_area_test/emergency_shuttle

maps/RandomZLevels/stationCollision.dm

@@ -63,7 +63,7 @@
 obj/item/weapon/gun/energy/laser/retro/sc_retro
 	name ="retro laser"
 	icon_state = "retro"
-	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
+	desc = "An older model of the basic lasergun, no longer used by NanoTrasen's security or military forces."
 	projectile_type = "/obj/item/projectile/practice"
 	clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face