Merge branch 'master' into instrument-tgui-n-optimization

code/controllers/configuration.dm

@@ -61,7 +61,6 @@
 	var/usewhitelist = 0
 	var/mods_are_mentors = 0
 	var/load_jobs_from_txt = 0
-	var/ToRban = 0
 	var/automute_on = 0					//enables automuting/spam prevention
 	var/jobs_have_minimal_access = 0	//determines whether jobs use minimal access or expanded access.
 	var/round_abandon_penalty_period = 30 MINUTES // Time from round start during which ghosting out is penalized
@@ -578,9 +577,6 @@
 				if("humans_need_surnames")
 					humans_need_surnames = 1
 
-				if("tor_ban")
-					ToRban = 1
-
 				if("automute_on")
 					automute_on = 1
 

code/controllers/subsystem.dm

@@ -35,7 +35,7 @@
 
 	var/static/list/failure_strikes //How many times we suspect a subsystem type has crashed the MC, 3 strikes and you're out!
 
-	var/offline_implications = "None" // What are the implications of this SS being offlined?
+	var/offline_implications = "None. No immediate action is needed." // What are the implications of this SS being offlined?
 
 //Do not override
 ///datum/controller/subsystem/New()

code/controllers/subsystem/alarm.dm

@@ -1,31 +1,31 @@
-SUBSYSTEM_DEF(alarms)
-	name = "Alarms"
-	init_order = INIT_ORDER_ALARMS // 2
-	offline_implications = "Alarms (Power, camera, fire, etc) will no longer be checked. No immediate action is needed."
-	var/datum/alarm_handler/atmosphere/atmosphere_alarm = new()
-	var/datum/alarm_handler/burglar/burglar_alarm = new()
-	var/datum/alarm_handler/camera/camera_alarm = new()
-	var/datum/alarm_handler/fire/fire_alarm = new()
-	var/datum/alarm_handler/motion/motion_alarm = new()
-	var/datum/alarm_handler/power/power_alarm = new()
-	var/list/datum/alarm/all_handlers
+SUBSYSTEM_DEF(alarm)
+	name = "Alarm"
+	flags = SS_NO_INIT | SS_NO_FIRE
+	var/list/alarms = list("Motion" = list(), "Fire" = list(), "Atmosphere" = list(), "Power" = list(), "Camera" = list(), "Burglar" = list())
 
-/datum/controller/subsystem/alarms/Initialize(start_timeofday)
-	all_handlers = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm)
-	return ..()
+/datum/controller/subsystem/alarm/proc/triggerAlarm(class, area/A, list/O, obj/alarmsource)
+	var/list/L = alarms[class]
+	for(var/I in L)
+		if(I == A.name)
+			var/list/alarm = L[I]
+			var/list/sources = alarm[3]
+			if(!(alarmsource.UID() in sources))
+				sources += alarmsource.UID()
+			return TRUE
+	L[A.name] = list(get_area_name(A, TRUE), O, list(alarmsource.UID()))
+	SEND_SIGNAL(SSalarm, COMSIG_TRIGGERED_ALARM, class, A, O, alarmsource)
+	return TRUE
 
-/datum/controller/subsystem/alarms/fire()
-	for(var/datum/alarm_handler/AH in all_handlers)
-		AH.process()
+/datum/controller/subsystem/alarm/proc/cancelAlarm(class, area/A, obj/origin)
+	var/list/L = alarms[class]
+	var/cleared = FALSE
+	for(var/I in L)
+		if(I == A.name)
+			var/list/alarm = L[I]
+			var/list/srcs  = alarm[3]
+			srcs -= origin.UID()
+			if(!length(srcs))
+				cleared = TRUE
+				L -= I
 
-/datum/controller/subsystem/alarms/proc/active_alarms()
-	var/list/all_alarms = new ()
-	for(var/datum/alarm_handler/AH in all_handlers)
-		var/list/alarms = AH.alarms
-		all_alarms += alarms
-
-	return all_alarms
-
-/datum/controller/subsystem/alarms/proc/number_of_active_alarms()
-	var/list/alarms = active_alarms()
-	return alarms.len
+	SEND_SIGNAL(SSalarm, COMSIG_CANCELLED_ALARM, class, A, origin, cleared)

code/controllers/subsystem/chat.dm

