rej cleanup/commit

code/__HELPERS/unsorted.dm.rej

@@ -1,29 +0,0 @@
-diff a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm	(rejected hunks)
-@@ -1415,25 +1415,4 @@ GLOBAL_PROTECT(valid_HTTPSGet)
- 		var/obj/item/organ/brain/brain = occupant
- 		mob_occupant = brain.brainmob
- 
--	return mob_occupant
--
--/proc/msglog_admins(text)
--	message_admins(text)
--	log_admin(text)
--
--/proc/trigger_centcom_recall()
--	if(SSshuttle.emergency.mode != SHUTTLE_CALL)
--		return
--
--	var/time = rand(600, 1200)
--	var/message = pick(GLOB.annoyed_admiral_messages)
--
--	message = input("Enter message from the on-call admiral to be put in the recall report.", "Annoyed Admiral Message", message) as text|null
--
--	if(!message)
--		return
--
--	message_admins("[key_name_admin(usr)] triggered a Centcom recall in [time/10] seconds, with the annoyed admiral message of: [message]")
--	log_game("[key_name(usr)] triggered a Centcom recall in [time/10] seconds, with the annoyed admiral message of: [message]")
--
--	addtimer(CALLBACK(SSshuttle, /datum/controller/subsystem/shuttle/.proc/centcom_recall, SSshuttle.emergency.timer, message), time)
-+	return mob_occupant
-\ No newline at end of file

code/_globalvars/lists/flavor_misc.dm

