Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie"

This reverts commit 1945c166b4, reversing
changes made to c8d20ea83c.

code/controllers/subsystem/air.dm

@@ -257,8 +257,9 @@ SUBSYSTEM_DEF(air)
 		#ifdef VISUALIZE_ACTIVE_TURFS
 		T.add_atom_colour("#00ff00", TEMPORARY_COLOUR_PRIORITY)
 		#endif
-		T.excited = TRUE
-		active_turfs[T] = SSair_turfs.currentrun[T] = TRUE
+		T.excited = 1
+		active_turfs |= T
+		SSair_turfs.currentrun |= T
 		if(blockchanges && T.excited_group)
 			T.excited_group.garbage_collect()
 		add_to_react_queue(T)
@@ -274,9 +275,10 @@ SUBSYSTEM_DEF(air)
 
 /datum/controller/subsystem/air/proc/add_to_react_queue(turf/open/T)
 	if(istype(T) && T.air)
-		turf_react_queue[T] = TRUE
+		turf_react_queue |= T
 		if(currentpart == SSAIR_REACTQUEUE)
-			currentrun[T] = TRUE
+			currentrun |= T
+	return
 
 /datum/controller/subsystem/air/proc/remove_from_react_queue(turf/open/T)
 	turf_react_queue -= T
@@ -313,7 +315,7 @@ SUBSYSTEM_DEF(air)
 		var/starting_ats = active_turfs.len
 		sleep(world.tick_lag)
 		var/timer = world.timeofday
-		log_mapping("There are [starting_ats] active turfs at roundstart caused by a difference of the air between the adjacent turfs. You can see its coordinates using \"Mapping -> Show roundstart AT list\" verb (debug verbs required).")
+		warning("There are [starting_ats] active turfs at roundstart, this is a mapping error caused by a difference of the air between the adjacent turfs. You can see its coordinates using \"Mapping -> Show roundstart AT list\" verb (debug verbs required)")
 		for(var/turf/T in active_turfs)
 			GLOB.active_turfs_startlist += T
 

code/controllers/subsystem/mobs.dm

@@ -8,7 +8,6 @@ SUBSYSTEM_DEF(mobs)
 	var/static/list/clients_by_zlevel[][]
 	var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when z2 is created and new_players can login before that.
 	var/static/list/cubemonkeys = list()
-	var/static/list/cheeserats = list()
 
 /datum/controller/subsystem/mobs/stat_entry()
 	..("P:[GLOB.mob_living_list.len]")

code/controllers/subsystem/pai.dm

@@ -8,7 +8,7 @@ SUBSYSTEM_DEF(pai)
 	var/spam_delay = 100
 	var/list/pai_card_list = list()
 
-/datum/controller/subsystem/pai/Topic(href, href_list)
+/datum/controller/subsystem/pai/Topic(href, href_list[])
 	if(href_list["download"])
 		var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates
 		var/obj/item/paicard/card = locate(href_list["device"]) in pai_card_list
@@ -39,34 +39,34 @@ SUBSYSTEM_DEF(pai)
 
 		switch(option)
 			if("name")
-				t = reject_bad_name(stripped_input(usr, "Enter a name for your pAI", "pAI Name", candidate.name, MAX_NAME_LEN), TRUE)
+				t = input("Enter a name for your pAI", "pAI Name", candidate.name) as text
 				if(t)
-					candidate.name = t
+					candidate.name = copytext(sanitize(t),1,MAX_NAME_LEN)
 			if("desc")
-				t = stripped_multiline_input(usr, "Enter a description for your pAI", "pAI Description", candidate.description, MAX_MESSAGE_LEN)
+				t = input("Enter a description for your pAI", "pAI Description", candidate.description) as message
 				if(t)
-					candidate.description = t
+					candidate.description = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
 			if("role")
-				t = stripped_input(usr, "Enter a role for your pAI", "pAI Role", candidate.role, MAX_MESSAGE_LEN)
+				t = input("Enter a role for your pAI", "pAI Role", candidate.role) as text
 				if(t)