@@ -1,67 +0,0 @@
-SUBSYSTEM_DEF(chat)
-	name = "Chat"
-	flags = SS_TICKER|SS_NO_INIT
-	wait = 1
-	priority = FIRE_PRIORITY_CHAT
-	init_order = INIT_ORDER_CHAT
-	offline_implications = "Chat messages will no longer be cleanly queued. No immediate action is needed."
-
-	var/list/payload = list()
-
-
-/datum/controller/subsystem/chat/fire()
-	for(var/i in payload)
-		var/client/C = i
-		if(C)
-			C << output(payload[C], "browseroutput:output")
-		payload -= C
-
-		if(MC_TICK_CHECK)
-			return
-
-
-/datum/controller/subsystem/chat/proc/queue(target, message, flag)
-	if(!target || !message)
-		return
-
-	if(!istext(message))
-		stack_trace("to_chat called with invalid input type")
-		return
-
-	if(target == world)
-		target = GLOB.clients
-
-	//Some macros remain in the string even after parsing and fuck up the eventual output
-	message = replacetext(message, "\improper", "")
-	message = replacetext(message, "\proper", "")
-	message += "<br>"
-
-
-	//url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript.
-	//Do the double-encoding here to save nanoseconds
-	var/twiceEncoded = url_encode(url_encode(message))
-
-	if(islist(target))
-		for(var/I in target)
-			var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
-
-			if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file.
-				continue
-
-			if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue
-				C.chatOutput.messageQueue += message
-				continue
-
-			payload[C] += twiceEncoded
-
-	else
-		var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible
-
-		if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file.
-			return
-
-		if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue
-			C.chatOutput.messageQueue += message
-			return
-
-		payload[C] += twiceEncoded

code/controllers/subsystem/garbage.dm

@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(garbage)
 	wait = 2 SECONDS
 	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
-	init_order = INIT_ORDER_GARBAGE
+	init_order = INIT_ORDER_GARBAGE // Why does this have an init order if it has SS_NO_INIT?
 	offline_implications = "Garbage collection is no longer functional, and objects will not be qdel'd. Immediate server restart recommended."
 
 	var/list/collection_timeout = list(2 MINUTES, 10 SECONDS)	// deciseconds to wait before moving something up in the queue to the next level

code/controllers/subsystem/ghost_spawns.dm

