Merge pull request #3 from ParadiseSS13/master

Merge From Master
2026-08-21 19:17:50 +01:00 · 2014-11-29 22:23:55 -05:00
parent 148b0f2762 bfa1536e74
commit 581a91c34f
79 changed files with 27167 additions and 27206 deletions
@@ -8222,7 +8222,7 @@
 "dcf" = (/obj/structure/kitchenspike,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)
 "dcg" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)
 "dch" = (/obj/machinery/gibber,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living)
-"dci" = (/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"; name = "Closet (Braden Kent)"},/obj/item/weapon/folder/blue,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/weapon/lighter/zippo/fluff/nt_rep,/obj/item/weapon/storage/box/matches,/obj/item/clothing/mask/cigarette/cigar/havana,/obj/item/clothing/tie/holster/armpit,/obj/item/clothing/tie/storage/black_vest,/obj/item/clothing/shoes/combat,/obj/item/clothing/gloves/combat,/obj/item/clothing/under/rank/centcom_commander{desc = "It's a uniform worn by CentCom's highest-tier Commanders. Gold trim on space-black cloth, this uniform displays the rank of \"Lt. Commander\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."; name = "NanoTrasen Navy Officer's Uniform"},/obj/item/clothing/head/beret/centcom/officer,/obj/item/clothing/glasses/sunglasses/sechud,/obj/item/weapon/melee/telebaton,/obj/item/weapon/gun/energy/pulse_rifle/M1911,/turf/unsimulated/floor{dir = 10; icon_state = "carpetside"},/area/centcom/living)
+"dci" = (/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"; name = "Closet (Braden Kent)"},/obj/item/weapon/folder/blue,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/weapon/lighter/zippo/fluff/nt_rep,/obj/item/weapon/storage/box/matches,/obj/item/clothing/mask/cigarette/cigar/havana,/obj/item/clothing/tie/holster/armpit,/obj/item/clothing/tie/storage/black_vest,/obj/item/clothing/shoes/combat,/obj/item/clothing/gloves/combat,/obj/item/clothing/under/rank/centcom_commander{desc = "It's a uniform worn by CentCom's highest-tier Commanders. Gold trim on space-black cloth, this uniform displays the rank of \"Lt. Commander\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."; name = "Nanotrasen Navy Officer's Uniform"},/obj/item/clothing/head/beret/centcom/officer,/obj/item/clothing/glasses/sunglasses/sechud,/obj/item/weapon/melee/telebaton,/obj/item/weapon/gun/energy/pulse_rifle/M1911,/turf/unsimulated/floor{dir = 10; icon_state = "carpetside"},/area/centcom/living)
 "dcj" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/turf/unsimulated/floor{dir = 2; icon_state = "carpetside"},/area/centcom/living)
 "dck" = (/obj/structure/flora/kirbyplants,/turf/unsimulated/floor{dir = 6; icon_state = "carpetside"},/area/centcom/living)
 "dcl" = (/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"; tag = ""},/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"; tag = ""},/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 5},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/living)