-					candidate.role = t
+					candidate.role = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
 			if("ooc")
-				t = stripped_multiline_input(usr, "Enter any OOC comments", "pAI OOC Comments", candidate.comments, MAX_MESSAGE_LEN)
+				t = input("Enter any OOC comments", "pAI OOC Comments", candidate.comments) as message
 				if(t)
-					candidate.comments = t
+					candidate.comments = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
 			if("save")
 				candidate.savefile_save(usr)
 			if("load")
 				candidate.savefile_load(usr)
 				//In case people have saved unsanitized stuff.
 				if(candidate.name)
-					candidate.name = copytext_char(sanitize(candidate.name),1,MAX_NAME_LEN)
+					candidate.name = copytext(sanitize(candidate.name),1,MAX_NAME_LEN)
 				if(candidate.description)
-					candidate.description = copytext_char(sanitize(candidate.description),1,MAX_MESSAGE_LEN)
+					candidate.description = copytext(sanitize(candidate.description),1,MAX_MESSAGE_LEN)
 				if(candidate.role)
-					candidate.role = copytext_char(sanitize(candidate.role),1,MAX_MESSAGE_LEN)
+					candidate.role = copytext(sanitize(candidate.role),1,MAX_MESSAGE_LEN)
 				if(candidate.comments)
-					candidate.comments = copytext_char(sanitize(candidate.comments),1,MAX_MESSAGE_LEN)
+					candidate.comments = copytext(sanitize(candidate.comments),1,MAX_MESSAGE_LEN)
 
 			if("submit")
 				if(candidate)

code/controllers/subsystem/processing/networks.dm

@@ -46,6 +46,6 @@ PROCESSING_SUBSYSTEM_DEF(networks)
 	var/hex = md5(string)
 	if(!hex)
 		return		//errored
-	. = "[copytext_char(hex, 1, 9)]"		//16 ^ 8 possibilities I think.
+	. = "[copytext(hex, 1, 9)]"		//16 ^ 8 possibilities I think.
 	if(interfaces_by_id[.])
 		return resolve_collisions? make_address("[num2text(rand(HID_RESTRICTED_END, 999999999), 12)]"):null

code/controllers/subsystem/processing/quirks.dm

@@ -17,7 +17,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 /datum/controller/subsystem/processing/quirks/Initialize(timeofday)
 	if(!quirks.len)
 		SetupQuirks()
-		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Hypersensitive"),list("Ageusia","Vegetarian","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Light Drinker"),list("Prosthetic Limb (Left Arm)","Prosthetic Limb (Right Arm)","Prosthetic Limb (Left Leg)","Prosthetic Limb (Right Leg)","Prosthetic Limb"),list("Social Anxiety","Mute"))
+
+	quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic","Hypersensitive"),list("Ageusia","Vegetarian","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Light Drinker"),list("Prosthetic Limb (Left Arm)","Prosthetic Limb (Right Arm)","Prosthetic Limb (Left Leg)","Prosthetic Limb (Right Leg)","Prosthetic Limb"),list("Social Anxiety","Mute"))
 	return ..()
 
 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
@@ -31,21 +32,13 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 		quirk_names_by_path[T] = initial(T.name)
 
 /datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects, roundstart = FALSE, datum/job/job, silent = FALSE, mob/to_chat_target)
-	var/badquirk = FALSE
-	var/list/my_quirks = cli.prefs.all_quirks.Copy()
+	GenerateQuirks(cli)
+	var/list/quirks = cli.prefs.character_quirks.Copy()
 	var/list/cut