@@ -0,0 +1,275 @@
+SUBSYSTEM_DEF(ghost_spawns)
+	name = "Ghost Spawns"
+	init_order = INIT_ORDER_EVENTS
+	flags = SS_BACKGROUND
+	wait = 1 SECONDS
+	runlevels = RUNLEVEL_GAME
+	offline_implications = "Ghosts will no longer be able to respawn as event mobs (Blob, etc..). Shuttle call recommended."
+
+	/// List of polls currently ongoing, to be checked on next fire()
+	var/list/datum/candidate_poll/currently_polling
+	/// Whether there are active polls or not
+	var/polls_active = FALSE
+	/// Number of polls performed since the start
+	var/total_polls = 0
+	/// The poll that's closest to finishing
+	var/datum/candidate_poll/next_poll_to_finish
+
+/datum/controller/subsystem/ghost_spawns/fire()
+	if(!polls_active)
+		return
+	if(!currently_polling) // if polls_active is TRUE then this shouldn't happen, but still..
+		currently_polling = list()
+
+	for(var/poll in currently_polling)
+		var/datum/candidate_poll/P = poll
+		if(P.time_left() <= 0)
+			polling_finished(P)
+
+/**
+  * Polls for candidates with a question and a preview of the role
+  *
+  * This proc replaces /proc/pollCandidates.
+  * Should NEVER be used in a proc that has waitfor set to FALSE/0 (due to #define UNTIL)
+  * Arguments:
+  * * question - The question to ask to potential candidates
+  * * role - The role to poll for. Should be a ROLE_x enum. If set, potential candidates who aren't eligible will be ignored
+  * * antag_age_check - Whether to filter out potential candidates who don't have an old enough account
+  * * poll_time - How long to poll for in deciseconds
+  * * ignore_respawnability - Whether to ignore the player's respawnability
+  * * min_hours - The amount of hours needed for a potential candidate to be eligible
+  * * flash_window - Whether the poll should flash a potential candidate's game window
+  * * check_antaghud - Whether to filter out potential candidates who enabled AntagHUD
+  * * source - The atom, atom prototype, icon or mutable appearance to display as an icon in the alert
+  */
+/datum/controller/subsystem/ghost_spawns/proc/poll_candidates(question = "Would you like to play a special role?", role, antag_age_check = FALSE, poll_time = 30 SECONDS, ignore_respawnability = FALSE, min_hours = 0, flash_window = TRUE, check_antaghud = TRUE, source)
+	log_debug("Polling candidates [role ? "for [get_roletext(role)]" : "\"[question]\""] for [poll_time / 10] seconds")
+
+	// Start firing
+	polls_active = TRUE
+	total_polls++
+
+	var/datum/candidate_poll/P = new(role, question, poll_time)
+	LAZYADD(currently_polling, P)
+
+	// We're the poll closest to completion
+	if(!next_poll_to_finish || poll_time < next_poll_to_finish.time_left())
+		next_poll_to_finish = P
+
+	var/category = "[P.hash]_notify_action"
+
+	for(var/mob/dead/observer/M in (ignore_respawnability ? GLOB.player_list : GLOB.respawnable_list))
+		if(!is_eligible(M, role, antag_age_check, role, min_hours, check_antaghud))
+			continue
+
+		SEND_SOUND(M, 'sound/misc/notice2.ogg')
+		if(flash_window)
+			window_flash(M.client)
+
+		// If we somehow send two polls for the same mob type, but with a duration on the second one shorter than the time left on the first one,
+		// we need to keep the first one's timeout rather than use the shorter one
+		var/obj/screen/alert/notify_action/current_alert = LAZYACCESS(M.alerts, category)
+		var/alert_time = poll_time
+		var/alert_poll = P
+		if(current_alert && current_alert.timeout > (world.time + poll_time - world.tick_lag))
+			alert_time = current_alert.timeout - world.time + world.tick_lag
+			alert_poll = current_alert.poll
+
+		// Send them an on-screen alert
+		var/obj/screen/alert/notify_action/A = M.throw_alert(category, /obj/screen/alert/notify_action, timeout_override = alert_time, no_anim = TRUE)
+		if(!A)
+			continue
+
+		A.icon = ui_style2icon(M.client?.prefs.UI_style)
+		A.name = "Looking for candidates"
+		A.desc = "[question]\n\n(expires in [poll_time / 10] seconds)"
+		A.show_time_left = TRUE
+		A.poll = alert_poll
+
+		// Sign up inheritance and stacking
+		var/inherited_sign_up = FALSE
+		var/num_stack = 1
+		for(var/existing_poll in currently_polling)
+			var/datum/candidate_poll/P2 = existing_poll
+			if(P != P2 && P.hash == P2.hash)
+				// If there's already a poll for an identical mob type ongoing and the client is signed up for it, sign them up for this one
+				if(!inherited_sign_up && (M in P2.signed_up) && P.sign_up(M, TRUE))
+					A.display_signed_up()
+					inherited_sign_up = TRUE
+				// This number is used to display the number of polls the alert regroups
+				num_stack++
+		if(num_stack > 1)
+			A.display_stacks(num_stack)
+
+		// Image to display
+		var/image/I
+		if(source)
+			if(!ispath(source))
+				var/atom/S = source
+				var/old_layer = S.layer
+				var/old_plane = S.plane
+
+				S.layer = FLOAT_LAYER
+				S.plane = FLOAT_PLANE
+				A.overlays += S
+				S.layer = old_layer
+				S.plane = old_plane
+			else
+				I = image(source, layer = FLOAT_LAYER, dir = SOUTH)
+		else
+			// Just use a generic image
+			I = image('icons/effects/effects.dmi', icon_state = "static", layer = FLOAT_LAYER, dir = SOUTH)
+
+		if(I)
+			I.layer = FLOAT_LAYER
+			I.plane = FLOAT_PLANE
+			A.overlays += I
+
+		// Chat message
+		var/act_jump = ""
+		if(isatom(source))
+			act_jump = "<a href='?src=[M.UID()];jump=\ref[source]'>\[Teleport]</a>"
+		var/act_signup = "<a href='?src=[A.UID()];signup=1'>\[Sign Up]</a>"
+		to_chat(M, "<big><span class='boldnotice'>Now looking for candidates [role ? "to play as \an [get_roletext(role)]" : "\"[question]\""]. [act_jump] [act_signup]</span></big>")
+
+		// Start processing it so it updates visually the timer
+		START_PROCESSING(SSprocessing, A)
+		A.process()
+
+	// Sleep until the time is up
+	UNTIL(P.finished)
+	return P.signed_up
+
+/**
+  * Returns whether an observer is eligible to be an event mob
+  *
+  * Arguments:
+  * * M - The mob to check eligibility
+  * * role - The role to check eligibility for. Checks 1. the client has enabled the role 2. the account's age for this role if antag_age_check is TRUE
+  * * antag_age_check - Whether to check the account's age or not for the given role.
+  * * role_text - The role's clean text. Used for checking job bans to determine eligibility
+  * * min_hours - The amount of minimum hours the client needs before being eligible
+  * * check_antaghud - Whether to consider a client who enabled AntagHUD ineligible or not
+  */
+/datum/controller/subsystem/ghost_spawns/proc/is_eligible(mob/M, role, antag_age_check, role_text, min_hours, check_antaghud)
+	. = FALSE
+	if(!M.key || !M.client)
+		return
+	if(role)
+		if(!(role in M.client.prefs.be_special))
+			return
+		if(antag_age_check)
+			if(!player_old_enough_antag(M.client, role))
+				return
+	if(role_text)
+		if(jobban_isbanned(M, role_text) || jobban_isbanned(M, "Syndicate"))
+			return
+	if(config.use_exp_restrictions && min_hours)
+		if(M.client.get_exp_type_num(EXP_TYPE_LIVING) < min_hours * 60)
+			return
+	if(check_antaghud && cannotPossess(M))
+		return
+
+	return TRUE
+
+/**
+  * Called by the subsystem when a poll's timer runs out
+  *
+  * Can be called manually to finish a poll prematurely
+  * Arguments:
+  * * P - The poll to finish
+  */
+/datum/controller/subsystem/ghost_spawns/proc/polling_finished(datum/candidate_poll/P)
+	// Trim players who aren't eligible anymore
+	var/len_pre_trim = length(P.signed_up)
+	P.trim_candidates()
+	log_debug("Candidate poll [P.role ? "for [get_roletext(P.role)]" : "\"[P.question]\""] finished. [len_pre_trim] players signed up, [length(P.signed_up)] after trimming")
+
+	P.finished = TRUE
+	currently_polling -= P
+
+	// Determine which is the next poll closest the completion or "disable" firing if there's none
+	if(!length(currently_polling))
+		polls_active = FALSE
+		next_poll_to_finish = null
+	else if(P == next_poll_to_finish)
+		next_poll_to_finish = null
+		for(var/poll in currently_polling)
+			var/datum/candidate_poll/P2 = poll
+			if(!next_poll_to_finish || P2.time_left() < next_poll_to_finish.time_left())
+				next_poll_to_finish = P2
+
+/datum/controller/subsystem/ghost_spawns/stat_entry(msg)
+	msg += "Active: [length(currently_polling)] | Total: [total_polls]"
+	if(next_poll_to_finish)
+		msg += " | Next: [DisplayTimeText(next_poll_to_finish.time_left())] ([length(next_poll_to_finish.signed_up)] candidates)"
+	..(msg)
+
+// The datum that describes one instance of candidate polling
+/datum/candidate_poll
+	var/role // The role the poll is for
+	var/question // The question asked to observers
+	var/duration // The duration of the poll
+	var/list/mob/dead/observer/signed_up // The players who signed up to this poll
+	var/time_started // The world.time at which the poll was created
+	var/finished = FALSE // Whether the polling is finished
+	var/hash // Used to categorize in the alerts system
+
+/datum/candidate_poll/New(polled_role, polled_question, poll_duration)
+	role = polled_role
+	question = polled_question
+	duration = poll_duration
+	signed_up = list()
+	time_started = world.time
+	hash = copytext(md5("[question]_[role ? role : "0"]"), 1, 7)
+	return ..()
+
+/**
+  * Attempts to sign a (controlled) mob up
+  *
+  * Will fail if the mob is already signed up or the poll's timer ran out.
+  * Does not check for eligibility
+  * Arguments:
+  * * M - The (controlled) mob to sign up
+  * * silent - Whether no messages should appear or not. If not TRUE, signing up to this poll will also sign the mob up for identical polls
+  */
+/datum/candidate_poll/proc/sign_up(mob/dead/observer/M, silent = FALSE)
+	. = FALSE
+	if(!istype(M) || !M.key || !M.client)
+		return
+	if(M in signed_up)
+		if(!silent)
+			to_chat(M, "<span class='warning'>You have already signed up for this!</span>")
+		return
+	if(time_left() <= 0)
+		if(!silent)
+			to_chat(M, "<span class='danger'>Sorry, you were too late for the consideration!</span>")
+			SEND_SOUND(M, 'sound/machines/buzz-sigh.ogg')
+		return
+
+	signed_up += M
+	if(!silent)
+		to_chat(M, "<span class='notice'>You have signed up for this role! A candidate will be picked randomly soon..</span>")
+		// Sign them up for any other polls with the same mob type
+		for(var/existing_poll in SSghost_spawns.currently_polling)
+			var/datum/candidate_poll/P = existing_poll
+			if(src != P && hash == P.hash && !(M in P.signed_up))
+				P.sign_up(M, TRUE)
+
+	return TRUE
+
+/**
+  * Deletes any candidates who may have disconnected from the list
+  */
+/datum/candidate_poll/proc/trim_candidates()
+	listclearnulls(signed_up)
+	for(var/mob in signed_up)
+		var/mob/M = mob
+		if(!M.key || !M.client)
+			signed_up -= M
+
+/**
+  * Returns the time left for a poll
+  */
+/datum/candidate_poll/proc/time_left()
+	return duration - (world.time - time_started)

