Removes the mess added with recalling with a message

code/__HELPERS/unsorted.dm

@@ -723,7 +723,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	//Irregular objects
 	var/icon/AMicon = icon(AM.icon, AM.icon_state)
 	var/icon/AMiconheight = AMicon.Height()
-	var/icon/AMiconwidth = AMicon.Width()	
+	var/icon/AMiconwidth = AMicon.Width()
 	if(AMiconheight != world.icon_size || AMiconwidth != world.icon_size)
 		pixel_x_offset += ((AMicon.Width()/world.icon_size)-1)*(world.icon_size*0.5)
 		pixel_y_offset += ((AMicon.Height()/world.icon_size)-1)*(world.icon_size*0.5)

code/__HELPERS/unsorted.dm.rej

@@ -0,0 +1,29 @@
+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.rej

@@ -0,0 +1,8 @@
+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.rej

@@ -0,0 +1,42 @@
+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/modules/admin/topic.dm.rej

@@ -0,0 +1,10 @@
+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))

code/modules/admin/verbs/randomverbs.dm

@@ -1194,3 +1194,16 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	message_admins(msg)
 	admin_ticket_log(target, msg)
 	log_admin("[key_name(usr)] punished [key_name(target)] with [punishment].")
+
+
+/client/proc/trigger_centcom_recall()
+	if(!holder)
+		return
+	var/message = pick(GLOB.admiral_messages)
+	message = input("Enter message from the on-call admiral to be put in the recall report.", "Admiral Message", message) as text|null
+
+	if(!message)
+		return
+
+	message_admins("[key_name_admin(usr)] triggered a Centcom recall, with the admiral message of: [message]")
+	log_game("[key_name(usr)] triggered a Centcom recall, with the message of: [message]")