-	if(job?.blacklisted_quirks)
-		cut = filter_quirks(my_quirks, job)
-	for(var/V in my_quirks)
-		if(V in quirks)
-			var/datum/quirk/Q = quirks[V]
-			user.add_quirk(Q, spawn_effects)
-		else
-			log_admin("Invalid quirk \"[V]\" in client [cli.ckey] preferences")
-			cli.prefs.all_quirks -= V
-			badquirk = TRUE
-	if(badquirk)
-		cli.prefs.save_character()
+	if(job && job.blacklisted_quirks)
+		cut = filter_quirks(quirks, job)
+	for(var/V in quirks)
+		user.add_quirk(V, spawn_effects)
 	if(!silent && LAZYLEN(cut))
 		to_chat(to_chat_target || user, "<span class='boldwarning'>All of your non-neutral character quirks have been cut due to these quirks conflicting with your job assignment: [english_list(cut)].</span>")
 
@@ -63,28 +56,28 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 	for(var/i in quirk_names)
 		. += quirk_points_by_name(i)
 
-/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/our_quirks, datum/job/job)
+/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/quirks, datum/job/job)
 	var/list/cut = list()
 	var/list/banned_names = list()
 	for(var/i in job.blacklisted_quirks)
 		var/name = quirk_name_by_path(i)
 		if(name)
 			banned_names += name
-	var/list/blacklisted = our_quirks & banned_names
+	var/list/blacklisted = quirks & banned_names
 	if(length(blacklisted))
 		for(var/i in blacklisted)