code/controllers/subsystem/jobs.dm

@@ -27,7 +27,7 @@ SUBSYSTEM_DEF(jobs)
 /datum/controller/subsystem/jobs/fire()
 	if(!config.sql_enabled || !config.use_exp_tracking)
 		return
-	update_exp(5,0)
+	INVOKE_ASYNC(GLOBAL_PROC, /.proc/update_exp, 5, 0)
 
 /datum/controller/subsystem/jobs/proc/SetupOccupations(var/list/faction = list("Station"))
 	occupations = list()
@@ -644,6 +644,27 @@ SUBSYSTEM_DEF(jobs)
 			oldjobdatum.current_positions--
 			newjobdatum.current_positions++
 
+/datum/controller/subsystem/jobs/proc/notify_dept_head(jobtitle, antext)
+	// Used to notify the department head of jobtitle X that their employee was brigged, demoted or terminated
+	if(!jobtitle || !antext)
+		return
+	var/datum/job/tgt_job = GetJob(jobtitle)
+	if(!tgt_job)
+		return
+	if(!tgt_job.department_head[1])
+		return
+	var/boss_title = tgt_job.department_head[1]
+	var/obj/item/pda/target_pda
+	for(var/obj/item/pda/check_pda in GLOB.PDAs)
+		if(check_pda.ownrank == boss_title)
+			target_pda = check_pda
+			break
+	if(!target_pda)
+		return
+	var/datum/data/pda/app/messenger/PM = target_pda.find_program(/datum/data/pda/app/messenger)
+	if(PM && PM.can_receive())
+		PM.notify("<b>Automated Notification: </b>\"[antext]\" (Unable to Reply)")
+
 
 /datum/controller/subsystem/jobs/proc/fetch_transfer_record_html(var/centcom)
 	var/record_html = "<TABLE border=\"1\">"