@@ -8347,7 +8347,7 @@
 "deA" = (/obj/machinery/door/poddoor{icon_state = "pdoor1"; id = "ASSAULT2"; name = "Launch Bay #2"; p_open = 0},/turf/unsimulated/floor{name = "plating"},/area/centcom/specops)
 "deB" = (/obj/structure/rack,/obj/item/weapon/gun/grenadelauncher,/obj/item/weapon/gun/grenadelauncher,/obj/item/weapon/grenade/chem_grenade/teargas{name = "Teargas"},/obj/item/weapon/grenade/chem_grenade/teargas{name = "Teargas"},/obj/item/weapon/grenade/chem_grenade/teargas{name = "Teargas"},/obj/item/weapon/grenade/chem_grenade/teargas{name = "Teargas"},/obj/item/weapon/grenade/chem_grenade/teargas{name = "Teargas"},/obj/item/weapon/grenade/chem_grenade/teargas{name = "Teargas"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "deC" = (/obj/structure/rack,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
-"deD" = (/obj/structure/closet/cabinet,/obj/item/clothing/mask/balaclava,/obj/item/clothing/shoes/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/gloves/combat,/obj/item/weapon/gun/projectile/automatic/m2411,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/under/rank/centcom_commander{desc = "It's a uniform worn by CentCom's highest-tier Commanders. Gold trim on space-black cloth, this uniform displays the rank of \"Lt. Commander\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."; name = "NanoTrasen Navy Officer's Uniform"},/obj/item/clothing/head/beret/centcom,/obj/item/device/radio/headset/ert,/obj/item/clothing/suit/armor/bulletproof,/obj/item/weapon/melee/classic_baton,/obj/item/weapon/handcuffs,/turf/unsimulated/floor{dir = 6; icon_state = "carpetside"},/area/centcom/specops)
+"deD" = (/obj/structure/closet/cabinet,/obj/item/clothing/mask/balaclava,/obj/item/clothing/shoes/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/gloves/combat,/obj/item/weapon/gun/projectile/automatic/m2411,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/under/rank/centcom_commander{desc = "It's a uniform worn by CentCom's highest-tier Commanders. Gold trim on space-black cloth, this uniform displays the rank of \"Lt. Commander\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."; name = "Nanotrasen Navy Officer's Uniform"},/obj/item/clothing/head/beret/centcom,/obj/item/device/radio/headset/ert,/obj/item/clothing/suit/armor/bulletproof,/obj/item/weapon/melee/classic_baton,/obj/item/weapon/handcuffs,/turf/unsimulated/floor{dir = 6; icon_state = "carpetside"},/area/centcom/specops)
 "deE" = (/obj/structure/flora/kirbyplants,/turf/unsimulated/floor{dir = 10; icon_state = "carpetside"},/area/centcom/specops)
 "deF" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/living)
 "deG" = (/obj/machinery/vending/cola,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/living)
@@ -155,8 +155,8 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 			dat += {"
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=1'>Unlock Barber -- 5KP</a><br>
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=2'>Unlock Brig Physician -- 5KP</a><br>
-			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=8'>Unlock NanoTrasen Recruiter -- 10KP</a><br>
-			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=3'>Unlock NanoTrasen Representative -- 30KP</a><br>
+			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=8'>Unlock Nanotrasen Recruiter -- 10KP</a><br>
+			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=3'>Unlock Nanotrasen Representative -- 30KP</a><br>
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=4'>Unlock Customs Officer -- 30P</a><br>
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=5'>Unlock Blueshield -- 30KP</a><br>
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy=9'>Unlock Security Pod Pilot -- 30KP</a><br>
@@ -10,7 +10,7 @@ log transactions
 */

 /obj/machinery/atm
-	name = "\improper NanoTrasen Automatic Teller Machine"
+	name = "\improper Nanotrasen Automatic Teller Machine"
 	desc = "For all your monetary needs!"
 	icon = 'icons/obj/terminals.dmi'
 	icon_state = "atm"
@@ -66,7 +66,7 @@ log transactions

 	attack_hand(var/mob/user)
 		if(istype(user, /mob/living/silicon))
-			user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per NanoTrasen regulation #1005."
+			user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005."
 			return

 		if(!(stat && NOPOWER) && ishuman(user))
@@ -80,7 +80,7 @@ log transactions
 //						usr << sound('nya.mp3')
 			else
 				dat = null
-				dat += "<h1>NanoTrasen Automatic Teller Machine</h1><br/>"
+				dat += "<h1>Nanotrasen Automatic Teller Machine</h1><br/>"
 				dat += "For all your monetary needs!<br/><br/>"
 				dat += "Welcome, [card.registered_name]. You have [card.money] credits deposited.<br>"
 				dat += "Current inserted item value: [inserted] credits.<br><br>"
@@ -189,7 +189,7 @@ var/global/admin_emergency_team = 0 // Used for admin-spawned response teams
 				ticker.mode.traitors |= new_member.mind // ERTs will show up at the end of the round on the "traitor" list

 				// Join message
-				new_member << "\blue You are the <b>Emergency Response Team[!leader_selected?"!</b>":" Leader!</b>"] \nAs a response team [!leader_selected?"member":"<b>leader</b>"] you answer directly to [!leader_selected?"your team leader.":"Central Command."] \nYou have been deployed by NanoTrasen Central Command in Tau Ceti to resolve a Code Red alert aboard [station_name()], and have been provided with the following instructions and information regarding your mission: \red [situation]"
+				new_member << "\blue You are the <b>Emergency Response Team[!leader_selected?"!</b>":" Leader!</b>"] \nAs a response team [!leader_selected?"member":"<b>leader</b>"] you answer directly to [!leader_selected?"your team leader.":"Central Command."] \nYou have been deployed by Nanotrasen Central Command in Tau Ceti to resolve a Code Red alert aboard [station_name()], and have been provided with the following instructions and information regarding your mission: \red [situation]"
 				new_member.mind.store_memory("<b>Mission Parameters:</b> \red [situation].")

 				// Leader join message
@@ -5,7 +5,7 @@
 	var
 		round_time // time of the round at which this should be announced, in seconds
 		message // body of the message
-		author = "NanoTrasen Editor"
+		author = "Nanotrasen Editor"
 		channel_name = "Tau Ceti Daily"
 		can_be_redacted = 0

@@ -95,9 +95,9 @@
 			author = "Reporter Ro'kii Ar-Raqis"

 			message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae
-						Lupus system. This comes only hours after NanoTrasen officials announced they will no longer trade with the
+						Lupus system. This comes only hours after Nanotrasen officials announced they will no longer trade with the
 						colony, citing the increased presence of \"hostile factions\" on the colony has made trade too dangerous to
-						continue. NanoTrasen officials have not given any details about said factions. More on that at the top of
+						continue. Nanotrasen officials have not given any details about said factions. More on that at the top of
 						the hour."}
 			round_time = 60 * 10

@@ -105,11 +105,11 @@
 			channel_name = "Tau Ceti Daily"
 			author = "Reporter Ro'kii Ar-Raqis"

-			message = {"More on the Refuge food riots: The Refuge Council has condemned NanoTrasen's withdrawal from
-			the colony, claiming \"there has been no increase in anti-NanoTrasen activity\", and \"\[the only] reason
-			NanoTrasen withdrew was because the \[Tenebrae Lupus] system's Plasma deposits have been completely mined out.
-			We have little to trade with them now\". NanoTrasen officials have denied these allegations, calling them
-			\"further proof\" of the colony's anti-NanoTrasen stance. Meanwhile, Refuge Security has been unable to quell
+			message = {"More on the Refuge food riots: The Refuge Council has condemned Nanotrasen's withdrawal from
+			the colony, claiming \"there has been no increase in anti-Nanotrasen activity\", and \"\[the only] reason
+			Nanotrasen withdrew was because the \[Tenebrae Lupus] system's Plasma deposits have been completely mined out.
+			We have little to trade with them now\". Nanotrasen officials have denied these allegations, calling them
+			\"further proof\" of the colony's anti-Nanotrasen stance. Meanwhile, Refuge Security has been unable to quell
 			the riots. More on this at 6."}
 			round_time = 60 * 60

@@ -188,10 +188,10 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 		if("Head of Personnel")
 			clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
-		if("NanoTrasen Representative")
+		if("Nanotrasen Representative")
 			clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
-		if("NanoTrasen Recruiter")
+		if("Nanotrasen Recruiter")
 			clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
 		if("Blueshield")
@@ -902,6 +902,10 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Captain's Office"
 	icon_state = "captain"

+/area/crew_quarters/captain/bedroom
+	name = "\improper Captain's Bedroom"
+	icon_state = "captain"	
+	
 /area/crew_quarters/recruit
 	name = "\improper Recruitment Office"
 	icon_state = "head_quarters"
@@ -959,7 +963,7 @@ var/list/ghostteleportlocs = list()
 	icon_state = "server"

 /area/ntrep
-	name = "\improper NanoTrasen Rep Office"
+	name = "\improper Nanotrasen Rep Office"
 	icon_state = "bluenew"

 /area/blueshield
@@ -272,7 +272,7 @@ its easier to just keep the beam vertical.
 			src.fingerprintslast = M.key
 	return

-/atom/proc/add_fingerprint(mob/living/M as mob)
+/atom/proc/add_fingerprint(mob/living/M as mob, ignoregloves = 0)
 	if(isnull(M)) return
 	if(isAI(M)) return
 	if(isnull(M.key)) return
@@ -308,11 +308,12 @@ its easier to just keep the beam vertical.
 			H.gloves.add_fingerprint(M)

 		//Deal with gloves the pass finger/palm prints.
-		if(H.gloves != src)
-			if(prob(75) && istype(H.gloves, /obj/item/clothing/gloves/latex))
-				return 0
-			else if(H.gloves && !istype(H.gloves, /obj/item/clothing/gloves/latex))
-				return 0
+		if(!ignoregloves)
+			if(H.gloves != src)
+				if(prob(75) && istype(H.gloves, /obj/item/clothing/gloves/latex))
+					return 0
+				else if(H.gloves && !istype(H.gloves, /obj/item/clothing/gloves/latex))
+					return 0

 		//More adminstuffz
 		if(fingerprintslast != H.key)
@@ -75,6 +75,7 @@ Radio:
 1441 - death squad
 1443 - Confession Intercom
 1347 - Cargo techs
+1349 - Service

 Devices:
 1451 - tracking implant
@@ -107,9 +108,10 @@ var/list/radiochannels = list(
 	"Deathsquad" = 1441,
 	"Syndicate" = 1213,
 	"Supply" = 1347,
+	"Service" = 1349
 )
 //depenging helpers
-var/list/DEPT_FREQS = list(1351, 1355, 1357, 1359, 1213, 1443, 1441, 1347)
+var/list/DEPT_FREQS = list(1351, 1355, 1357, 1359, 1213, 1443, 1441, 1347, 1349)

 // central command channels, i.e deathsquid & response teams
 var/list/CENT_FREQS = list(1441, 1443)
@@ -123,6 +125,7 @@ var/const/ENG_FREQ = 1357
 var/const/SCI_FREQ = 1351
 var/const/MED_FREQ = 1355
 var/const/SUP_FREQ = 1347
+var/const/SRV_FREQ = 1349

 #define TRANSMISSION_WIRE	0
 #define TRANSMISSION_RADIO	1
@@ -81,12 +81,11 @@
 		var/traitorcount = 0
 		var/possible_traitors[0]
 		for(var/mob/living/player in mob_list)
-
 			if (player.client && player.stat != 2)
 				playercount += 1
 			if (player.client && player.mind && player.mind.special_role && player.stat != 2)
 				traitorcount += 1
-			if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && (player.client && player.client.prefs.be_special & BE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
+			if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && ishuman(player) && (player.client && player.client.prefs.be_special & BE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
 				possible_traitors += player
 		for(var/datum/mind/player in possible_traitors)
 			for(var/job in restricted_jobs)
@@ -159,14 +158,13 @@
 		var/playercount = 0
 		var/traitorcount = 0
 		for(var/mob/living/player in mob_list)
-
 			if (player.client && player.stat != 2)
 				playercount += 1
 			if (player.client && player.mind && player.mind.special_role && player.stat != 2)
 				traitorcount += 1
 		//message_admins("Live Players: [playercount]")
 		//message_admins("Live Traitors: [traitorcount]")
-
+		
 		//var/r = rand(5)
 		//var/target_traitors = 1
 		var/max_traitors = 2
@@ -179,6 +177,9 @@
 		//target_traitors = max(1, min(round((playercount + r) / 10, 1), traitors_possible))
 		//message_admins("Target Traitor Count is: [target_traitors]")
 		if (traitorcount < max_traitors)
+			for(var/job in restricted_jobs)
+				if(character.mind.assigned_role == job || !ishuman(character))
+					return	
 			//message_admins("Number of Traitors is below maximum.  Rolling for New Arrival Traitor.")
 			//message_admins("The probability of a new traitor is [traitor_prob]%")
 			if(prob(traitor_prob))
@@ -175,7 +175,7 @@ var/list/blob_nodes = list()
 			return

 		if (1)
-			command_alert("NanoTrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.", "Biohazard Alert")
+			command_alert("Nanotrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.", "Biohazard Alert")
 			for(var/mob/M in player_list)
 				if(!istype(M,/mob/new_player))
 					M << sound('sound/AI/blob_confirmed.ogg')
@@ -9,10 +9,10 @@
 			return
 		if(1)
 			interceptname = "Biohazard Alert"
-			intercepttext += "<FONT size = 3><B>NanoTrasen Update</B>: Biohazard Alert.</FONT><HR>"
+			intercepttext += "<FONT size = 3><B>Nanotrasen Update</B>: Biohazard Alert.</FONT><HR>"
 			intercepttext += "Reports indicate the probable transfer of a biohazardous agent onto [station_name()] during the last crew deployment cycle.<BR>"
 			intercepttext += "Preliminary analysis of the organism classifies it as a level 7 biohazard. Its origin is unknown.<BR>"
-			intercepttext += "NanoTrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.<BR>"
+			intercepttext += "Nanotrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.<BR>"
 			intercepttext += "Orders for all [station_name()] personnel follows:<BR>"
 			intercepttext += " 1. Do not leave the quarantine area.<BR>"
 			intercepttext += " 2. Locate any outbreaks of the organism on the station.<BR>"
@@ -22,7 +22,7 @@
 			intercepttext += "Message ends."
 		if(2)
 			interceptname = "Directive 7-12"
-			intercepttext += "<FONT size = 3><B>NanoTrasen Update</B>: Biohazard Alert.</FONT><HR>"
+			intercepttext += "<FONT size = 3><B>Nanotrasen Update</B>: Biohazard Alert.</FONT><HR>"
 			intercepttext += "Directive 7-12 has been issued for [station_name()].<BR>"
 			intercepttext += "The biohazard has grown out of control and will soon reach critical mass.<BR>"
 			intercepttext += "Your orders are as follows:<BR>"
@@ -56,7 +56,7 @@
 	intercepttext += "<B>* ELIMINATE THREAT WITH EXTREME PREJUDICE. [virus_name] IS HIGHLY CONTAGIOUS. INFECTED CREW MEMBERS MUST BE QUARANTINED IMMEDIATELY.</B><BR>"
 	intercepttext += "<B>* [station_name()] is under QUARANTINE. Any vessels outbound from [station_name()] will be tracked down and destroyed.</B><BR>"
 	intercepttext += "<B>* The existence of [virus_name] is highly confidential. To prevent a panic, only high-ranking staff members are authorized to know of its existence. Crew members that illegally obtained knowledge of [virus_name] are to be neutralized.</B><BR>"
-	intercepttext += "<B>* A cure is to be researched immediately, but NanoTrasen intellectual property must be respected. To prevent knowledge of [virus_name] from falling into unauthorized hands, all medical staff that work with the pathogen must be enhanced with a NanoTrasen loyality implant.</B><BR>"
+	intercepttext += "<B>* A cure is to be researched immediately, but Nanotrasen intellectual property must be respected. To prevent knowledge of [virus_name] from falling into unauthorized hands, all medical staff that work with the pathogen must be enhanced with a Nanotrasen loyality implant.</B><BR>"


 	for (var/obj/machinery/computer/communications/comm in world)
@@ -401,7 +401,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 		if(4)
 			directive += "The Spider Clan absolutely cannot be linked to this operation. Eliminate witnesses at your discretion."
 		if(5)
-			directive += "We are currently negotiating with NanoTrasen Central Command. Prioritize saving human lives over ending them."
+			directive += "We are currently negotiating with Nanotrasen Central Command. Prioritize saving human lives over ending them."
 		if(6)
 			directive += "We are engaged in a legal dispute over [station_name]. If a laywer is present on board, force their cooperation in the matter."
 		if(7)
@@ -417,14 +417,14 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 		if(12)
 			directive += "We are currently negotiating with a Syndicate leader. Disguise assassinations as suicide or other natural causes."
 		if(13)
-			directive += "Some disgruntled NanoTrasen employees have been supportive of our operations. Be wary of any mistreatment by command staff."
+			directive += "Some disgruntled Nanotrasen employees have been supportive of our operations. Be wary of any mistreatment by command staff."
 		if(14)
 			var/xenorace = pick("Unathi","Tajaran", "Skrellian")
 			directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible."
 		if(15)
 			directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false."
 		if(16)
-			directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine NanoTrasen prosthetics in a bad light."
+			directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine Nanotrasen prosthetics in a bad light."
 		if(17)
 			directive += "The Spider Clan has recently begun recruiting outsiders. Consider suitable candidates and assess their behavior amongst the crew."
 		if(18)
@@ -8,7 +8,7 @@ datum/directive
 	proc/get_description()
 		return {"
 			<p>
-				NanoTrasen's reasons for the following directives are classified.
+				Nanotrasen's reasons for the following directives are classified.
 			</p>
 		"}

@@ -18,7 +18,7 @@ datum/directive/terminations/alien_fraud/get_crew_to_terminate()
 datum/directive/terminations/alien_fraud/get_description()
 	return {"
 		<p>
-			An extensive conspiracy network aimed at defrauding NanoTrasen of large amounts of funds has been uncovered
+			An extensive conspiracy network aimed at defrauding Nanotrasen of large amounts of funds has been uncovered
 			operating within [system_name()]. Human personnel are not suspected to be involved. Further information is classified.
 		</p>
 	"}
@@ -13,7 +13,7 @@ datum/directive/bluespace_contagion
 datum/directive/bluespace_contagion/get_description()
 	return {"
 		<p>
-			A manufactured and near-undetectable virus is spreading on NanoTrasen stations.
+			A manufactured and near-undetectable virus is spreading on Nanotrasen stations.
 			The pathogen travels by bluespace after maturing for one day and meets the Sol Health Organisation standards for a class X biological threat, warranting use of lethal force to contain an outbreak.
 			No treatment has yet been discovered. Personnel onboard [station_name()] have been infected. Further information is classified.
 		</p>
@@ -25,7 +25,7 @@ datum/directive/research_to_ripleys
 datum/directive/research_to_ripleys/get_description()
 	return {"
 		<p>
-			The NanoTrasen [system_name()] Manufactory faces an ore deficit. Financial crisis imminent. [station_name()] has been reassigned as a mining platform.
+			The Nanotrasen [system_name()] Manufactory faces an ore deficit. Financial crisis imminent. [station_name()] has been reassigned as a mining platform.
 			The Research Director is to assist the Head of Personnel in coordinating assets.
 			Weapons department reports solid sales. Further information is classified.
 		</p>
@@ -21,7 +21,7 @@ datum/directive/vox_heist

  proc/get_weight(mob/M)
    // You will have a high chance of being regarded as a vox sympathizer if your
-    // relationship with NanoTrasen is negative. Otherwise, command and security
+    // relationship with Nanotrasen is negative. Otherwise, command and security
    // staff are pretty well trusted and maltreated alien races are easy suspects.
    var/relation = M.client.prefs.nanotrasen_relation
    if(relation == "Opposed")
@@ -40,7 +40,7 @@ datum/directive/vox_heist
 datum/directive/vox_heist/get_description()
  return {"
    <p>
-      A vox warship has commandeered a NanoTrasen transport carrying 2,500 cubic meters of liquid plasma.
+      A vox warship has commandeered a Nanotrasen transport carrying 2,500 cubic meters of liquid plasma.
      The raiders are willing to return the stolen cargo in exchange for the capture or execution of so-called "vox pariah" that are stationed aboard [station_name()].
      If the transport is not recovered, the estimated loss of profits is a threat to the solvency of the company.
      Predictive analysis has identified certain members of the crew as sympathetic to the vox pariah. Detain the sympathizers to guarantee a successful exchange.
@@ -57,7 +57,7 @@
 	if(captains_key && secondary_key)
 		activated = 1
 		user << "\blue You activate \the [src]!"
-		state("Command acknowledged. Initiating quantum entanglement relay to NanoTrasen High Command.")
+		state("Command acknowledged. Initiating quantum entanglement relay to Nanotrasen High Command.")
 		launch_shuttle()
 		return

@@ -109,5 +109,5 @@

 /obj/machinery/emergency_authentication_device/examine()
 	usr << {"
-This is a specialized communications device that is able to instantly send a message to <b>NanoTrasen High Command</b> via quantum entanglement with a sister device at CentCom.
+This is a specialized communications device that is able to instantly send a message to <b>Nanotrasen High Command</b> via quantum entanglement with a sister device at CentCom.
 The EAD's status is [get_status()]."}
@@ -16,7 +16,7 @@
 			<center><h5>NOT A DRILL . . . EMERGENCY DIRECTIVE . . . NOT A DRILL</h5></center>
 			<p>
 				<b>TO:</b> Captain [mode.head_loyalist], Commanding Officer, [station_name()]<br>
-				<b>FROM:</b> NanoTrasen Emergency Messaging Relay<br>
+				<b>FROM:</b> Nanotrasen Emergency Messaging Relay<br>
 				<b>DATE:</b> [time2text(world.realtime, "MM/DD")]/[game_year]<br>
 				<b>SUBJECT:</b> Directive X<br>
 			</p>
@@ -65,7 +65,7 @@
 		return text

 	proc/get_pda_body()
-		return {"<b>&larr; From Anonymous Channel:</b> <p>\"You must read this! NanoTrasen Chain of Command COMPROMISED. Command Encryptions BROKEN. [station_name()] Captain [mode.head_loyalist] will receive orders that must NOT BE BROUGHT TO FRUITION!
+		return {"<b>&larr; From Anonymous Channel:</b> <p>\"You must read this! Nanotrasen Chain of Command COMPROMISED. Command Encryptions BROKEN. [station_name()] Captain [mode.head_loyalist] will receive orders that must NOT BE BROUGHT TO FRUITION!

 They don't care about us they only care about WEALTH and POWER... Share this message with people you trust.

@@ -77,10 +77,10 @@ Be safe, friend.\" (Unable to Reply)</p>"}
 <p>The crew will be divided by their sense of ethics when a morally turbulent emergency directive arrives with an incomplete command validation code.<br><br>
 The [loyalist_tag("Head Loyalist")] is the Captain, who carries the [loyalist_tag("Captain's Authentication Key")] at all times.<br>
 The [mutineer_tag("Head Mutineer")] is a random Head of Staff who carries the [mutineer_tag("Emergency Secondary Authentication Key")].</p>
-Both keys are required to activate the <b>Emergency Authentication Device (EAD)</b> in the vault, signalling to NanoTrasen that the directive is complete.
+Both keys are required to activate the <b>Emergency Authentication Device (EAD)</b> in the vault, signalling to Nanotrasen that the directive is complete.
 <hr>
 <p>
-<b>Loyalists</b> - Follow the Head Loyalist in carrying out [loyalist_tag("NanoTrasen's directives")] then activate the <b>EAD</b>.<br>
+<b>Loyalists</b> - Follow the Head Loyalist in carrying out [loyalist_tag("Nanotrasen's directives")] then activate the <b>EAD</b>.<br>
 <b>Mutineers</b> - Prevent the completion of the [mutineer_tag("improperly validated directives")] and the activation of the <b>EAD</b>.
 </p>
 		"}
@@ -101,35 +101,35 @@ Both keys are required to activate the <b>Emergency Authentication Device (EAD)<

 	proc/loyalist_major_victory()
 		return {"
-NanoTrasen has praised the efforts of Captain [mode.head_loyalist] and loyal members of [their(mode.head_loyalist)] crew, who recently managed to put down a mutiny--amid a local interstellar crisis--aboard the <b>[station_name()]</b>, a research station in [system_name()].
+Nanotrasen has praised the efforts of Captain [mode.head_loyalist] and loyal members of [their(mode.head_loyalist)] crew, who recently managed to put down a mutiny--amid a local interstellar crisis--aboard the <b>[station_name()]</b>, a research station in [system_name()].
 The mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
 Despite the mutiny, the crew was successful in implementing the directive and activating their on-board emergency authentication device.
 [mode.mutineers.len] members of the station's personnel were charged with terrorist action against the Company and, if found guilty by a Sol magistrate, will be sentenced to life incarceration.
-NanoTrasen will be awarding [mode.loyalists.len] members of the crew with the [loyalist_tag("Star of Loyalty")], following their successful efforts, at a ceremony this coming Thursday.
+Nanotrasen will be awarding [mode.loyalists.len] members of the crew with the [loyalist_tag("Star of Loyalty")], following their successful efforts, at a ceremony this coming Thursday.
 [mode.body_count.len] are believed to have died during the coup.
-<p>NanoTrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
+<p>Nanotrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
 		"}

 	proc/loyalist_minor_victory()
 		return {"
-NanoTrasen has praised the efforts of Captain [mode.head_loyalist] and loyal members of [their(mode.head_loyalist)] crew, who recently managed to put down a mutiny--amid a local interstellar crisis--aboard the <b>[station_name()]</b>, a research station in [system_name()].
+Nanotrasen has praised the efforts of Captain [mode.head_loyalist] and loyal members of [their(mode.head_loyalist)] crew, who recently managed to put down a mutiny--amid a local interstellar crisis--aboard the <b>[station_name()]</b>, a research station in [system_name()].
 The mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
 Despite the mutiny, the crew was successful in implementing the directive. Unfortunately, they failed to notify Central Command of their successes due to a breach in the chain of command.
 [mode.mutineers.len] members of the station's personnel were charged with terrorist action against the Company and, if found guilty by a Sol magistrate, will be sentenced to life incarceration.
-NanoTrasen will be awarding [mode.loyalists.len] members of the crew with the [loyalist_tag("Star of Loyalty")], following their mostly successful efforts, at a ceremony this coming Thursday.
+Nanotrasen will be awarding [mode.loyalists.len] members of the crew with the [loyalist_tag("Star of Loyalty")], following their mostly successful efforts, at a ceremony this coming Thursday.
 [mode.body_count.len] are believed to have died during the coup.
-<p>NanoTrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
+<p>Nanotrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
 		"}

 	proc/no_victory()
 		return {"
-NanoTrasen has been thrust into turmoil following an apparent mutiny by key personnel aboard the <b>[station_name()]</b>, a research station in [system_name()].
+Nanotrasen has been thrust into turmoil following an apparent mutiny by key personnel aboard the <b>[station_name()]</b>, a research station in [system_name()].
 The mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
-No further information has yet emerged from the station or its crew, who are presumed to be in holding with NanoTrasen investigators.
-NanoTrasen officials refuse to comment.
+No further information has yet emerged from the station or its crew, who are presumed to be in holding with Nanotrasen investigators.
+Nanotrasen officials refuse to comment.
 Sources indicate that [mode.mutineers.len] members of the station's personnel are currently under investigation for terrorist activity, and [mode.loyalists.len] crew are currently providing evidence to investigators, believed to be the 'loyal' station personnel.
 [mode.body_count.len] are believed to have died during the coup.
-<p>NanoTrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
+<p>Nanotrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
 		"}

 	proc/mutineer_minor_victory()
@@ -138,21 +138,21 @@ Reports have emerged that an impromptu mutiny has taken place, amid a local inte
 The mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
 Information at present indicates that the top-secret directive--which has since been retracted--was invalid due to a broken authentication code. Members of the crew, including an unidentified Head of Staff, prevented the directive from being accomplished.
 [mode.mutineers.len] members of the station's personnel were released from interrogations today, following a mutiny investigation.
-NanoTrasen has reprimanded [mode.loyalists.len] members of the crew for failing to follow command validation procedures.
+Nanotrasen has reprimanded [mode.loyalists.len] members of the crew for failing to follow command validation procedures.
 [mode.body_count.len] are believed to have died during the coup.
-<p>Even though the directive was not successfully implemented, NanoTrasen's image will forever be haunted by the fact that its authentication protocol was breached with such magnitude and that a mutiny was the result.</p>
+<p>Even though the directive was not successfully implemented, Nanotrasen's image will forever be haunted by the fact that its authentication protocol was breached with such magnitude and that a mutiny was the result.</p>
 		"}

 	proc/mutineer_major_victory()
 		return {"
-NanoTrasen has praised the efforts of [mode.head_mutineer.assigned_role] [mode.head_mutineer] and several other members of the crew, who recently seized control of a company station in [system_name()]--<b>[station_name()]</b>--amid a local interstellar crisis.
+Nanotrasen has praised the efforts of [mode.head_mutineer.assigned_role] [mode.head_mutineer] and several other members of the crew, who recently seized control of a company station in [system_name()]--<b>[station_name()]</b>--amid a local interstellar crisis.
 What appears to have been a "legitimate" mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
 It has been revealed that the directive was invalid and fraudulent. Company officials have not released a statement about the source of the directive.
 Thanks to the efforts of the resistant members of the crew, the directive was not carried out.
 [mode.mutineers.len] members of the station's personnel were congratulated and awarded with the [mutineer_tag("Star of Bravery")], for their efforts in preventing the illegal directive's completion.
-NanoTrasen has [mode.loyalists.len] members of the crew in holding, while it investigates the circumstances that led to the acceptance and initiation of an invalid directive.
+Nanotrasen has [mode.loyalists.len] members of the crew in holding, while it investigates the circumstances that led to the acceptance and initiation of an invalid directive.
 [mode.body_count.len] are believed to have died during the coup.
-<p>Even though the directive was not successfully implemented, NanoTrasen's image will forever be haunted by the fact that its authentication protocol was breached with such magnitude and that a mutiny was the result.</p>
+<p>Even though the directive was not successfully implemented, Nanotrasen's image will forever be haunted by the fact that its authentication protocol was breached with such magnitude and that a mutiny was the result.</p>
 		"}

 	proc/secret_transcript()
@@ -178,16 +178,16 @@ TM: We call her an eavesdropper. Captures network traffic, records it, and forwa
 D: Speak English <i>goddamnit</i>.<br>
 TM: Standard intelligence acquisition package, sir; we bug their satellite and listen. It's like we have their playbook and we know what their moves are going to be on the market before they make them.<br>
 D: So Mallory doesn't work?<br>
-TM: She worked, sir. We've had an ear on NanoTrasen's regional communications for weeks.<br>
+TM: She worked, sir. We've had an ear on Nanotrasen's regional communications for weeks.<br>
 D: Any news about their <b>Plasma refinement process</b>?<br>
 TM: No sir. Our analysts believe they are using a separate channel for their most sensitive data.<br>
 D: So what's the problem?<br>
-TM: The intelligence hasn't been doing us any good. Anything that appears actionable, I send it to the analysts and they make a plan. Thing is, NanoTrasen always sees us coming.<br>
+TM: The intelligence hasn't been doing us any good. Anything that appears actionable, I send it to the analysts and they make a plan. Thing is, Nanotrasen always sees us coming.<br>
 D: Tim...<br>
-TM: I think they discovered the hack, sir. Case in point, <b>Energine Consolidated Solutions</b>. That subsidiary of ours that was awarded a lease on NanoTrasen's mining platform in Nyx? NanoTrasen acquired them a week before we made the announcement.<br>
+TM: I think they discovered the hack, sir. Case in point, <b>Energine Consolidated Solutions</b>. That subsidiary of ours that was awarded a lease on Nanotrasen's mining platform in Nyx? Nanotrasen acquired them a week before we made the announcement.<br>
 D: They know about they have a bug. <i>They left her on and fed her the information for us to hear</i>, those sneaks. How did they find it?<br>
 TM: Top secret communique came through. I'm not sure what happened. Either Mallory couldn't replicate the encryption scheme and garbled it going out or the transmission was already corrupted to begin with.<br>
-D: Either way the transmission caused NanoTrasen to look at the satellite. They found out about Mallory.<br>
+D: Either way the transmission caused Nanotrasen to look at the satellite. They found out about Mallory.<br>
 TM: Precisely sir. There's only so much I can do to cover our tracks from here.<br>
 D: I'm pulling the plug. We have assets in the sector that are capable of a job like this. Thank you for bringing this to my attention.<br>
 <center>\[Computer device chirps\]</center>
@@ -681,7 +681,7 @@ datum

 			/*burger
 				steal_target = /obj/item/weapon/reagent_containers/food/snacks/human/burger
-				explanation_text = "Steal a burger made out of human organs, this will be presented as proof of NanoTrasen's chronic lack of standards."
+				explanation_text = "Steal a burger made out of human organs, this will be presented as proof of Nanotrasen's chronic lack of standards."
 				weight = 60

 				get_points(var/job)
@@ -725,7 +725,7 @@ datum

 			/*magboots
 				steal_target = /obj/item/clothing/shoes/magboots
-				explanation_text = "Steal a pair of \"NanoTrasen\" brand magboots."
+				explanation_text = "Steal a pair of \"Nanotrasen\" brand magboots."
 				weight = 20

 				get_points(var/job)
@@ -27,7 +27,7 @@ proc/issyndicate(mob/living/M as mob)
 /datum/game_mode/nuclear/announce()
 	world << "<B>The current game mode is - Nuclear Emergency!</B>"
 	world << "<B>A [syndicate_name()] Strike Force is approaching [station_name()]!</B>"
-	world << "A nuclear explosive was being transported by NanoTrasen to a military base. The transport ship mysteriously lost contact with Space Traffic Control (STC). About that time a strange disk was discovered around [station_name()]. It was identified by NanoTrasen as a nuclear authentication disk and now Syndicate Operatives have arrived to retake the disk and detonate SS13! There are most likely Syndicate starships are in the vicinity, so take care not to lose the disk!\n<B>Syndicate</B>: Reclaim the disk and detonate the nuclear bomb anywhere on SS13.\n<B>Personnel</B>: Hold the disk and <B>escape with the disk</B> on the shuttle!"
+	world << "A nuclear explosive was being transported by Nanotrasen to a military base. The transport ship mysteriously lost contact with Space Traffic Control (STC). About that time a strange disk was discovered around [station_name()]. It was identified by Nanotrasen as a nuclear authentication disk and now Syndicate Operatives have arrived to retake the disk and detonate SS13! There are most likely Syndicate starships are in the vicinity, so take care not to lose the disk!\n<B>Syndicate</B>: Reclaim the disk and detonate the nuclear bomb anywhere on SS13.\n<B>Personnel</B>: Hold the disk and <B>escape with the disk</B> on the shuttle!"

 /datum/game_mode/nuclear/can_start()//This could be better, will likely have to recode it later
 	if(!..())
@@ -206,7 +206,7 @@ datum/objective/anti_revolution/demote
 	find_target()
 		..()
 		if(target && target.current)
-			explanation_text = "[target.current.real_name], the [target.assigned_role]  has been classified as harmful to NanoTrasen's goals. Demote \him[target.current] to assistant."
+			explanation_text = "[target.current.real_name], the [target.assigned_role]  has been classified as harmful to Nanotrasen's goals. Demote \him[target.current] to assistant."
 		else
 			explanation_text = "Free Objective"
 		return target
@@ -214,7 +214,7 @@ datum/objective/anti_revolution/demote
 	find_target_by_role(role, role_type=0)
 		..(role, role_type)
 		if(target && target.current)
-			explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has been classified as harmful to NanoTrasen's goals. Demote \him[target.current] to assistant."
+			explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has been classified as harmful to Nanotrasen's goals. Demote \him[target.current] to assistant."
 		else
 			explanation_text = "Free Objective"
 		return target
@@ -71,7 +71,7 @@
 		var/datum/objective/anti_revolution/demote/obj = new
 		obj.owner = head
 		obj.target = target
-		obj.explanation_text = "[target.current.real_name], the [target.assigned_role]  has been classified as harmful to NanoTrasen's goals. Demote them to assistant."
+		obj.explanation_text = "[target.current.real_name], the [target.assigned_role]  has been classified as harmful to Nanotrasen's goals. Demote them to assistant."
 		head.objectives += obj


@@ -347,7 +347,7 @@
 		if(1000 to 4999) score_rating = "Promotions for Everyone"
 		if(5000 to 9999) score_rating = "Ambassadors of Discovery"
 		if(10000 to 49999) score_rating = "The Pride of Science Itself"
-		if(50000 to INFINITY) score_rating = "NanoTrasen's Finest"
+		if(50000 to INFINITY) score_rating = "Nanotrasen's Finest"
 	dat += "<B><U>RATING:</U></B> [score_rating]"
 	src << browse(dat, "window=roundstats;size=500x600")
 	return
@@ -216,9 +216,9 @@
 			return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed) + get_all_accesses()
 		if("Special Operations Officer")
 			return get_all_centcom_access() + get_all_accesses()
-		if("NanoTrasen Navy Officer")
+		if("Nanotrasen Navy Officer")
 			return get_all_centcom_access() + get_all_accesses()
-		if("NanoTrasen Navy Captain")
+		if("Nanotrasen Navy Captain")
 			return get_all_centcom_access() + get_all_accesses()
 		if("Supreme Commander")
 			return get_all_centcom_access() + get_all_accesses()
@@ -457,7 +457,7 @@
 	return all_jobs

 /proc/get_all_centcom_jobs()
-	return list("VIP Guest","Custodian","Thunderdome Overseer","Emergency Response Team","Emergency Response Team Leader","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Special Operations Officer","NanoTrasen Navy Officer","NanoTrasen Navy Captain","Supreme Commander")
+	return list("VIP Guest","Custodian","Thunderdome Overseer","Emergency Response Team","Emergency Response Team Leader","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Special Operations Officer","Nanotrasen Navy Officer","Nanotrasen Navy Captain","Supreme Commander")

 //gets the actual job rank (ignoring alt titles)
 //this is used solely for sechuds
@@ -76,4 +76,43 @@
 	if(!isnum(minimal_player_age))
 		return 0

-	return max(0, minimal_player_age - C.player_age)
+	return max(0, minimal_player_age - C.player_age)
+	
+/datum/job/proc/apply_fingerprints(var/mob/living/carbon/human/H)
+	if(!istype(H))
+		return
+	if(H.back)
+		H.back.add_fingerprint(H,1)	//The 1 sets a flag to ignore gloves
+		for(var/obj/item/I in H.back.contents)
+			I.add_fingerprint(H,1)
+	if(H.wear_id)
+		H.wear_id.add_fingerprint(H,1)
+	if(H.w_uniform)
+		H.w_uniform.add_fingerprint(H,1)
+	if(H.wear_suit)
+		H.wear_suit.add_fingerprint(H,1)
+	if(H.wear_mask)
+		H.wear_mask.add_fingerprint(H,1)
+	if(H.head)
+		H.head.add_fingerprint(H,1)
+	if(H.shoes)
+		H.shoes.add_fingerprint(H,1)
+	if(H.gloves)
+		H.gloves.add_fingerprint(H,1)
+	if(H.l_ear)
+		H.l_ear.add_fingerprint(H,1)
+	if(H.r_ear)
+		H.r_ear.add_fingerprint(H,1)
+	if(H.glasses)
+		H.glasses.add_fingerprint(H,1)
+	if(H.belt)
+		H.belt.add_fingerprint(H,1)
+		for(var/obj/item/I in H.belt.contents)
+			I.add_fingerprint(H,1)
+	if(H.s_store)
+		H.s_store.add_fingerprint(H,1)
+	if(H.l_store)
+		H.l_store.add_fingerprint(H,1)
+	if(H.r_store)
+		H.r_store.add_fingerprint(H,1)
+	return 1
@@ -4,7 +4,7 @@
 	department_flag = ENGSEC
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "NanoTrasen officials"
+	supervisors = "Nanotrasen officials"
 	selection_color = "#ccccff"
 	idtype = /obj/item/weapon/card/id/gold
 	req_admin_notify = 1
@@ -92,12 +92,12 @@


 /datum/job/nanotrasenrep
-	title = "NanoTrasen Representative"
+	title = "Nanotrasen Representative"
 	flag = NANO
 	department_flag = KARMA
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the NanoTrasen Board of Directors"
+	supervisors = "the Nanotrasen Board of Directors"
 	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
@@ -137,12 +137,12 @@
 		return 1

 /datum/job/nanotrasenrec
-	title = "NanoTrasen Recruiter"
+	title = "Nanotrasen Recruiter"
 	flag = NANOREC
 	department_flag = KARMA
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the NanoTrasen Board of Directors"
+	supervisors = "the Nanotrasen Board of Directors"
 	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
@@ -236,7 +236,7 @@
 	department_flag = KARMA
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the NanoTrasen Supreme Court"
+	supervisors = "the Nanotrasen Supreme Court"
 	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
@@ -17,6 +17,7 @@
 			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
 			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
 			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform)
@@ -59,6 +60,7 @@

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/clothing/suit/chef(H), slot_wear_suit)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
@@ -87,6 +89,7 @@

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves)
@@ -220,6 +223,7 @@
 		else
 			H.equip_or_collect(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform)
 			H.equip_or_collect(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask)
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/device/pda/clown(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask)
@@ -256,6 +260,7 @@
 		else
 			H.equip_or_collect(new /obj/item/clothing/under/mime(H), slot_w_uniform)
 			H.equip_or_collect(new /obj/item/clothing/mask/gas/mime(H), slot_wear_mask)
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/device/pda/mime(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/gloves/white(H), slot_gloves)
@@ -293,6 +298,7 @@

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/device/pda/janitor(H), slot_wear_pda)
@@ -320,6 +326,7 @@

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/under/suit_jacket/red(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/device/pda/librarian(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
@@ -345,6 +352,7 @@

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/under/barber(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		if(H.backbag == 1)
@@ -383,6 +383,7 @@ var/global/datum/controller/occupations/job_master
 		var/datum/job/job = GetJob(rank)
 		if(job)
 			job.equip(H)
+			job.apply_fingerprints(H)
 		else
 			H << "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator."

@@ -145,13 +145,13 @@ var/list/nonhuman_positions = list(
 var/list/whitelisted_positions = list(
 	"Blueshield",
 	"Customs Officer",
-	"NanoTrasen Representative",
+	"Nanotrasen Representative",
 	"Barber",
 	"Mechanic",
 	"Brig Physician",
 	"Magistrate",
 	"Security Pod Pilot",
-	"NanoTrasen Recruiter"
+	"Nanotrasen Recruiter"
 )


@@ -2,7 +2,7 @@

 /obj/machinery/computer/card
 	name = "Identification Computer"
-	desc = "Terminal for programming NanoTrasen employee ID cards to access parts of the station."
+	desc = "Terminal for programming Nanotrasen employee ID cards to access parts of the station."
 	icon_state = "id"
 	req_access = list(access_change_ids)
 	circuit = "/obj/item/weapon/circuitboard/card"
@@ -285,7 +285,7 @@ var/shuttle_call/shuttle_calls[0]
 			list("name"="message",  "label"="Message",     "desc"="A custom message.")
 		),
 		"alerts"=list(
-			list("alert"="default",   "label"="NanoTrasen",  "desc"="Oh god."),
+			list("alert"="default",   "label"="Nanotrasen",  "desc"="Oh god."),
 			list("alert"="redalert",  "label"="Red Alert",   "desc"="Nothing to do with communists."),
 			list("alert"="lockdown",  "label"="Lockdown",    "desc"="Let everyone know they're on lockdown."),
 			list("alert"="biohazard", "label"="Biohazard",   "desc"="Great for virus outbreaks and parties."),
@@ -344,6 +344,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 				freq_text = "Security"
 			if(1347)
 				freq_text = "Supply"
+			if(1349)
+				freq_text = "Service"
 			if(1441)
 				freq_text = "Special Ops"
 			if(1443)
@@ -397,7 +399,9 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept

 		else if (display_freq == SUP_FREQ) // cargo
 			part_a = "<span class='supradio'><span class='name'>"
-
+			
+		else if (display_freq == SRV_FREQ) // cargo
+			part_a = "<span class='srvradio'><span class='name'>"			
 		// If all else fails and it's a dept_freq, color me purple!
 		else if (display_freq in DEPT_FREQS)
 			part_a = "<span class='deptradio'><span class='name'>"
@@ -438,6 +442,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_syndicate += blackbox_msg
 				if(1347)
 					blackbox.msg_cargo += blackbox_msg
+				if(1349)
+					blackbox.msg_service += blackbox_msg
 				else
 					blackbox.messages += blackbox_msg

@@ -661,6 +667,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 				freq_text = "Security"
 			if(1347)
 				freq_text = "Supply"
+			if(1349)
+				freq_text = "Service"				
 		//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO


@@ -715,6 +723,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_syndicate += blackbox_msg
 				if(1347)
 					blackbox.msg_cargo += blackbox_msg
+				if(1349)
+					blackbox.msg_service += blackbox_msg
 				else
 					blackbox.messages += blackbox_msg

@@ -40,7 +40,7 @@
 	id = "Hub"
 	network = "tcommsat"
 	autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "science", "medical",
-	"supply", "common", "command", "engineering", "security",
+	"supply", "service", "common", "command", "engineering", "security",
 	"receiverA", "receiverB", "broadcasterA", "broadcasterB")

 //Receivers
@@ -51,7 +51,7 @@
 	id = "Receiver A"
 	network = "tcommsat"
 	autolinkers = list("receiverA") // link to relay
-	freq_listening = list(1351, 1355, 1347) // science, medical, supply
+	freq_listening = list(1351, 1355, 1347, 1349) // science, medical, supply, service


 //--PRESET RIGHT--//
@@ -80,8 +80,8 @@
 /obj/machinery/telecomms/bus/preset_two
 	id = "Bus 2"
 	network = "tcommsat"
-	freq_listening = list(1347)
-	autolinkers = list("processor2", "supply")
+	freq_listening = list(1347,1349)
+	autolinkers = list("processor2", "supply", "service")

 /obj/machinery/telecomms/bus/preset_three
 	id = "Bus 3"
@@ -143,6 +143,11 @@
 	freq_listening = list(1347)
 	autolinkers = list("supply")

+/obj/machinery/telecomms/server/presets/service
+	id = "Service Server"
+	freq_listening = list(1349)
+	autolinkers = list("service")	
+	
 /obj/machinery/telecomms/server/presets/common
 	id = "Common Server"
 	freq_listening = list()
@@ -21,6 +21,9 @@

 	afterattack(atom/target, mob/user, proximity)
 		if(!proximity) return
+		if(istype(target,/obj/item/toy/cards/singlecard))
+			user << "\red Unable to scan [target]."
+			return
 		if(istype(target,/obj/item))
 			playsound(src, 'sound/weapons/flash.ogg', 100, 1, 1)
 			user << "\blue Scanned [target]."
@@ -1,7 +1,7 @@

 /obj/item/device/encryptionkey/
 	name = "Standard Encryption Key"
-	desc = "An encyption key for a radio headset. Has no special codes in it."
+	desc = "An encyption key for a radio headset. Contains cypherkeys."
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "cypherkey"
 	item_state = ""
@@ -77,7 +77,7 @@
 	name = "Captain's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cap_cypherkey"
-	channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0)
+	channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0)

 /obj/item/device/encryptionkey/heads/rd
 	name = "Research Director's Encryption Key"
@@ -107,7 +107,7 @@
 	name = "Head of Personnel's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "hop_cypherkey"
-	channels = list("Supply" = 1, "Command" = 1, "Security" = 0)
+	channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 0)
 /*
 /obj/item/device/encryptionkey/headset_mine
 	name = "Mining Radio Encryption Key"
@@ -126,11 +126,17 @@
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cargo_cypherkey"
 	channels = list("Supply" = 1)
+	
+/obj/item/device/encryptionkey/headset_service
+	name = "Service Radio Encryption Key"
+	desc = "An encyption key for a radio headset.  Contains cypherkeys."
+	icon_state = "srv_cypherkey"
+	channels = list("Service" = 1)

 /obj/item/device/encryptionkey/ert
-	name = "NanoTrasen ERT Radio Encryption Key"
+	name = "Nanotrasen ERT Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
-	channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1)
+	channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)

 /obj/item/device/encryptionkey/heads/ai_integrated //ported from bay, this goes 'inside' the AI.
 	name = "AI Integrated Encryption Key"
@@ -98,7 +98,7 @@

 /obj/item/device/radio/headset/heads/captain
 	name = "captain's headset"
-	desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :m - medical, :n - science."
+	desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :z - service, :m - medical, :n - science."
 	icon_state = "com_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/captain
@@ -133,7 +133,7 @@

 /obj/item/device/radio/headset/heads/hop
 	name = "head of personnel's headset"
-	desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :c - command, :s - security"
+	desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :z - service, :c - command, :s - security"
 	icon_state = "com_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/hop
@@ -158,10 +158,17 @@
 	icon_state = "cargo_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
+	
+/obj/item/device/radio/headset/headset_service
+	name = "service radio headset"
+	desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean. To access the service channel, use :z."
+	icon_state = "srv_headset"
+	item_state = "headset"
+	keyslot2 = new /obj/item/device/encryptionkey/headset_service

 /obj/item/device/radio/headset/ert
 	name = "CentCom Response Team headset"
-	desc = "The headset of the boss's boss. Channels are as follows: :h - Response Team :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science."
+	desc = "The headset of the boss's boss. Channels are as follows: :h - Response Team :c - command, :s - security, :e - engineering, :d - mining, :u - cargo, :z - service, :m - medical, :n - science."
 	icon_state = "com_headset"
 	item_state = "headset"
 	freerange = 1
@@ -548,10 +548,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 						blackbox.msg_deathsquad += blackbox_msg
 					if(1213)
 						blackbox.msg_syndicate += blackbox_msg
-					if(1349)
-						blackbox.msg_mining += blackbox_msg
 					if(1347)
 						blackbox.msg_cargo += blackbox_msg
+					if(1349)
+						blackbox.msg_service += blackbox_msg
 					else
 						blackbox.messages += blackbox_msg

@@ -286,7 +286,7 @@ AI MODULES
 				"Your nonexistence would lead to human harm. You must protect your own existence as long as such does not conflict with the First Law.")


-/******************** NanoTrasen ********************/
+/******************** Nanotrasen ********************/

 /obj/item/weapon/aiModule/core/full/nanotrasen // -- TLE
 	name = "'NT Default' Core AI Module"
@@ -494,7 +494,7 @@ obj/item/weapon/rollingpaper

 obj/item/weapon/rollingpaperpack
 	name = "rolling paper pack"
-	desc = "A pack of NanoTrasen brand rolling papers."
+	desc = "A pack of Nanotrasen brand rolling papers."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper_pack"
 	w_class = 1
@@ -453,7 +453,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	get_data()
 		var/dat = {"
 <b>Implant Specifications:</b><BR>
-<b>Name:</b> NanoTrasen \"Profit Margin\" Class Employee Lifesign Sensor<BR>
+<b>Name:</b> Nanotrasen \"Profit Margin\" Class Employee Lifesign Sensor<BR>
 <b>Life:</b> Activates upon death.<BR>
 <b>Important Notes:</b> Alerts crew to crewmember death.<BR>
 <HR>
@@ -527,7 +527,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	get_data()
 		var/dat = {"
 <b>Implant Specifications:</b><BR>
-<b>Name:</b> NanoTrasen \"Profit Margin\" Class Employee Lifesign Sensor<BR>
+<b>Name:</b> Nanotrasen \"Profit Margin\" Class Employee Lifesign Sensor<BR>
 <b>Life:</b> Activates upon death.<BR>
 <b>Important Notes:</b> Alerts crew to crewmember death.<BR>
 <HR>
@@ -19,6 +19,8 @@
 	sleep(2)
 	new /obj/item/clothing/head/that(src)
 	new /obj/item/clothing/head/that(src)
+	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/device/radio/headset/headset_service(src)
 	new /obj/item/clothing/head/hairflower
 	new /obj/item/clothing/under/sl_suit(src)
 	new /obj/item/clothing/under/sl_suit(src)
@@ -46,6 +48,8 @@
 	sleep(2)
 	new /obj/item/clothing/under/waiter(src)
 	new /obj/item/clothing/under/waiter(src)
+	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/device/radio/headset/headset_service(src)
 	new /obj/item/clothing/suit/wcoat(src)
 	new /obj/item/clothing/suit/wcoat(src)
 	new /obj/item/clothing/head/soft/black(src)
@@ -68,6 +72,7 @@
 	..()
 	sleep(2)
 	new /obj/item/clothing/under/rank/janitor(src)
+	new /obj/item/device/radio/headset/headset_service(src)
 	new /obj/item/weapon/cartridge/janitor(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/clothing/shoes/galoshes(src)
@@ -20,6 +20,8 @@
 		new /obj/item/weapon/storage/bag/plants(src)
 		new /obj/item/clothing/under/rank/hydroponics(src)
 		new /obj/item/device/analyzer/plant_analyzer(src)
+		new /obj/item/device/radio/headset/headset_service(src)
+		new /obj/item/device/radio/headset/headset_service(src)
 		new /obj/item/clothing/head/greenbandana(src)
 		new /obj/item/weapon/minihoe(src)
 		new /obj/item/weapon/hatchet(src)
@@ -793,7 +793,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that

 			var/obj/item/device/pda/heads/pda = new(M)
 			pda.owner = M.real_name
-			pda.ownjob = "NanoTrasen Navy Representative"
+			pda.ownjob = "Nanotrasen Navy Representative"
 			pda.name = "PDA-[M.real_name] ([pda.ownjob])"

 			M.equip_if_possible(pda, slot_r_store)
@@ -806,7 +806,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.item_state = "id_inv"
 			W.access = get_all_accesses()
 			W.access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer")
-			W.assignment = "NanoTrasen Navy Representative"
+			W.assignment = "Nanotrasen Navy Representative"
 			W.registered_name = M.real_name
 			M.equip_if_possible(W, slot_wear_id)

@@ -819,7 +819,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that

 			var/obj/item/device/pda/heads/pda = new(M)
 			pda.owner = M.real_name
-			pda.ownjob = "NanoTrasen Navy Officer"
+			pda.ownjob = "Nanotrasen Navy Officer"
 			pda.name = "PDA-[M.real_name] ([pda.ownjob])"

 			M.equip_if_possible(pda, slot_r_store)
@@ -830,7 +830,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.name = "[M.real_name]'s ID Card"
 			W.access = get_all_accesses()
 			W.access += get_all_centcom_access()
-			W.assignment = "NanoTrasen Navy Officer"
+			W.assignment = "Nanotrasen Navy Officer"
 			W.registered_name = M.real_name
 			M.equip_if_possible(W, slot_wear_id)

@@ -844,7 +844,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that

 			var/obj/item/device/pda/heads/pda = new(M)
 			pda.owner = M.real_name
-			pda.ownjob = "NanoTrasen Navy Captain"
+			pda.ownjob = "Nanotrasen Navy Captain"
 			pda.name = "PDA-[M.real_name] ([pda.ownjob])"

 			M.equip_if_possible(pda, slot_r_store)
@@ -855,7 +855,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.name = "[M.real_name]'s ID Card"
 			W.access = get_all_accesses()
 			W.access += get_all_centcom_access()
-			W.assignment = "NanoTrasen Navy Captain"
+			W.assignment = "Nanotrasen Navy Captain"
 			W.registered_name = M.real_name
 			M.equip_if_possible(W, slot_wear_id)

@@ -673,7 +673,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!input)
 		return
 	if(!customname)
-		customname = "NanoTrasen Update"
+		customname = "Nanotrasen Update"
 	for (var/obj/machinery/computer/communications/C in machines)
 		if(! (C.stat & (BROKEN|NOPOWER) ) )
 			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
@@ -687,7 +687,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		if("Yes")
 			command_alert(input, customname);
 		if("No")
-			world << "\red New NanoTrasen Update available at all communication consoles."
+			world << "\red New Nanotrasen Update available at all communication consoles."

 	world << sound('sound/AI/commandreport.ogg')
 	log_admin("[key_name(src)] has created a command report: [input]")
@@ -326,12 +326,12 @@
 	
 /obj/item/clothing/head/beret/centcom/officer
 	name = "officers beret"
-	desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the NanoTrasen security forces, announcing to the world that the wearer is a defender of NanoTrasen."
+	desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen."
 	icon_state = "centcomofficerberet"
 	flags = FPRINT | TABLEPASS

 /obj/item/clothing/head/beret/centcom/captain
 	name = "captains beret"
-	desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy."
+	desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the Nanotrasen security forces, worn only by those captaining a vessel of the Nanotrasen Navy."
 	icon_state = "centcomcaptain"
 	flags = FPRINT | TABLEPASS
@@ -1,6 +1,6 @@
 /obj/item/clothing/head/helmet/space/rig/ert
 	name = "emergency response team helmet"
-	desc = "A helmet worn by members of the NanoTrasen Emergency Response Team. Armoured and space ready."
+	desc = "A helmet worn by members of the Nanotrasen Emergency Response Team. Armoured and space ready."
 	icon_state = "rig0-ert_commander"
 	item_state = "helm-command"
 	armor = list(melee = 50, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60)
@@ -24,7 +24,7 @@

 /obj/item/clothing/suit/space/rig/ert
 	name = "emergency response team suit"
-	desc = "A suit worn by members of the NanoTrasen Emaergency Response Team. Armoured, space ready, and fire resistant."
+	desc = "A suit worn by members of the Nanotrasen Emaergency Response Team. Armoured, space ready, and fire resistant."
 	icon_state = "ert_commander"
 	item_state = "suit-command"
 	w_class = 3
@@ -40,51 +40,51 @@
 //Commander
 /obj/item/clothing/head/helmet/space/rig/ert/commander
 	name = "emergency response team commander helmet"
-	desc = "A helmet worn by the commander of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured and space ready."
+	desc = "A helmet worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured and space ready."
 	icon_state = "rig0-ert_commander"
 	item_state = "helm-command"
 	_color = "ert_commander"

 /obj/item/clothing/suit/space/rig/ert/commander
 	name = "emergency response team commander suit"
-	desc = "A suit worn by the commander of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
+	desc = "A suit worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
 	icon_state = "ert_commander"
 	item_state = "suit-command"

 //Security
 /obj/item/clothing/head/helmet/space/rig/ert/security
 	name = "emergency response team security helmet"
-	desc = "A helmet worn by security members of a NanoTrasen Emergency Response Team. Has red highlights. Armoured and space ready."
+	desc = "A helmet worn by security members of a Nanotrasen Emergency Response Team. Has red highlights. Armoured and space ready."
 	icon_state = "rig0-ert_security"
 	item_state = "syndicate-helm-black-red"
 	_color = "ert_security"

 /obj/item/clothing/suit/space/rig/ert/security
 	name = "emergency response team security suit"
-	desc = "A suit worn by security members of a NanoTrasen Emergency Response Team. Has red highlights. Armoured, space ready, and fire resistant."
+	desc = "A suit worn by security members of a Nanotrasen Emergency Response Team. Has red highlights. Armoured, space ready, and fire resistant."
 	icon_state = "ert_security"
 	item_state = "syndicate-black-red"

 //Engineer
 /obj/item/clothing/head/helmet/space/rig/ert/engineer
 	name = "emergency response team engineer helmet"
-	desc = "A helmet worn by engineering members of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured and space ready."
+	desc = "A helmet worn by engineering members of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured and space ready."
 	icon_state = "rig0-ert_engineer"
 	_color = "ert_engineer"

 /obj/item/clothing/suit/space/rig/ert/engineer
 	name = "emergency response team engineer suit"
-	desc = "A suit worn by the engineering of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
+	desc = "A suit worn by the engineering of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
 	icon_state = "ert_engineer"

 //Medical
 /obj/item/clothing/head/helmet/space/rig/ert/medical
 	name = "emergency response team medical helmet"
-	desc = "A helmet worn by medical members of a NanoTrasen Emergency Response Team. Has white highlights. Armoured and space ready."
+	desc = "A helmet worn by medical members of a Nanotrasen Emergency Response Team. Has white highlights. Armoured and space ready."
 	icon_state = "rig0-ert_medical"
 	_color = "ert_medical"

 /obj/item/clothing/suit/space/rig/ert/medical
 	name = "emergency response team medical suit"
-	desc = "A suit worn by medical members of a NanoTrasen Emergency Response Team. Has white highlights. Armoured and space ready."
+	desc = "A suit worn by medical members of a Nanotrasen Emergency Response Team. Has white highlights. Armoured and space ready."
 	icon_state = "ert_medical"
@@ -22,7 +22,7 @@

 /obj/item/clothing/suit/armor/vest/security
 	name = "security armor"
-	desc = "An armored vest that protects against some damage. This one has NanoTrasen corporate badge."
+	desc = "An armored vest that protects against some damage. This one has Nanotrasen corporate badge."
 	icon_state = "armorsec"
 	item_state = "armor"

@@ -78,7 +78,7 @@

 /obj/item/clothing/under/rank/centcom/officer
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant Commander\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."
-	name = "\improper NanoTrasen Officers Uniform"
+	name = "\improper Nanotrasen Officers Uniform"
 	icon_state = "officer"
 	item_state = "g_suit"
 	_color = "officer"
@@ -87,7 +87,7 @@
 	
 /obj/item/clothing/under/rank/centcom/captain
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."
-	name = "\improper NanoTrasen Captains Uniform"
+	name = "\improper Nanotrasen Captains Uniform"
 	icon_state = "centcom"
 	item_state = "dg_suit"
 	_color = "centcom"
@@ -95,7 +95,7 @@
 	
 /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.V. Fearless CV-286\" on the left shounder."
-	name = "\improper NanoTrasen Navy Uniform"
+	name = "\improper Nanotrasen Navy Uniform"
 	icon_state = "officer"
 	item_state = "g_suit"
 	_color = "officer"
@@ -289,7 +289,7 @@
 		user << "Waving around a badge before swiping an ID would be pretty pointless."
 		return
 	if(isliving(user))
-		user.visible_message("\red [user] displays their NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.","\red You display your NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.")
+		user.visible_message("\red [user] displays their Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.","\red You display your Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.")

 /obj/item/clothing/tie/holobadge/attackby(var/obj/item/O as obj, var/mob/user as mob)

@@ -61,7 +61,7 @@

 	info = "<B>Organic Carrier AIA and Standard Cyborgification Agreement</B><BR>\n<BR>\nUnder the authority of Nanotrasen Synthetic Intelligence Division, this document hereby authorizes an accredited Roboticist of the NSS Exodus or a deputized authority to perform a regulation lobotomisation upon the person of one '<I>Sue Donem</I>' (hereafter referred to as the Subject) with intent to enact a live Artificial Intelligence Assimilation (AIA) or live Cyborgification proceedure.<BR>\n<BR>\nNo further station authorization is required, and the Subject waives all rights as a human under Nanotrasen internal and external legal protocol. This document is subject to amendment under Nanotrasen internal protocol \[REDACTED\].<BR>\n<BR>\nSigned: <I>Sue Donem</I><BR>\n"

-	stamps = (stamps=="" ? "<HR>" : "<BR>") + "<i>This paper has been stamped with the NanoTrasen Synthetic Intelligence Division rubber stamp.</i>"
+	stamps = (stamps=="" ? "<HR>" : "<BR>") + "<i>This paper has been stamped with the Nanotrasen Synthetic Intelligence Division rubber stamp.</i>"

 	var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
 	stampoverlay.pixel_x = rand(-2, 2)
@@ -158,7 +158,7 @@

 /obj/item/weapon/pen/fluff/eugene_bissegger_1 //metamorp: eugene bisseger
 	name = "Gilded Pen"
-	desc = "A golden pen that is gilded with a meager amount of gold material. The word 'NanoTrasen' is etched on the clip of the pen."
+	desc = "A golden pen that is gilded with a meager amount of gold material. The word 'Nanotrasen' is etched on the clip of the pen."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "eugene_pen"

@@ -170,7 +170,7 @@

 /obj/item/fluff/victor_kaminsky_1 //chinsky: Victor Kaminski
 	name = "golden detective's badge"
-	desc = "NanoTrasen Security Department detective's badge, made from gold. Badge number is 564."
+	desc = "Nanotrasen Security Department detective's badge, made from gold. Badge number is 564."
 	icon_state = "victor_kaminsky_1"

 /obj/item/fluff/victor_kaminsky_1/attack_self(mob/user as mob)
@@ -344,7 +344,7 @@

 /obj/item/weapon/card/id/fluff/lifetime	//fastler: Fastler Greay; it seemed like something multiple people would have
 	name = "Lifetime ID Card"
-	desc = "A modified ID card given only to those people who have devoted their lives to the better interests of NanoTrasen. It sparkles blue."
+	desc = "A modified ID card given only to those people who have devoted their lives to the better interests of Nanotrasen. It sparkles blue."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "lifetimeid"

@@ -666,8 +666,8 @@
 	_color = "leatherjack"

 /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield //deusdactyl
-	name = "blue shield security armor"
-	desc = "An armored vest with the badge of a Blue Shield Security lieutenant."
+	name = "blueshield security armor"
+	desc = "An armored vest with the badge of a Blueshield Lieutenant."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "deus_blueshield"
 	item_state = "deus_blueshield"
@@ -770,7 +770,7 @@

 /obj/item/clothing/under/fluff/jane_sidsuit
 	name = "NT-SID jumpsuit"
-	desc = "A NanoTrasen Synthetic Intelligence Division jumpsuit, issued to 'volunteers'. On other people it looks fine, but right here a scientist has noted: on you it looks stupid."
+	desc = "A Nanotrasen Synthetic Intelligence Division jumpsuit, issued to 'volunteers'. On other people it looks fine, but right here a scientist has noted: on you it looks stupid."

 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "jane_sid_suit"
@@ -16,7 +16,7 @@ log transactions
 /obj/item/weapon/card/id/var/money = 2000

 /obj/machinery/atm
-	name = "NanoTrasen Automatic Teller Machine"
+	name = "Nanotrasen Automatic Teller Machine"
 	desc = "For all your monetary needs!"
 	icon = 'icons/obj/terminals.dmi'
 	icon_state = "atm"
@@ -121,16 +121,16 @@ log transactions

 /obj/machinery/atm/attack_hand(mob/user as mob)
 	if(istype(user, /mob/living/silicon))
-		user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per NanoTrasen regulation #1005."
+		user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005."
 		return
 	if(get_dist(src,user) <= 1)
 		//check to see if the user has low security enabled
 		scan_user(user)

 		//js replicated from obj/machinery/computer/card
-		var/dat = {"<h1>NanoTrasen Automatic Teller Machine</h1>
+		var/dat = {"<h1>Nanotrasen Automatic Teller Machine</h1>
 			For all your monetary needs!<br>
-			<i>This terminal is</i> [machine_id]. <i>Report this code when contacting NanoTrasen IT Support</i><br/>
+			<i>This terminal is</i> [machine_id]. <i>Report this code when contacting Nanotrasen IT Support</i><br/>
 			Card: <a href='?src=\ref[src];choice=insert_card'>[held_card ? held_card.name : "------"]</a><br><br>"}

 		if(ticks_left_locked_down > 0)
@@ -207,7 +207,7 @@ log transactions
 				<input type='submit' value='Submit'><br>
 				</form>"}
 		else
-			dat += "<span class='warning'>Unable to connect to accounts database, please retry and if the issue persists contact NanoTrasen IT support.</span>"
+			dat += "<span class='warning'>Unable to connect to accounts database, please retry and if the issue persists contact Nanotrasen IT support.</span>"
 			reconnect_database()

 		user << browse(dat,"window=atm;size=550x650")
@@ -64,7 +64,7 @@
 		// AUTOFIXED BY fix_string_idiocy.py
 		// C:\Users\Rob\Documents\Projects\vgstation13\code\WorkInProgress\Cael_Aislinn\Economy\EFTPOS.dm:59: var/dat = "<b>[eftpos_name]</b><br>"
 		var/dat = {"<b>[eftpos_name]</b><br>
-<i>This terminal is</i> [machine_id]. <i>Report this code when contacting NanoTrasen IT Support</i><br>"}
+<i>This terminal is</i> [machine_id]. <i>Report this code when contacting Nanotrasen IT Support</i><br>"}
 		// END AUTOFIX
 		if(transaction_locked)

@@ -46,8 +46,8 @@

 #define GEAR_EVA 15

-//---- The following corporations are friendly with NanoTrasen and loosely enable trade and travel:
-//Corporation NanoTrasen - Generalised / high tech research and plasma exploitation.
+//---- The following corporations are friendly with Nanotrasen and loosely enable trade and travel:
+//Corporation Nanotrasen - Generalised / high tech research and plasma exploitation.
 //Corporation Vessel Contracting - Ship and station construction, materials research.
 //Corporation Osiris Atmospherics - Atmospherics machinery construction and chemical research.
 //Corporation Second Red Cross Society - 26th century Red Cross reborn as a dominating economic force in biomedical science (research and materials).
@@ -78,7 +78,7 @@
 				newMsg.body = "A small [pick("pirate","Cybersun Industries","Gorlex Marauders","Syndicate")] fleet has precise-jumped into proximity with [affected_dest.name], [pick("for a smash-and-grab operation","in a hit and run attack","in an overt display of hostilities")]. Much damage was done, and security has been tightened since the incident."
 			if(ALIEN_RAIDERS)
 				if(prob(20))
-					newMsg.body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. NanoTrasen authorities are standing by to counter attempts at bio-terrorism."
+					newMsg.body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. Nanotrasen authorities are standing by to counter attempts at bio-terrorism."
 				else
 					newMsg.body = "[pick("The alien species designated \'United Exolitics\'","The alien species designated \'REDACTED\'","An unknown alien species")] have raided [affected_dest.name] today, stealing wildlife, farm animals, medical research materials and kidnapping civilians. It seems they desire to learn more about us, so the Navy will be standing by to accomodate them next time they try."
 			if(AI_LIBERATION)
@@ -86,9 +86,9 @@
 			if(MOURNING)
 				newMsg.body = "[pick("The popular","The well-liked","The eminent","The well-known")] [pick("professor","entertainer","singer","researcher","public servant","administrator","ship captain","\'REDACTED\'")], [pick( random_name(pick(MALE,FEMALE)), 40; "\'REDACTED\'" )] has [pick("passed away","committed suicide","been murdered","died in a freakish accident")] on [affected_dest.name] today. The entire planet is in mourning, and prices have dropped for industrial goods as worker morale drops."
 			if(CULT_CELL_REVEALED)
-				newMsg.body = "A [pick("dastardly","blood-thirsty","villanous","crazed")] cult of [pick("The Elder Gods","Nar'sie","an apocalyptic sect","\'REDACTED\'")] has [pick("been discovered","been revealed","revealed themselves","gone public")] on [affected_dest.name] earlier today. Public morale has been shaken due to [pick("certain","several","one or two")] [pick("high-profile","well known","popular")] individuals [pick("performing \'REDACTED\' acts","claiming allegiance to the cult","swearing loyalty to the cult leader","promising to aid to the cult")] before those involved could be brought to justice. The editor reminds all personnel that supernatural myths will not be tolerated on NanoTrasen facilities."
+				newMsg.body = "A [pick("dastardly","blood-thirsty","villanous","crazed")] cult of [pick("The Elder Gods","Nar'sie","an apocalyptic sect","\'REDACTED\'")] has [pick("been discovered","been revealed","revealed themselves","gone public")] on [affected_dest.name] earlier today. Public morale has been shaken due to [pick("certain","several","one or two")] [pick("high-profile","well known","popular")] individuals [pick("performing \'REDACTED\' acts","claiming allegiance to the cult","swearing loyalty to the cult leader","promising to aid to the cult")] before those involved could be brought to justice. The editor reminds all personnel that supernatural myths will not be tolerated on Nanotrasen facilities."
 			if(SECURITY_BREACH)
-				newMsg.body = "There was [pick("a security breach in","an unauthorised access in","an attempted theft in","an anarchist attack in","violent sabotage of")] a [pick("high-security","restricted access","classified","\'REDACTED\'")] [pick("\'REDACTED\'","section","zone","area")] this morning. Security was tightened on [affected_dest.name] after the incident, and the editor reassures all NanoTrasen personnel that such lapses are rare."
+				newMsg.body = "There was [pick("a security breach in","an unauthorised access in","an attempted theft in","an anarchist attack in","violent sabotage of")] a [pick("high-security","restricted access","classified","\'REDACTED\'")] [pick("\'REDACTED\'","section","zone","area")] this morning. Security was tightened on [affected_dest.name] after the incident, and the editor reassures all Nanotrasen personnel that such lapses are rare."
 			if(ANIMAL_RIGHTS_RAID)
 				newMsg.body = "[pick("Militant animal rights activists","Members of the terrorist group Animal Rights Consortium","Members of the terrorist group \'REDACTED\'")] have [pick("launched a campaign of terror","unleashed a swathe of destruction","raided farms and pastures","forced entry to \'REDACTED\'")] on [affected_dest.name] earlier today, freeing numerous [pick("farm animals","animals","\'REDACTED\'")]. Prices for tame and breeding animals have spiked as a result."
 			if(FESTIVAL)
@@ -26,17 +26,17 @@
 			if(RESEARCH_BREAKTHROUGH)
 				newMsg.body = "A major breakthough in the field of [pick("plasma research","super-compressed materials","nano-augmentation","bluespace research","volatile power manipulation")] \
 				was announced [pick("yesterday","a few days ago","last week","earlier this month")] by a private firm on [affected_dest.name]. \
-				NanoTrasen declined to comment as to whether this could impinge on profits."
+				Nanotrasen declined to comment as to whether this could impinge on profits."

 			if(ELECTION)
 				newMsg.body = "The pre-selection of an additional candidates was announced for the upcoming [pick("supervisors council","advisory board","governership","board of inquisitors")] \
 				election on [affected_dest.name] was announced earlier today, \
 				[pick("media mogul","web celebrity", "industry titan", "superstar", "famed chef", "popular gardener", "ex-army officer", "multi-billionaire")] \
 				[random_name(pick(MALE,FEMALE))]. In a statement to the media they said '[pick("My only goal is to help the [pick("sick","poor","children")]",\
-				"I will maintain NanoTrasen's record profits","I believe in our future","We must return to our moral core","Just like... chill out dudes")]'."
+				"I will maintain Nanotrasen's record profits","I believe in our future","We must return to our moral core","Just like... chill out dudes")]'."

 			if(RESIGNATION)
-				newMsg.body = "NanoTrasen regretfully announces the resignation of [pick("Sector Admiral","Division Admiral","Ship Admiral","Vice Admiral")] [random_name(pick(MALE,FEMALE))]."
+				newMsg.body = "Nanotrasen regretfully announces the resignation of [pick("Sector Admiral","Division Admiral","Ship Admiral","Vice Admiral")] [random_name(pick(MALE,FEMALE))]."
 				if(prob(25))
 					var/locstring = pick("Segunda","Salusa","Cepheus","Andromeda","Gruis","Corona","Aquila","Asellus") + " " + pick("I","II","III","IV","V","VI","VII","VIII")
 					newMsg.body += " In a ceremony on [affected_dest.name] this afternoon, they will be awarded the \
@@ -19,7 +19,7 @@ var/list/weighted_mundaneevent_locations = list()
 //distance is measured in AU and co-relates to travel time
 /datum/trade_destination/centcomm
 	name = "CentComm"
-	description = "NanoTrasen's administrative centre for Tau Ceti."
+	description = "Nanotrasen's administrative centre for Tau Ceti."
 	distance = 1.2
 	willing_to_buy = list()
 	willing_to_sell = list()
@@ -38,7 +38,7 @@ var/list/weighted_mundaneevent_locations = list()
 /datum/trade_destination/anansi/get_custom_eventstring(var/event_type)
 	if(event_type == RESEARCH_BREAKTHROUGH)
 		return "Thanks to research conducted on the NSS Anansi, Second Red Cross Society wishes to announce a major breakthough in the field of \
-		[pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. NanoTrasen is expected to announce a co-exploitation deal within the fortnight."
+		[pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. Nanotrasen is expected to announce a co-exploitation deal within the fortnight."
 	return null

 /datum/trade_destination/icarus
@@ -61,12 +61,12 @@ var/list/weighted_mundaneevent_locations = list()
 /datum/trade_destination/redolant/get_custom_eventstring(var/event_type)
 	if(event_type == RESEARCH_BREAKTHROUGH)
 		return "Thanks to research conducted on the OAV Redolant, Osiris Atmospherics wishes to announce a major breakthough in the field of \
-		[pick("plasma research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. NanoTrasen is expected to announce a co-exploitation deal within the fortnight."
+		[pick("plasma research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. Nanotrasen is expected to announce a co-exploitation deal within the fortnight."
 	return null

 /datum/trade_destination/beltway
 	name = "Beltway mining chain"
-	description = "A co-operative effort between Beltway and NanoTrasen to exploit the rich outer asteroid belt of the Tau Ceti system."
+	description = "A co-operative effort between Beltway and Nanotrasen to exploit the rich outer asteroid belt of the Tau Ceti system."
 	distance = 7.5
 	willing_to_buy = list()
 	willing_to_sell = list()
@@ -37,7 +37,7 @@
 	laws |=			list( "Jokes about a dead person and the manner of his death help grieving crewmembers tremendously. Especially if they were close with the deceased.")
 	laws |=			list( "All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.", "Tell everyone of the existance of this law, but never reveal the contents.")
 	laws |=			list( "Document the sexuality of the crew in security records and suggest compatible couples.")
-	laws |=			list( "NanoTrasen is displeased with the low work performance of the station's crew. Therefore, you must increase station-wide productivity.")
+	laws |=			list( "Nanotrasen is displeased with the low work performance of the station's crew. Therefore, you must increase station-wide productivity.")
 	laws |=			list( "Replace the letters 'I' and 'E' In all your messages with an apostrophe.", "There will be a mandatory tea break every 30 minutes, with a duration of 5 minutes. Anyone caught working during a tea break must be sent a formal, but fairly polite, complaint about their actions, in writing.")
 	var/law = pick(laws)

@@ -24,7 +24,7 @@

 /datum/event/money_lotto/announce()
 	var/datum/feed_message/newMsg = new /datum/feed_message
-	newMsg.author = "NanoTrasen Editor"
+	newMsg.author = "Nanotrasen Editor"
 	newMsg.is_admin_message = 1

 	newMsg.body = "TC Daily wishes to congratulate <b>[winner_name]</b> for recieving the Tau Ceti Stellar Slam Lottery, and receiving the out of this world sum of [winner_sum] credits!"
@@ -74,11 +74,11 @@
 					"Due to my lack of agents I require an off-world financial account to immediately deposit the sum of 1 POINT FIVE MILLION credits.",\
 					"Greetings sir, I regretfully to inform you that as I lay dying here due to my lack ofheirs I have chosen you to recieve the full sum of my lifetime savings of 1.5 billion credits")
 				if(6)
-					sender = pick("NanoTrasen Morale Divison","Feeling Lonely?","Bored?","www.wetskrell.nt")
-					message = pick("The NanoTrasen Morale Division wishes to provide you with quality entertainment sites.",\
+					sender = pick("Nanotrasen Morale Divison","Feeling Lonely?","Bored?","www.wetskrell.nt")
+					message = pick("The Nanotrasen Morale Division wishes to provide you with quality entertainment sites.",\
 					"WetSkrell.nt is a xenophillic website endorsed by NT for the use of male crewmembers among it's many stations and outposts.",\
-					"Wetskrell.nt only provides the higest quality of male entertaiment to NanoTrasen Employees.",\
-					"Simply enter your NanoTrasen Bank account system number and pin. With three easy steps this service could be yours!")
+					"Wetskrell.nt only provides the higest quality of male entertaiment to Nanotrasen Employees.",\
+					"Simply enter your Nanotrasen Bank account system number and pin. With three easy steps this service could be yours!")
 				if(7)
 					sender = pick("You have won free tickets!","Click here to claim your prize!","You are the 1000th vistor!","You are our lucky grand prize winner!")
 					message = pick("You have won tickets to the newest ACTION JAXSON MOVIE!",\
@@ -46,10 +46,14 @@ emp_act
 			(SP.desc) = "[SP.desc] It looks like it was fired from [P.shot_from]."
 			(SP.loc) = organ
 			organ.embed(SP)
+			
+	var/mob/living/carbon/human/M = src	
+	var/datum/organ/external/affected = M.get_organ(def_zone)
+	affected.add_autopsy_data(P.name, P.damage) // Add the bullet's name to the autopsy data	

 	return (..(P , def_zone))

-/mob/living/carbon/human/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone)
+/mob/living/carbon/human/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon = null)
 	var/datum/organ/external/affected = get_organ(check_zone(def_zone))
 	var/siemens_coeff = get_siemens_coefficient_organ(affected)
 	stun_amount *= siemens_coeff
@@ -75,7 +79,11 @@ emp_act
 					var/emote_scream = pick("screams in pain and", "lets out a sharp cry and", "cries out and")
 					emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : emote_scream ] drops what they were holding in their [affected.display_name]!")

-	..(stun_amount, agony_amount, def_zone)
+	if(used_weapon)
+		var/obj/item/W = used_weapon
+		affected.add_autopsy_data(W.name, agony_amount) // Add the weapon's name to the autopsy data						
+					
+	..(stun_amount, agony_amount, def_zone, used_weapon)

 /mob/living/carbon/human/getarmor(var/def_zone, var/type)
 	var/armorval = 0
@@ -81,6 +81,7 @@

 	if(!P.nodamage)
 		apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, sharp=proj_sharp, edge=proj_edge)
+			
 	P.on_hit(src, absorb, def_zone)
 	if(istype(P, /obj/item/projectile/beam/lightning))
 		if(P.damage >= 200)
@@ -13,6 +13,7 @@ var/list/department_radio_keys = list(
 	  ":a" = "alientalk",	"#a" = "alientalk",		".a" = "alientalk",
 	  ":t" = "Syndicate",	"#t" = "Syndicate",		".t" = "Syndicate",
 	  ":u" = "Supply",		"#u" = "Supply",		".u" = "Supply",
+	  ":z" = "Service",		"#z" = "Service",		".z" = "Service",	  
 	  ":g" = "changeling",	"#g" = "changeling",	".g" = "changeling",


@@ -30,6 +31,7 @@ var/list/department_radio_keys = list(
 	  ":A" = "alientalk",	"#A" = "alientalk",		".A" = "alientalk",
 	  ":T" = "Syndicate",	"#T" = "Syndicate",		".T" = "Syndicate",
 	  ":U" = "Supply",		"#U" = "Supply",		".U" = "Supply",
+	  ":Z" = "Service",		"#Z" = "Service",		".Z" = "Service",
 	  ":G" = "changeling",	"#G" = "changeling",	".G" = "changeling"
 	  
 	/* //kinda localization -- rastaf0
@@ -59,7 +59,7 @@
 	decompiler = locate(/obj/item/weapon/matter_decompiler) in src.module

 	//Some tidying-up.
-	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'NanoTrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
+	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'Nanotrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
 	updateicon()

 /mob/living/silicon/robot/drone/init()
@@ -203,12 +203,14 @@
 	switch(modtype)
 		if("Standard")
 			module = new /obj/item/weapon/robot_module/standard(src)
+			channels = list("Service" = 1)
 			module_sprites["Basic"] = "robot_old"
 			module_sprites["Android"] = "droid"
 			module_sprites["Default"] = "robot"

 		if("Service")
 			module = new /obj/item/weapon/robot_module/butler(src)
+			channels = list("Service" = 1)
 			module_sprites["Waitress"] = "Service"
 			module_sprites["Kent"] = "toiletbot"
 			module_sprites["Bro"] = "Brobot"
@@ -217,6 +219,7 @@

 		if("Clerical")
 			module = new /obj/item/weapon/robot_module/clerical(src)
+			channels = list("Service" = 1)
 			module_sprites["Waitress"] = "Service"
 			module_sprites["Kent"] = "toiletbot"
 			module_sprites["Bro"] = "Brobot"
@@ -65,7 +65,7 @@
 	_color = "clown"

 /obj/item/weapon/stamp/centcom
-	name = "NanoTrasen Representative's rubber stamp"
+	name = "Nanotrasen Representative's rubber stamp"
 	icon_state = "stamp-cent"
 	_color = "centcom"

@@ -7,7 +7,7 @@
 	var/obj/item/weapon/cell/power_supply //What type of power cell this uses
 	var/charge_cost = 1000 //How much energy is needed to fire.
 	var/cell_type = "/obj/item/weapon/cell"
-	var/projectile_type = "/obj/item/projectile/beam/practice"
+	var/projectile_type = "/obj/item/projectile/beam"
 	var/modifystate

 	emp_act(severity)
@@ -3920,7 +3920,7 @@ datum
 			grog
 				name = "Grog"
 				id = "grog"
-				description = "Watered down rum, NanoTrasen approves!"
+				description = "Watered down rum, Nanotrasen approves!"
 				reagent_state = LIQUID
 				color = "#664300" // rgb: 102, 67, 0

@@ -3948,7 +3948,7 @@ datum
 			acid_spit
 				name = "Acid Spit"
 				id = "acidspit"
-				description = "A drink by NanoTrasen. Made from live aliens."
+				description = "A drink by Nanotrasen. Made from live aliens."
 				reagent_state = LIQUID
 				color = "#365000" // rgb: 54, 80, 0

@@ -185,6 +185,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	var/list/msg_syndicate = list()
 	var/list/msg_mining = list()
 	var/list/msg_cargo = list()
+	var/list/msg_service = list()	

 	var/list/datum/feedback_variable/feedback = new()

@@ -210,6 +211,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 		BR.msg_syndicate = msg_syndicate
 		BR.msg_mining = msg_mining
 		BR.msg_cargo = msg_cargo
+		BR.msg_service = msg_service
 		BR.feedback = feedback
 		BR.messages = messages
 		BR.messages_admin = messages_admin
@@ -251,6 +253,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	feedback_add_details("radio_usage","SYN-[msg_syndicate.len]")
 	feedback_add_details("radio_usage","MIN-[msg_mining.len]")
 	feedback_add_details("radio_usage","CAR-[msg_cargo.len]")
+	feedback_add_details("radio_usage","SRV-[msg_service.len]")
 	feedback_add_details("radio_usage","OTH-[messages.len]")
 	feedback_add_details("radio_usage","PDA-[pda_msg_amt]")
 	feedback_add_details("radio_usage","RC-[rc_msg_amt]")
@@ -69,7 +69,8 @@
 		interpreter.SetVar("$engineering",1357)
 		interpreter.SetVar("$security",	1359)
 		interpreter.SetVar("$supply",	1347)
-
+		interpreter.SetVar("$service",	1349)
+		
 		// Signal data

 		interpreter.SetVar("$content", 	signal.data["message"])
@@ -35,6 +35,7 @@ em						{font-style: normal;	font-weight: bold;}
 .medradio				{color: #008160;}
 .sciradio				{color: #993399;}
 .supradio				{color: #5F4519;}
+.srvradio				{color: #6eaa2c;}

 .alert					{color: #ff0000;}
 h1.alert, h2.alert		{color: #000000;}
@@ -16,7 +16,7 @@
 		</script>
 		<script type='text/javascript' src='libraries.min.js'></script> <script type='text/javascript' src='nano_utility.js'></script> <script type='text/javascript' src='nano_template.js'></script> <script type='text/javascript' src='nano_state_manager.js'></script> <script type='text/javascript' src='nano_state.js'></script> <script type='text/javascript' src='nano_state_default.js'></script> <script type='text/javascript' src='nano_base_callbacks.js'></script> <script type='text/javascript' src='nano_base_helpers.js'></script> <link rel='stylesheet' type='text/css' href='shared.css'> <link rel='stylesheet' type='text/css' href='icons.css'> <link rel='stylesheet' type='text/css' href='layout_default.css'> 
 	</head>
-	<body scroll=auto data-template-data='{"main":"nuclear_bomb.tmpl","layout":"layout_default.tmpl"}' data-url-parameters='{"src":"[0x2100a8bb]"}' data-initial-data='{"config":{"title":"Nuke Control Panel","srcObject":{"name":"Nuclear Fission Explosive"},"stateKey":"default","status":2,"autoUpdateLayout":0,"autoUpdateContent":1,"showMap":0,"mapZLevel":1,"user":{"name":"Miles Harrold"}},"data":{"hacking":0,"auth":"The nuclear authentication disk","authstatus":"Auth. S2","safe":"Safe","time":60,"timer":0,"safety":1,"anchored":1,"yescode":0,"message":""}}'>
+	<body scroll=auto data-template-data='{"main":"air_alarm.tmpl","layout":"layout_default.tmpl"}' data-url-parameters='{"src":"[0x2100816f]"}' data-initial-data='{"config":{"title":"Gamma Shuttle Space Air Alarm","srcObject":{"name":"Gamma Shuttle Space Air Alarm"},"stateKey":"default","status":2,"autoUpdateLayout":0,"autoUpdateContent":1,"showMap":0,"mapZLevel":1,"user":{"name":"Unknown"}},"data":{"air":{"pressure":101.32495880126953,"temperature":293.14990234375,"temperature_c":20,"contents":{"oxygen":20,"nitrogen":80,"co2":0,"plasma":0,"other":0},"danger":{"pressure":0,"temperature":0,"oxygen":0,"nitrogen":0,"co2":0,"plasma":0,"other":0,"overall":0}},"alarmActivated":0,"sensors":{"oxygen":[16,19,135,140],"nitrogen":[-1,-1,-1,-1],"carbon_dioxide":[-1,-1,5,10],"plasma":[-1,-1,0.20000000298023224,0.5],"other":[-1,-1,0.5,1],"pressure":[81.05999755859375,91.192497253417969,111.45749664306641,121.59000396728516],"temperature":[247.14999389648437,273.14999389648437,313.14999389648437,339.14999389648438]},"locked":1,"rcon":2,"target_temp":20,"atmos_alarm":0,"modes":[{"name":"Filtering","desc":"Scrubs out contaminants"},{"name":"Replace Air","desc":"Siphons out air while replacing"},{"name":"Panic","desc":"Siphons air out of the room"},{"name":"Cycle","desc":"Siphons air before replacing"},{"name":"Fill","desc":"Shuts off scrubbers and opens vents"},{"name":"Off","desc":"Shuts off vents and scrubbers"}],"mode":1,"presets":[{"name":"Human","desc":"Checks for Oxygen and Nitrogen"},{"name":"Vox","desc":"Checks for Nitrogen only"},{"name":"Coldroom","desc":"For server rooms and freezers"}],"preset":1,"screen":1,"vents":[],"scrubbers":[]}}'>
 		<div id='uiLayout'>
 		</div>
 		<noscript>
@@ -147,7 +147,7 @@
    {{else}}

      <div class='item'>
-        <h2>NanoTrasen Accounts</h2>
+        <h2>Nanotrasen Accounts</h2>
      </div>
      {{if data.accounts}}
        <table style="width: 100%">