@@ -161,3 +161,4 @@ GLOBAL_LIST_INIT(numbers_as_words, list("One", "Two", "Three", "Four",
 	return L
 
 GLOBAL_LIST_INIT(station_numerals, greek_letters + phonetic_alphabet + numbers_as_words + generate_number_strings())
+GLOBAL_LIST_INIT(admiral_messages, list("Do you know how expensive these stations are?","Stop wasting my time.","I was sleeping, thanks a lot.","Stand and fight you cowards!","You knew the risks coming in.","Stop being paranoid.","Whatever's broken just build a new one.","No.", "<i>null</i>","<i>Error: No comment given.</i>", "It's a good day to die!"))

code/_globalvars/lists/flavor_misc.dm.rej

@@ -1,8 +0,0 @@
-diff a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm	(rejected hunks)
-@@ -162,4 +162,4 @@ GLOBAL_LIST_INIT(numbers_as_words, list("One", "Two", "Three", "Four",
- 
- GLOBAL_LIST_INIT(station_numerals, greek_letters + phonetic_alphabet + numbers_as_words + generate_number_strings())
- 
--GLOBAL_LIST_INIT(annoyed_admiral_messages, list("Do you know how expensive these stations are?","Stop wasting my time.","I was sleeping, thanks a lot.","Stand and fight you cowards!","You knew the risks coming in.","Stop being paranoid.","Whatever's broken just build a new one.","No.", "<i>null</i>","<i>Error: No comment given.</i>", "It's a good day to die!"))
-+GLOBAL_LIST_INIT(admiral_messages, list("Do you know how expensive these stations are?","Stop wasting my time.","I was sleeping, thanks a lot.","Stand and fight you cowards!","You knew the risks coming in.","Stop being paranoid.","Whatever's broken just build a new one.","No.", "<i>null</i>","<i>Error: No comment given.</i>", "It's a good day to die!"))
-\ No newline at end of file

code/controllers/subsystem/shuttle.dm

@@ -217,7 +217,27 @@ SUBSYSTEM_DEF(shuttle)
 			emergency.request(null, signal_origin, html_decode(emergency_reason), 0)
 
 	log_game("[key_name(user)] has called the shuttle.")
-	message_admins("[key_name_admin(user)] has called the shuttle.")
+	message_admins("[key_name_admin(user)] has called the shuttle. (<A HREF='?_src_=holder;trigger_centcom_recall=1'>TRIGGER CENTCOM RECALL</A>)")
+
+/datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, admiral_message)
+	if(emergency.mode != SHUTTLE_CALL || emergency.timer != old_timer)
+		return
+	emergency.cancel(/area/centcom)
+
+	if(!admiral_message)
+		admiral_message = pick(GLOB.admiral_messages)
+	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>\
+						If you do not agree with our opinion we suggest that you open a direct \
+						line with us and explain the nature of your crisis.<br><br>\
+						<i>This message has been automatically generated based upon readings from long \
+						range diagnostic tools. To assure the quality of your request every finalized report \
+						is reviewed by an on-call rear admiral.<br>\
+						<b>Rear Admiral's Notes:</b> \
+						[admiral_message]"
+	print_command_report(intercepttext, announce = TRUE)
 
 // Called when an emergency shuttle mobile docking port is
 // destroyed, which will only happen with admin intervention
@@ -523,4 +543,3 @@ SUBSYSTEM_DEF(shuttle)
 	for(var/obj/docking_port/mobile/M in mobile)
 		if(M.is_in_shuttle_bounds(A))
 			return TRUE
-		

code/controllers/subsystem/shuttle.dm.rej

@@ -1,42 +0,0 @@
-diff a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm	(rejected hunks)
-@@ -217,30 +217,25 @@ SUBSYSTEM_DEF(shuttle)
- 	log_game("[key_name(user)] has called the shuttle.")
- 	message_admins("[key_name_admin(user)] has called the shuttle. (<A HREF='?_src_=holder;trigger_centcom_recall=1'>TRIGGER CENTCOM RECALL</A>)")
- 
--/datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, annoyed_admiral_message)
-+/datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, admiral_message)
- 	if(emergency.mode != SHUTTLE_CALL || emergency.timer != old_timer)
- 		return
--
- 	emergency.cancel(/area/centcom)
--	msglog_admins("Shuttle has been recalled from Centcom.")
--
--	addtimer(CALLBACK(src, .proc/centcom_recall2, annoyed_admiral_message), 50)
- 
--/datum/controller/subsystem/shuttle/proc/centcom_recall2(annoyed_admiral_message)
--	if(!annoyed_admiral_message)
--		annoyed_admiral_message = pick(GLOB.annoyed_admiral_messages)
--	var/intercepttext = "<FONT size = 3><b>NanoTrasen Update</b>: Request For Shuttle.</FONT><HR>\
--						To whom it may concern:<BR><BR>\
-+	if(!admiral_message)
-+		admiral_message = pick(GLOB.admiral_messages)
-+	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>\
-+						conclusion that it does not warrant the abandonment of the station.<br>\
- 						If you do not agree with our opinion we suggest that you open a direct \
--						line with us and explain the nature of your crisis.<BR><BR>\
-+						line with us and explain the nature of your crisis.<br><br>\
- 						<i>This message has been automatically generated based upon readings from long \
- 						range diagnostic tools. To assure the quality of your request every finalized report \
--						is reviewed by an on-call rear admiral.<BR>\
-+						is reviewed by an on-call rear admiral.<br>\
- 						<b>Rear Admiral's Notes:</b> \
--						[annoyed_admiral_message]"
--	print_command_report(intercepttext, announce=TRUE)
-+						[admiral_message]"
-+	print_command_report(intercepttext, announce = TRUE)
- 
- // Called when an emergency shuttle mobile docking port is
- // destroyed, which will only happen with admin intervention

code/game/gamemodes/gang/gang_items.dm.rej

@@ -1,44 +0,0 @@
-diff a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm	(rejected hunks)
-@@ -131,7 +195,7 @@
- 	id = "pistol_ammo"
- 	cost = 10
- 	item_path = /obj/item/ammo_box/magazine/m10mm
--	
-+
- /datum/gang_item/weapon/sniper
- 	name = ".50cal Sniper Rifle"
- 	id = "sniper"
-@@ -156,8 +220,8 @@
- 	id = "uzi_ammo"
- 	cost = 40
- 	item_path = /obj/item/ammo_box/magazine/uzim9mm
--	
--	
-+
-+
- ///////////////////
- //EQUIPMENT
- ///////////////////
-@@ -171,7 +235,7 @@
- 	id = "spraycan"
- 	cost = 5
- 	item_path = /obj/item/toy/crayon/spraycan/gang
--	
-+
- /datum/gang_item/equipment/sharpener
- 	name = "Sharpener"
- 	id = "whetstone"
-@@ -305,11 +369,11 @@
- 		if(obj.density)
- 			to_chat(user, "<span class='warning'>There's not enough room here!</span>")
- 			return FALSE
--	
-+
- 	if(dominator_excessive_walls(user))
- 		to_chat(user, "span class='warning'>The <b>dominator</b> will not function here! The <b>dominator</b> requires an open space within three standard units so that walls do not interfere with the signal.</span>")
- 		return FALSE
--		
-+
- 	if(!(usrarea.type in gang.territory|gang.territory_new))
- 		to_chat(user, "<span class='warning'>The <b>dominator</b> can be spawned only on territory controlled by your gang!</span>")
- 		return FALSE

code/modules/admin/topic.dm

@@ -282,6 +282,11 @@
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds.</span>")
 		href_list["secrets"] = "check_antagonist"
 
+	else if(href_list["trigger_centcom_recall"])
+		if(!check_rights(R_ADMIN))
+			return
+
+			usr.client.trigger_centcom_recall()
 	else if(href_list["toggle_continuous"])
 		if(!check_rights(R_ADMIN))
 			return
@@ -1170,7 +1175,7 @@
 		if(!check_rights(R_ADMIN))
 			return
 
-		if(SSticker.HasRoundStarted())
+		if(SSticker.HasRoundStarted())
 			return alert(usr, "The game has already started.", null, null, null, null)
 		var/dat = {"<B>What mode do you wish to play?</B><HR>"}
 		for(var/mode in config.modes)
@@ -1184,7 +1189,7 @@
 		if(!check_rights(R_ADMIN))
 			return
 
-		if(SSticker.HasRoundStarted())
+		if(SSticker.HasRoundStarted())
 			return alert(usr, "The game has already started.", null, null, null, null)
 		if(GLOB.master_mode != "secret")
 			return alert(usr, "The game mode has to be secret!", null, null, null, null)
@@ -1199,21 +1204,21 @@
 		if(!check_rights(R_ADMIN|R_SERVER))
 			return
 
-		if (SSticker.HasRoundStarted())
+		if (SSticker.HasRoundStarted())
 			return alert(usr, "The game has already started.", null, null, null, null)
 		GLOB.master_mode = href_list["c_mode2"]
 		log_admin("[key_name(usr)] set the mode as [GLOB.master_mode].")
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] set the mode as [GLOB.master_mode].</span>")
 		to_chat(world, "<span class='adminnotice'><b>The mode is now: [GLOB.master_mode]</b></span>")
 		Game() // updates the main game menu