code/controllers/subsystem/nano_mob_hunter.dm

@@ -2,6 +2,7 @@ SUBSYSTEM_DEF(mob_hunt)
 	name = "Nano-Mob Hunter GO Server"
 	init_order = INIT_ORDER_NANOMOB
 	priority = FIRE_PRIORITY_NANOMOB // Low priority, no need for MC_TICK_CHECK due to extremely low performance impact.
+	flags = SS_NO_INIT
 	offline_implications = "Nano-Mob Hunter will no longer spawn mobs. No immediate action is needed."
 	var/max_normal_spawns = 15		//change this to adjust the number of normal spawns that can exist at one time. trapped spawns (from traitors) don't count towards this
 	var/list/normal_spawns = list()

code/controllers/subsystem/processing/dcs.dm

@@ -3,6 +3,8 @@ PROCESSING_SUBSYSTEM_DEF(dcs)
 	flags = SS_NO_INIT
 
 	var/list/elements_by_type = list()
+	// Update this if you add in components which actually use this as a processor
+	offline_implications = "This SS doesnt actually process anything yet. No immediate action is needed."
 
 /datum/controller/subsystem/processing/dcs/Recover()
 	comp_lookup = SSdcs.comp_lookup

code/controllers/subsystem/processing/fastprocess.dm

@@ -4,3 +4,4 @@ PROCESSING_SUBSYSTEM_DEF(fastprocess)
 	name = "Fast Processing"
 	wait = 2
 	stat_tag = "FP"
+	offline_implications = "Objects using the 'Fast Processing' processor will no longer process. Shuttle call recommended."

code/controllers/subsystem/processing/obj.dm

@@ -3,3 +3,4 @@ PROCESSING_SUBSYSTEM_DEF(obj)
 	priority = FIRE_PRIORITY_OBJ
 	flags = SS_NO_INIT
 	wait = 20
+	offline_implications = "Objects using the 'Objects' processor will no longer process. Shuttle call recommended."

code/controllers/subsystem/processing/processing.dm

@@ -9,6 +9,7 @@ SUBSYSTEM_DEF(processing)
 	var/stat_tag = "P" //Used for logging
 	var/list/processing = list()
 	var/list/currentrun = list()
+	offline_implications = "Objects using the default processor will no longer process. Shuttle call recommended."
 
 /datum/controller/subsystem/processing/stat_entry()
 	..("[stat_tag]:[processing.len]")

code/controllers/subsystem/shuttles.dm

@@ -14,9 +14,9 @@ SUBSYSTEM_DEF(shuttle)
 		//emergency shuttle stuff
 	var/obj/docking_port/mobile/emergency/emergency
 	var/obj/docking_port/mobile/emergency/backup/backup_shuttle