-			our_quirks -= i
+			quirks -= i
 			cut += i
 
 	/*	//Code to automatically reduce positive quirks until balance is even.
-	var/points_used = total_points(our_quirks)
+	var/points_used = total_points(quirks)
 	if(points_used > 0)
 		//they owe us points, let's collect.
-		for(var/i in our_quirks)
+		for(var/i in quirks)
 			var/points = quirk_points_by_name(i)
 			if(points > 0)
 				cut += i
-				our_quirks -= i
+				quirks -= i
 				points_used -= points
 			if(points_used <= 0)
 				break
@@ -92,9 +85,14 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 
 	//Nah, let's null all non-neutrals out.
 	if(cut.len)
-		for(var/i in our_quirks)
+		for(var/i in quirks)
 			if(quirk_points_by_name(i) != 0)
 				//cut += i		-- Commented out: Only show the ones that triggered the quirk purge.
-				our_quirks -= i
+				quirks -= i
 
 	return cut
+
+/datum/controller/subsystem/processing/quirks/proc/GenerateQuirks(client/user)
+	if(user.prefs.character_quirks.len)
+		return
+	user.prefs.character_quirks = user.prefs.all_quirks

code/controllers/subsystem/research.dm

@@ -1,34 +1,27 @@
+
 SUBSYSTEM_DEF(research)
 	name = "Research"
 	priority = FIRE_PRIORITY_RESEARCH
 	wait = 10
 	init_order = INIT_ORDER_RESEARCH
-	//TECHWEB STATIC
-	var/list/techweb_nodes = list()				//associative id = node datum
-	var/list/techweb_designs = list()			//associative id = node datum
-	var/list/datum/techweb/techwebs = list()
-	var/datum/techweb/science/science_tech
-	var/datum/techweb/admin/admin_tech
-	var/datum/techweb_node/error_node/error_node	//These two are what you get if a node/design is deleted and somehow still stored in a console.
-	var/datum/design/error_design/error_design
-
-	//ERROR LOGGING
 	var/list/invalid_design_ids = list()		//associative id = number of times
 	var/list/invalid_node_ids = list()			//associative id = number of times
 	var/list/invalid_node_boost = list()		//associative id = error message
-
 	var/list/obj/machinery/rnd/server/servers = list()
-
-	var/list/techweb_nodes_starting = list()	//associative id = TRUE
-	var/list/techweb_categories = list()		//category name = list(node.id = TRUE)
+	var/datum/techweb/science/science_tech
+	var/datum/techweb/admin/admin_tech
+	var/list/techweb_nodes = list()				//associative id = node datum
+	var/list/techweb_categories = list()		//category name = list(node.id = node)
+	var/list/techweb_designs = list()			//associative id = node datum
+	var/list/techweb_nodes_starting = list()	//associative id = node datum
 	var/list/techweb_boost_items = list()		//associative double-layer path = list(id = list(point_type = point_discount))
-	var/list/techweb_nodes_hidden = list()		//Node ids that should be hidden by default.
+	var/list/techweb_nodes_hidden = list()		//Nodes that should be hidden by default.
 	var/list/techweb_point_items = list(		//path = list(point type = value)
 	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 2500),
 	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 5000),   // Cit three more anomalys anomalys
 	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 7500),
 	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000),
-	//   -   Slime Extracts!   -
+	//   -   Slime Extracts!   - 
 	/obj/item/slime_extract/grey = list(TECHWEB_POINT_TYPE_GENERIC = 500),    // Adds in slime core deconing
 	/obj/item/slime_extract/metal = list(TECHWEB_POINT_TYPE_GENERIC = 750),
 	/obj/item/slime_extract/purple = list(TECHWEB_POINT_TYPE_GENERIC = 750),
@@ -301,8 +294,6 @@ SUBSYSTEM_DEF(research)
 	science_tech = new /datum/techweb/science
 	admin_tech = new /datum/techweb/admin
 	autosort_categories()
-	error_design = new
-	error_node = new
 	return ..()
 
 /datum/controller/subsystem/research/fire()
@@ -339,191 +330,6 @@ SUBSYSTEM_DEF(research)
 	for(var/i in techweb_nodes)
 		var/datum/techweb_node/I = techweb_nodes[i]
 		if(techweb_categories[I.category])
-			techweb_categories[I.category][I.id] = TRUE
+			techweb_categories[I.category][I.id] = I
 		else
-			techweb_categories[I.category] = list(I.id = TRUE)
-
-/datum/controller/subsystem/research/proc/techweb_node_by_id(id)
-	return techweb_nodes[id] || error_node
-
-/datum/controller/subsystem/research/proc/techweb_design_by_id(id)
-	return techweb_designs[id] || error_design
-
-/datum/controller/subsystem/research/proc/on_design_deletion(datum/design/D)
-	for(var/i in techweb_nodes)
-		var/datum/techweb_node/TN = techwebs[i]
-		TN.on_design_deletion(TN)
-	for(var/i in techwebs)
-		var/datum/techweb/T = i
-		T.recalculate_nodes(TRUE)
-
-/datum/controller/subsystem/research/proc/on_node_deletion(datum/techweb_node/TN)
-	for(var/i in techweb_nodes)
-		var/datum/techweb_node/TN2 = techwebs[i]
-		TN2.on_node_deletion(TN)
-	for(var/i in techwebs)
-		var/datum/techweb/T = i
-		T.recalculate_nodes(TRUE)
-
-/datum/controller/subsystem/research/proc/initialize_all_techweb_nodes(clearall = FALSE)
-	if(islist(techweb_nodes) && clearall)
-		QDEL_LIST(techweb_nodes)
-	if(islist(techweb_nodes_starting && clearall))
-		techweb_nodes_starting.Cut()
-	var/list/returned = list()
-	for(var/path in subtypesof(/datum/techweb_node))
-		var/datum/techweb_node/TN = path
-		if(isnull(initial(TN.id)))
-			continue
-		TN = new path
-		if(returned[initial(TN.id)])
-			stack_trace("WARNING: Techweb node ID clash with ID [initial(TN.id)] detected! Path: [path]")
-			errored_datums[TN] = initial(TN.id)
-			continue
-		returned[initial(TN.id)] = TN
-		if(TN.starting_node)
-			techweb_nodes_starting[TN.id] = TRUE
-	for(var/id in techweb_nodes)
-		var/datum/techweb_node/TN = techweb_nodes[id]
-		TN.Initialize()
-	techweb_nodes = returned
-	if (!verify_techweb_nodes())	//Verify all nodes have ids and such.
-		stack_trace("Invalid techweb nodes detected")
-	calculate_techweb_nodes()
-	calculate_techweb_boost_list()
-	if (!verify_techweb_nodes())		//Verify nodes and designs have been crosslinked properly.
-		CRASH("Invalid techweb nodes detected")
-
-/datum/controller/subsystem/research/proc/initialize_all_techweb_designs(clearall = FALSE)
-	if(islist(techweb_designs) && clearall)
-		QDEL_LIST(techweb_designs)
-	var/list/returned = list()
-	for(var/path in subtypesof(/datum/design))
-		var/datum/design/DN = path
-		if(isnull(initial(DN.id)))
-			stack_trace("WARNING: Design with null ID detected. Build path: [initial(DN.build_path)]")
-			continue
-		else if(initial(DN.id) == DESIGN_ID_IGNORE)
-			continue
-		DN = new path
-		if(returned[initial(DN.id)])
-			stack_trace("WARNING: Design ID clash with ID [initial(DN.id)] detected! Path: [path]")
-			errored_datums[DN] = initial(DN.id)
-			continue
-		returned[initial(DN.id)] = DN
-	techweb_designs = returned
-	verify_techweb_designs()
-
-/datum/controller/subsystem/research/proc/verify_techweb_nodes()
-	. = TRUE
-	for(var/n in techweb_nodes)
-		var/datum/techweb_node/N = techweb_nodes[n]
-		if(!istype(N))
-			WARNING("Invalid research node with ID [n] detected and removed.")
-			techweb_nodes -= n
-			research_node_id_error(n)
-			. = FALSE
-		for(var/p in N.prereq_ids)
-			var/datum/techweb_node/P = techweb_nodes[p]
-			if(!istype(P))
-				WARNING("Invalid research prerequisite node with ID [p] detected in node [N.display_name]\[[N.id]\] removed.")
-				N.prereq_ids  -= p
-				research_node_id_error(p)
-				. = FALSE
-		for(var/d in N.design_ids)
-			var/datum/design/D = techweb_designs[d]
-			if(!istype(D))
-				WARNING("Invalid research design with ID [d] detected in node [N.display_name]\[[N.id]\] removed.")
-				N.design_ids -= d
-				design_id_error(d)
-				. = FALSE
-		for(var/u in N.unlock_ids)
-			var/datum/techweb_node/U = techweb_nodes[u]
-			if(!istype(U))
-				WARNING("Invalid research unlock node with ID [u] detected in node [N.display_name]\[[N.id]\] removed.")
-				N.unlock_ids -= u
-				research_node_id_error(u)
-				. = FALSE
-		for(var/p in N.boost_item_paths)
-			if(!ispath(p))
-				N.boost_item_paths -= p
-				WARNING("[p] is not a valid path.")
-				node_boost_error(N.id, "[p] is not a valid path.")
-				. = FALSE
-			var/list/points = N.boost_item_paths[p]
-			if(islist(points))
-				for(var/i in points)
-					if(!isnum(points[i]))
-						WARNING("[points[i]] is not a valid number.")
-						node_boost_error(N.id, "[points[i]] is not a valid number.")
-						. = FALSE
-					else if(!point_types[i])
-						WARNING("[i] is not a valid point type.")
-						node_boost_error(N.id, "[i] is not a valid point type.")
-						. = FALSE
-			else if(!isnull(points))
-				N.boost_item_paths -= p
-				node_boost_error(N.id, "No valid list.")
-				WARNING("No valid list.")
-				. = FALSE
-		CHECK_TICK
-
-/datum/controller/subsystem/research/proc/verify_techweb_designs()
-	for(var/d in techweb_designs)
-		var/datum/design/D = techweb_designs[d]
-		if(!istype(D))
-			stack_trace("WARNING: Invalid research design with ID [d] detected and removed.")
-			techweb_designs -= d
-		CHECK_TICK
-
-/datum/controller/subsystem/research/proc/research_node_id_error(id)
-	if(invalid_node_ids[id])
-		invalid_node_ids[id]++
-	else
-		invalid_node_ids[id] = 1
-
-/datum/controller/subsystem/research/proc/design_id_error(id)
-	if(invalid_design_ids[id])
-		invalid_design_ids[id]++
-	else
-		invalid_design_ids[id] = 1
-
-/datum/controller/subsystem/research/proc/calculate_techweb_nodes()
-	for(var/design_id in techweb_designs)
-		var/datum/design/D = techweb_designs[design_id]
-		D.unlocked_by.Cut()
-	for(var/node_id in techweb_nodes)
-		var/datum/techweb_node/node = techweb_nodes[node_id]
-		node.unlock_ids = list()
-		for(var/i in node.design_ids)
-			var/datum/design/D = techweb_designs[i]
-			node.design_ids[i] = TRUE
-			D.unlocked_by += node.id
-		if(node.hidden)
-			techweb_nodes_hidden[node.id] = TRUE
-		CHECK_TICK
-	generate_techweb_unlock_linking()
-
-/datum/controller/subsystem/research/proc/generate_techweb_unlock_linking()
-	for(var/node_id in techweb_nodes)						//Clear all unlock links to avoid duplication.
-		var/datum/techweb_node/node = techweb_nodes[node_id]
-		node.unlock_ids = list()
-	for(var/node_id in techweb_nodes)
-		var/datum/techweb_node/node = techweb_nodes[node_id]
-		for(var/prereq_id in node.prereq_ids)
-			var/datum/techweb_node/prereq_node = techweb_node_by_id(prereq_id)
-			prereq_node.unlock_ids[node.id] = node
-
-/datum/controller/subsystem/research/proc/calculate_techweb_boost_list(clearall = FALSE)
-	if(clearall)
-		techweb_boost_items = list()
-	for(var/node_id in techweb_nodes)
-		var/datum/techweb_node/node = techweb_nodes[node_id]
-		for(var/path in node.boost_item_paths)
-			if(!ispath(path))
-				continue
-			if(length(techweb_boost_items[path]))
-				techweb_boost_items[path][node.id] = node.boost_item_paths[path]
-			else
-				techweb_boost_items[path] = list(node.id = node.boost_item_paths[path])
-		CHECK_TICK
+			techweb_categories[I.category] = list(I.id = I)

code/controllers/subsystem/shuttle.dm

@@ -251,7 +251,7 @@ SUBSYSTEM_DEF(shuttle)
 
 	if(!admiral_message)
 		admiral_message = pick(GLOB.admiral_messages)
-	var/intercepttext = "<font size = 3><b>Kinaris Update</b>: Request For Shuttle.</font><hr>\
+	var/intercepttext = "<font size = 3><b>Nanotrasen Update</b>: Request For Shuttle.</font><hr>\
 						To whom it may concern:<br><br>\
 						We have taken note of the situation upon [station_name()] and have come to the \
 						conclusion that it does not warrant the abandonment of the station.<br>\

code/controllers/subsystem/tgui.dm

@@ -11,7 +11,7 @@ SUBSYSTEM_DEF(tgui)
 	var/basehtml // The HTML base used for all UIs.
 
 /datum/controller/subsystem/tgui/PreInit()
-	basehtml = file2text('tgui-next/packages/tgui/public/tgui-main.html')
+	basehtml = file2text('tgui/tgui.html')
 
 /datum/controller/subsystem/tgui/Shutdown()
 	close_all_uis()

code/controllers/subsystem/ticker.dm

@@ -383,8 +383,8 @@ SUBSYSTEM_DEF(ticker)
 				captainless=0
 			if(player.mind.assigned_role != player.mind.special_role)
 				SSjob.EquipRank(N, player.mind.assigned_role, 0)
-				if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character))
-					SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N)
+			if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character))
+				SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N)
 		CHECK_TICK
 	if(captainless)
 		for(var/mob/dead/new_player/N in GLOB.player_list)
@@ -534,7 +534,7 @@ SUBSYSTEM_DEF(ticker)
 
 /datum/controller/subsystem/ticker/proc/send_news_report()
 	var/news_message
-	var/news_source = "Kinaris News Network"
+	var/news_source = "Nanotrasen News Network"
 	switch(news_report)
 		if(NUKE_SYNDICATE_BASE)
 			news_message = "In a daring raid, the heroic crew of [station_name()] detonated a nuclear device in the heart of a terrorist base."