-		SSticker.save_mode(GLOB.master_mode)
+		SSticker.save_mode(GLOB.master_mode)
 		.(href, list("c_mode"=1))
 
 	else if(href_list["f_secret2"])
 		if(!check_rights(R_ADMIN|R_SERVER))
 			return
 
-		if(SSticker.HasRoundStarted())
+		if(SSticker.HasRoundStarted())
 			return alert(usr, "The game has already started.", null, null, null, null)
 		if(GLOB.master_mode != "secret")
 			return alert(usr, "The game mode has to be secret!", null, null, null, null)
@@ -1788,18 +1793,18 @@
 		if(!check_rights(R_ADMIN))
 			return
 
-		var/mob/M = locate(href_list["languagemenu"]) in GLOB.mob_list
+		var/mob/M = locate(href_list["languagemenu"]) in GLOB.mob_list
-		if(!ismob(M))
+		if(!ismob(M))
-			to_chat(usr, "This can only be used on instances of type /mob.")
+			to_chat(usr, "This can only be used on instances of type /mob.")
 			return
-		var/datum/language_holder/H = M.get_language_holder()
+		var/datum/language_holder/H = M.get_language_holder()
-		H.open_language_menu(usr)
+		H.open_language_menu(usr)
 
 	else if(href_list["traitor"])
 		if(!check_rights(R_ADMIN))
 			return
 
-		if(!SSticker.HasRoundStarted())
+		if(!SSticker.HasRoundStarted())
 			alert("The game hasn't started yet!")
 			return
 
@@ -2150,7 +2155,7 @@
 	else if(href_list["kick_all_from_lobby"])
 		if(!check_rights(R_ADMIN))
 			return
-		if(SSticker.IsRoundInProgress())
+		if(SSticker.IsRoundInProgress())
 			var/afkonly = text2num(href_list["afkonly"])
 			if(alert("Are you sure you want to kick all [afkonly ? "AFK" : ""] clients from the lobby??","Message","Yes","Cancel") != "Yes")
 				to_chat(usr, "Kick clients from lobby aborted")
@@ -2231,20 +2236,20 @@
 		if(href_list["viewruntime_backto"])
 			error_viewer.show_to(owner, locate(href_list["viewruntime_backto"]), href_list["viewruntime_linear"])
 		else
-			error_viewer.show_to(owner, null, href_list["viewruntime_linear"])
+			error_viewer.show_to(owner, null, href_list["viewruntime_linear"])
-	else if(href_list["showrelatedacc"])
+	else if(href_list["showrelatedacc"])
-		var/client/C = locate(href_list["client"]) in GLOB.clients
+		var/client/C = locate(href_list["client"]) in GLOB.clients
-		var/list/thing_to_check
+		var/list/thing_to_check
-		if(href_list["showrelatedacc"] == "cid")
+		if(href_list["showrelatedacc"] == "cid")
-			thing_to_check = C.related_accounts_cid
+			thing_to_check = C.related_accounts_cid
-		else
+		else
-			thing_to_check = C.related_accounts_ip
+			thing_to_check = C.related_accounts_ip
-		thing_to_check = splittext(thing_to_check, ", ")
+		thing_to_check = splittext(thing_to_check, ", ")
-
+
-
+
-		var/dat = "Related accounts by [uppertext(href_list["showrelatedacc"])]:<br>"
+		var/dat = "Related accounts by [uppertext(href_list["showrelatedacc"])]:<br>"
-		for(var/thing in thing_to_check)
+		for(var/thing in thing_to_check)
-			dat += "[thing]<br>"
+			dat += "[thing]<br>"
-
+
-		usr << browse(dat, "size=420x300")
+		usr << browse(dat, "size=420x300")
-
+

code/modules/admin/topic.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm	(rejected hunks)
-@@ -285,7 +285,7 @@
- 		if(!check_rights(R_ADMIN))
- 			return
- 
--		trigger_centcom_recall()
-+		usr.client.trigger_centcom_recall()
- 
- 	else if(href_list["toggle_continuous"])
- 		if(!check_rights(R_ADMIN))