-	var/emergencyCallTime = 6000	//time taken for emergency shuttle to reach the station when called (in deciseconds)
-	var/emergencyDockTime = 1800	//time taken for emergency shuttle to leave again once it has docked (in deciseconds)
-	var/emergencyEscapeTime = 1200	//time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds)
+	var/emergencyCallTime = SHUTTLE_CALLTIME	//time taken for emergency shuttle to reach the station when called (in deciseconds)
+	var/emergencyDockTime = SHUTTLE_DOCKTIME	//time taken for emergency shuttle to leave again once it has docked (in deciseconds)
+	var/emergencyEscapeTime = SHUTTLE_ESCAPETIME	//time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds)
 	var/emergency_sec_level_time = 0 // time sec level was last raised to red or higher
 	var/area/emergencyLastCallLoc
 	var/emergencyNoEscape

code/controllers/subsystem/ticker.dm

@@ -61,7 +61,7 @@ SUBSYSTEM_DEF(ticker)
 		if(GAME_STATE_STARTUP)
 			// This is ran as soon as the MC starts firing, and should only run ONCE, unless startup fails
 			round_start_time = world.time + (config.pregame_timestart * 10)
-			to_chat(world, "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>")
+			to_chat(world, "<B><span class='darkmblue'>Welcome to the pre-game lobby!</span></B>")
 			to_chat(world, "Please, setup your character and select ready. Game will start in [config.pregame_timestart] seconds")
 			current_state = GAME_STATE_PREGAME
 			fire() // TG says this is a good idea
@@ -217,11 +217,11 @@ SUBSYSTEM_DEF(ticker)
 			for(var/obj/effect/landmark/spacepod/random/R in L)
 				qdel(R)
 
-		to_chat(world, "<FONT color='blue'><B>Enjoy the game!</B></FONT>")
+		to_chat(world, "<span class='darkmblue'><B>Enjoy the game!</B></span>")
 		world << sound('sound/AI/welcome.ogg')// Skie
 
 		if(SSholiday.holidays)
-			to_chat(world, "<font color='blue'>and...</font>")
+			to_chat(world, "<span class='darkmblue'>and...</span>")
 			for(var/holidayname in SSholiday.holidays)
 				var/datum/holiday/holiday = SSholiday.holidays[holidayname]
 				to_chat(world, "<h4>[holiday.greet()]</h4>")

code/controllers/subsystem/tickets/mentor_tickets.dm

@@ -6,16 +6,23 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets
 
 /datum/controller/subsystem/tickets/mentor_tickets
 	name = "Mentor Tickets"
+	offline_implications = "Mentor tickets will no longer be marked as stale. No immediate action is needed."
 	ticket_system_name = "Mentor Tickets"
 	ticket_name = "Mentor Ticket"
 	span_class = "mentorhelp"
+	other_ticket_name = "Admin"
+	other_ticket_permission = R_ADMIN
 	close_rights = R_MENTOR | R_ADMIN
-
-/datum/controller/subsystem/tickets/mentor_tickets/message_staff(var/msg)
-	message_mentorTicket(msg)
+	rights_needed = R_MENTOR | R_ADMIN | R_MOD
 
 /datum/controller/subsystem/tickets/mentor_tickets/Initialize()
 	close_messages = list("<font color='red' size='3'><b>- [ticket_name] Closed -</b></font>",
 				"<span class='boldmessage'>Please try to be as descriptive as possible in mentor helps. Mentors do not know the full situation you're in and need more information to give you a helpful response.</span>",
 				"<span class='[span_class]'>Your [ticket_name] has now been closed.</span>")
 	return ..()
+
+/datum/controller/subsystem/tickets/mentor_tickets/message_staff(msg)
+	message_mentorTicket(msg)
+
+/datum/controller/subsystem/tickets/mentor_tickets/create_other_system_ticket(datum/ticket/T)
+	SStickets.newTicket(T.clientName, T.content, T.title)

code/controllers/subsystem/tickets/tickets.dm

@@ -12,17 +12,23 @@
 
 SUBSYSTEM_DEF(tickets)
 	name = "Admin Tickets"
+	init_order = INIT_ORDER_TICKETS
+	wait = 300
+	priority = FIRE_PRIORITY_TICKETS
+	offline_implications = "Admin tickets will no longer be marked as stale. No immediate action is needed."
+	flags = SS_BACKGROUND
+
 	var/span_class = "adminticket"
 	var/ticket_system_name = "Admin Tickets"
 	var/ticket_name = "Admin Ticket"
 	var/close_rights = R_ADMIN
+	var/rights_needed = R_ADMIN | R_MOD
+
+	/// The name of the other ticket type to convert to
+	var/other_ticket_name = "Mentor"
+	/// Which permission to look for when seeing if there is staff available for the other ticket type
+	var/other_ticket_permission = R_MENTOR
 	var/list/close_messages
-	init_order = INIT_ORDER_TICKETS
-	wait = 300
-	priority = FIRE_PRIORITY_TICKETS
-
-	flags = SS_BACKGROUND
-
 	var/list/allTickets = list()	//make it here because someone might ahelp before the system has initialized
 
 	var/ticketCounter = 1
@@ -113,9 +119,37 @@ SUBSYSTEM_DEF(tickets)
 		to_chat_safe(returnClient(N), "<span class='[span_class]'>Your [ticket_name] has now been resolved.</span>")
 		return TRUE
 
+/datum/controller/subsystem/tickets/proc/convert_to_other_ticket(ticketId)
+	if(!check_rights(rights_needed))
+		return
+	if(alert("Are you sure to convert this ticket to an '[other_ticket_name]' ticket?",,"Yes","No") != "Yes")
+		return
+	if(!other_ticket_system_staff_check())
+		return
+	var/datum/ticket/T = allTickets[ticketId]
+	convert_ticket(T)
+
+/datum/controller/subsystem/tickets/proc/other_ticket_system_staff_check()
+	var/list/staff = staff_countup(other_ticket_permission)
+	if(!staff[1])
+		if(alert("No active staff online to answer the ticket. Are you sure you want to convert the ticket?",, "No", "Yes") != "Yes")
+			return FALSE
+	return TRUE
+
+/datum/controller/subsystem/tickets/proc/convert_ticket(datum/ticket/T)
+	T.ticketState = TICKET_CLOSED
+	var/client/C = usr.client
+	to_chat_safe(T.clientName, list("<span class='[span_class]'>[key_name_hidden(C)] has converted your ticket to a [other_ticket_name] ticket.</span>",\
+									"<span class='[span_class]'>Be sure to use the correct type of help next time!</span>"))
+	message_staff("<span class='[span_class]'>[C] has converted ticket number [T.ticketNum] to a [other_ticket_name] ticket.</span>")
+	log_game("[C] has converted ticket number [T.ticketNum] to a [other_ticket_name] ticket.")
+	create_other_system_ticket(T)
+
+/datum/controller/subsystem/tickets/proc/create_other_system_ticket(datum/ticket/T)
+	SSmentor_tickets.newTicket(T.clientName, T.content, T.title)
 
 /datum/controller/subsystem/tickets/proc/autoRespond(N)
-	if(!check_rights(R_ADMIN|R_MOD))
+	if(!check_rights(rights_needed))
 		return
 
 	var/datum/ticket/T = allTickets[N]
@@ -130,6 +164,7 @@ SUBSYSTEM_DEF(tickets)
 		"Already Resolved" = "The problem has been resolved already.",
 		"Mentorhelp" = "Please redirect your question to Mentorhelp, as they are better experienced with these types of questions.",
 		"Happens Again" = "Thanks, let us know if it continues to happen.",
+		"Github Issue Report" = "To report a bug, please go to our <a href='[config.githuburl]'>Github page</a>. Then go to 'Issues'. Then 'New Issue'. Then fill out the report form. If the report would reveal current-round information, file it after the round ends.",
 		"Clear Cache" = "To fix a blank screen, go to the 'Special Verbs' tab and press 'Reload UI Resources'. If that fails, clear your BYOND cache (instructions provided with 'Reload UI Resources'). If that still fails, please adminhelp again, stating you have already done the following." ,
 		"IC Issue" = "This is an In Character (IC) issue and will not be handled by admins. You could speak to Security, Internal Affairs, a Departmental Head, Nanotrasen Representetive, or any other relevant authority currently on station.",
 		"Reject" = "Reject",
@@ -156,14 +191,17 @@ SUBSYSTEM_DEF(tickets)
 			resolveTicket(N)
 			message_staff("[C] has auto responded to [T.clientName]\'s adminhelp with:<span class='adminticketalt'> [message_key] </span>")
 			log_game("[C] has auto responded to [T.clientName]\'s adminhelp with: [response_phrases[message_key]]")
+		if("Mentorhelp")
+			convert_ticket(T)
 		else
 			var/msg_sound = sound('sound/effects/adminhelp.ogg')
 			SEND_SOUND(returnClient(N), msg_sound)
-			to_chat(returnClient(N), "<span class='[span_class]'>[key_name_hidden(C)] is autoresponding with: <span/> <span class='adminticketalt'>[response_phrases[message_key]]</span>")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key]
+			to_chat_safe(returnClient(N), "<span class='[span_class]'>[key_name_hidden(C)] is autoresponding with: <span/> <span class='adminticketalt'>[response_phrases[message_key]]</span>")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key]
 			message_staff("[C] has auto responded to [T.clientName]\'s adminhelp with:<span class='adminticketalt'> [message_key] </span>") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key
 			T.lastStaffResponse = "Autoresponse: [message_key]"
 			resolveTicket(N)
 			log_game("[C] has auto responded to [T.clientName]\'s adminhelp with: [response_phrases[message_key]]")
+
 //Set ticket state with key N to closed
 /datum/controller/subsystem/tickets/proc/closeTicket(N)
 	var/datum/ticket/T = allTickets[N]
@@ -351,7 +389,7 @@ UI STUFF
 			dat += "<tr><td>[T.content[i]]</td></tr>"
 
 	dat += "</table><br /><br />"
-	dat += "<a href='?src=[UID()];detailreopen=[T.ticketNum]'>Re-Open</a>[check_rights(R_ADMIN|R_MOD, 0) ? "<a href='?src=[UID()];autorespond=[T.ticketNum]'>Auto</a>": ""]<a href='?src=[UID()];detailresolve=[T.ticketNum]'>Resolve</a><br /><br />"
+	dat += "<a href='?src=[UID()];detailreopen=[T.ticketNum]'>Re-Open</a>[check_rights(rights_needed, 0) ? "<a href='?src=[UID()];autorespond=[T.ticketNum]'>Auto</a>": ""]<a href='?src=[UID()];detailresolve=[T.ticketNum]'>Resolve</a><br /><br />"
 
 	if(!T.staffAssigned)
 		dat += "No staff member assigned to this [ticket_name] - <a href='?src=[UID()];assignstaff=[T.ticketNum]'>Take Ticket</a><br />"
@@ -366,6 +404,7 @@ UI STUFF
 	dat += "<br /><br />"
 
 	dat += "<a href='?src=[UID()];detailclose=[T.ticketNum]'>Close Ticket</a>"
+	dat += "<a href='?src=[UID()];convert_ticket=[T.ticketNum]'>Convert Ticket</a>"
 
 	var/datum/browser/popup = new(user, "[ticket_system_name]detail", "[ticket_system_name] #[T.ticketNum]", 1000, 600)
 	popup.set_content(dat)
@@ -448,7 +487,6 @@ UI STUFF
 		if(closeTicket(indexNum))
 			showDetailUI(usr, indexNum)
 
-
 	if(href_list["detailreopen"])
 		var/indexNum = text2num(href_list["detailreopen"])
 		if(openTicket(indexNum))
@@ -468,6 +506,10 @@ UI STUFF
 		var/indexNum = text2num(href_list["autorespond"])
 		autoRespond(indexNum)
 
+	if(href_list["convert_ticket"])
+		var/indexNum = text2num(href_list["convert_ticket"])
+		convert_to_other_ticket(indexNum)
+
 	if(href_list["resolveall"])
 		if(ticket_system_name == "Mentor Tickets")
 			usr.client.resolveAllMentorTickets()

code/controllers/verbs.dm

@@ -7,7 +7,7 @@
 	set name = "Restart Controller"
 	set desc = "Restart one of the various periodic loop controllers for the game (be careful!)"
 
-	if(!holder)
+	if(!check_rights(R_DEBUG))
 		return
 	switch(controller)
 		if("Master")
@@ -20,13 +20,14 @@
 	message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.")
 
 /client/proc/debug_controller(controller in list("failsafe", "Master", "Ticker", "Air", "Jobs", "Sun", "Radio", "Configuration", "pAI",
-	"Cameras", "Garbage", "Event", "Alarm", "Nano", "Vote", "Fires",
+	"Cameras", "Garbage", "Event", "Nano", "Vote", "Fires",
 	"Mob", "NPC Pool", "Shuttle", "Timer", "Weather", "Space", "Mob Hunt Server","Input"))
 	set category = "Debug"
 	set name = "Debug Controller"
 	set desc = "Debug the various periodic loop controllers for the game (be careful!)"
 
-	if(!holder)	return
+	if(!check_rights(R_DEBUG))
+		return
 	switch(controller)
 		if("failsafe")
 			debug_variables(Failsafe)
@@ -64,9 +65,6 @@
 		if("Event")
 			debug_variables(SSevents)
 			feedback_add_details("admin_verb","DEvent")
-		if("Alarm")
-			debug_variables(SSalarms)
-			feedback_add_details("admin_verb", "DAlarm")
 		if("Nano")
 			debug_variables(SSnanoui)
 			feedback_add_details("admin_verb","DNano")