Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello

code/modules/admin/IsBanned.dm

@@ -93,7 +93,7 @@ world/IsBanned(key,address,computer_id)
 				var/appealmessage = ""
 				if(config.banappeals)
 					appealmessage = " You may appeal it at <a href='[config.banappeals]'>[config.banappeals]</a>."
-				expires = " The is a permanent ban.[appealmessage]"
+				expires = " This is a permanent ban.[appealmessage]"
 
 			var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime].[expires]"
 

code/modules/admin/admin.dm

@@ -9,15 +9,17 @@ var/global/nologevent = 0
 			if(C.prefs && !(C.prefs.toggles & CHAT_NO_ADMINLOGS))
 				to_chat(C, msg)
 
-/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
+/proc/msg_admin_attack(var/text, var/loglevel)
 	if(!nologevent)
 		var/rendered = "<span class=\"admin\"><span class=\"prefix\">ATTACK:</span> <span class=\"message\">[text]</span></span>"
 		for(var/client/C in admins)
 			if(R_ADMIN & C.holder.rights)
-				if(C.prefs.toggles & CHAT_ATTACKLOGS)
-					if(!istype(C, /mob/living))
-						var/msg = rendered
-						to_chat(C, msg)
+				if(C.prefs.atklog == ATKLOG_NONE)
+					continue
+				var/msg = rendered
+				if(C.prefs.atklog <= loglevel)
+					to_chat(C, msg)
+
 
 /proc/message_adminTicket(var/msg)
 	msg = "<span class='adminticket'><span class='prefix'>ADMIN TICKET:</span> [msg]</span>"
@@ -59,7 +61,8 @@ var/global/nologevent = 0
 	body += "<a href='?src=[usr.UID()];priv_msg=\ref[M]'>PM</a> - "
 	body += "<a href='?_src_=holder;subtlemessage=\ref[M]'>SM</a> - "
 	body += "[admin_jump_link(M)]\] </b><br>"
-
+	if(ishuman(M) && M.mind)
+		body += "<a href='?_src_=holder;HeadsetMessage=[M.UID()]'>HM</a>"
 	body += "<b>Mob type:</b> [M.type]<br>"
 	if(M.client)
 		if(M.client.related_accounts_cid.len)
@@ -876,10 +879,10 @@ var/global/nologevent = 0
 				to_chat(usr, "[P.pai_laws]")
 			continue // Skip showing normal silicon laws for pAIs - they don't have any
 		else
-			to_chat(usr, "<b>SILICON [key_name(S, usr)]'s laws:</b>")
+			to_chat(usr, "<b>SILICON [key_name(S, TRUE)]'s laws:</b>")
 
 		if(S.laws == null)
-			to_chat(usr, "[key_name(S, usr)]'s laws are null. Contact a coder.")
+			to_chat(usr, "[key_name(S, TRUE)]'s laws are null. Contact a coder.")
 		else
 			S.laws.show_laws(usr)
 	if(!ai_number)

code/modules/admin/admin_verbs.dm

@@ -76,7 +76,8 @@ var/list/admin_verbs_admin = list(
 	/client/proc/toggle_mentor_chat,
 	/client/proc/toggle_advanced_interaction, /*toggle admin ability to interact with not only machines, but also atoms such as buttons and doors*/
 	/client/proc/list_ssds,
-	/client/proc/spawn_floor_cluwne
+	/client/proc/cmd_admin_headset_message,
+	/client/proc/spawn_floor_cluwne,
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
@@ -827,10 +828,10 @@ var/list/admin_verbs_ticket = list(
 	if(!istype(H))
 		if(istype(H, /mob/living/carbon/brain))
 			var/mob/living/carbon/brain/B = H
-			if(istype(B.container, /obj/item/mmi/posibrain/ipc))
-				var/obj/item/mmi/posibrain/ipc/C = B.container
+			if(istype(B.container, /obj/item/mmi/robotic_brain/positronic))
+				var/obj/item/mmi/robotic_brain/positronic/C = B.container
 				var/obj/item/organ/internal/brain/mmi_holder/posibrain/P = C.loc
-				if(istype(P.owner, /mob/living/carbon/human))
+				if(ishuman(P.owner))
 					H = P.owner
 			else
 				return
@@ -853,10 +854,10 @@ var/list/admin_verbs_ticket = list(
 	if(!istype(H))
 		if(istype(H, /mob/living/carbon/brain))
 			var/mob/living/carbon/brain/B = H
-			if(istype(B.container, /obj/item/mmi/posibrain/ipc))
-				var/obj/item/mmi/posibrain/ipc/C = B.container
+			if(istype(B.container, /obj/item/mmi/robotic_brain/positronic))
+				var/obj/item/mmi/robotic_brain/positronic/C = B.container
 				var/obj/item/organ/internal/brain/mmi_holder/posibrain/P = C.loc
-				if(istype(P.owner, /mob/living/carbon/human))
+				if(ishuman(P.owner))
 					H = P.owner
 			else
 				return
@@ -869,10 +870,10 @@ var/list/admin_verbs_ticket = list(
 
 	switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel"))
 		if("Yes")
-			admin_log_and_message_admins("has allowed [H] to change \his appearance, without whitelisting of races.")
+			admin_log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, without whitelisting of races.")
 			H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 0)
 		if("No")
-			admin_log_and_message_admins("has allowed [H] to change \his appearance, with whitelisting of races.")
+			admin_log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, with whitelisting of races.")
 			H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1)
 	feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -903,12 +904,27 @@ var/list/admin_verbs_ticket = list(
 	if(!check_rights(R_ADMIN))
 		return
 
-	prefs.toggles ^= CHAT_ATTACKLOGS
-	prefs.save_preferences(src)
-	if(prefs.toggles & CHAT_ATTACKLOGS)
-		to_chat(usr, "You now will get attack log messages")
+	if(prefs.atklog == ATKLOG_ALL)
+		prefs.atklog = ATKLOG_ALMOSTALL
+		to_chat(usr, "Your attack logs preference is now: show ALMOST ALL attack logs (notable exceptions: NPCs attacking other NPCs, vampire bites, equipping/stripping, people pushing each other over)")
+	else if(prefs.atklog == ATKLOG_ALMOSTALL)
+		prefs.atklog = ATKLOG_MOST
+		to_chat(usr, "Your attack logs preference is now: show MOST attack logs (like ALMOST ALL, except that it also hides attacks by players on NPCs)")
+	else if(prefs.atklog == ATKLOG_MOST)
+		prefs.atklog = ATKLOG_FEW
+		to_chat(usr, "Your attack logs preference is now: show FEW attack logs (only the most important stuff: attacks on SSDs, use of explosives, messing with the engine, gibbing, AI wiping, forcefeeding, acid sprays, and organ extraction)")
+	else if(prefs.atklog == ATKLOG_FEW)
+		prefs.atklog = ATKLOG_NONE
+		to_chat(usr, "Your attack logs preference is now: show NO attack logs")
+	else if(prefs.atklog == ATKLOG_NONE)
+		prefs.atklog = ATKLOG_ALL
+		to_chat(usr, "Your attack logs preference is now: show ALL attack logs")
 	else
-		to_chat(usr, "You now won't get attack log messages")
+		prefs.atklog = ATKLOG_ALL
+		to_chat(usr, "Your attack logs preference is now: show ALL attack logs (your preference was set to an invalid value, it has been reset)")
+
+	prefs.save_preferences(src)
+
 
 /client/proc/toggleadminlogs()
 	set name = "Toggle Admin Log Messages"

code/modules/admin/buildmode.dm

@@ -14,6 +14,7 @@
 /obj/screen/buildmode
 	icon = 'icons/misc/buildmode.dmi'
 	var/datum/click_intercept/buildmode/bd
+	layer = HUD_LAYER_BUILDMODE
 
 /obj/screen/buildmode/New(bld)
 	..()
@@ -78,6 +79,7 @@
 /obj/effect/buildmode_reticule
 	var/image/I
 	var/client/cl
+	anchored = TRUE
 
 /obj/effect/buildmode_reticule/New(var/turf/t, var/client/c)
 	loc = t
@@ -349,13 +351,13 @@
 		if(BOOM_BUILDMODE)
 			devastation = input("Range of total devastation. -1 to none", text("Input"))  as num|null
 			if(devastation == null) devastation = -1
-			var/heavy = input("Range of heavy impact. -1 to none", text("Input"))  as num|null
+			heavy = input("Range of heavy impact. -1 to none", text("Input"))  as num|null
 			if(heavy == null) heavy = -1
-			var/light = input("Range of light impact. -1 to none", text("Input"))  as num|null
+			light = input("Range of light impact. -1 to none", text("Input"))  as num|null
 			if(light == null) light = -1
-			var/flash = input("Range of flash. -1 to none", text("Input"))  as num|null
+			flash = input("Range of flash. -1 to none", text("Input"))  as num|null
 			if(flash == null) flash = -1
-			var/flames = input("Range of flames. -1 to none", text("Input"))  as num|null
+			flames = input("Range of flames. -1 to none", text("Input"))  as num|null
 			if(flames == null) flames = -1
 
 		if(SAVE_BUILDMODE)
@@ -454,10 +456,12 @@
 					var/turf/T = get_turf(object)
 					log_admin("Build Mode: [key_name(user)] modified [T] ([T.x],[T.y],[T.z]) to [objholder]")
 					T.ChangeTurf(objholder)
-				else
+				else if(!isnull(objholder))
 					var/obj/A = new objholder (get_turf(object))
 					A.setDir(build_dir)
 					log_admin("Build Mode: [key_name(user)] modified [A]'s ([A.x],[A.y],[A.z]) dir to [build_dir]")
+				else
+					to_chat(user, "<span class='warning'>Select object type first.</span>")
 			else if(right_click)
 				if(isobj(object))
 					log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
@@ -625,7 +629,7 @@
 						L2.color = L.color
 						link_lines += L2
 		if(BOOM_BUILDMODE)
-			explosion(object, devastation, heavy, light, flash, null, null,flames)
+			explosion(object, devastation, heavy, light, flash, null, TRUE, flames)
 		if(SAVE_BUILDMODE)
 			if(!cornerA)
 				cornerA = select_tile(get_turf(object))

code/modules/admin/secrets.dm

@@ -25,8 +25,6 @@
 						<A href='?src=[UID()];secretsadmin=check_antagonist'>Show current traitors and objectives</A><BR>
 						<a href='?src=[UID()];secretsadmin=night_shift_set'>Set Night Shift Mode</a><br>
 						<B>Bombs</b><br>
-						<A href='?src=[UID()];secretsadmin=list_bombers'>Bombing List</A>&nbsp;&nbsp;
-						<A href='?src=[UID()];secretsadmin=clear_bombs'>Remove all bombs currently in existence</A>
 						[check_rights(R_SERVER, 0) ? "&nbsp;&nbsp;<A href='?src=[UID()];secretsfun=togglebombcap'>Toggle bomb cap</A><br>" : "<br>"]
 						<B>Lists</b><br>
 						<A href='?src=[UID()];secretsadmin=list_signalers'>Show last [length(lastsignalers)] signalers</A>&nbsp;&nbsp;
@@ -82,7 +80,6 @@
 					<A href='?src=[UID()];secretsfun=securitylevel5'>Security Level - Delta</A><BR>
 					<b>Create Weather</b><BR>
 					<A href='?src=[UID()];secretsfun=weatherashstorm'>Weather - Ash Storm</A>&nbsp;&nbsp;
-					<A href='?src=[UID()];secretsfun=weatherdarkness'>Weather - Advanced Darkness</A>&nbsp;&nbsp;
 					<BR>
 					</center>"}
 
@@ -130,5 +127,3 @@
 	var/datum/browser/popup = new(usr, "secrets", "<div align='center'>Admin Secrets</div>", 630, 670)
 	popup.set_content(dat)
 	popup.open(0)
-
-

code/modules/admin/tickets/admintickets.dm

@@ -104,7 +104,7 @@ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicke
 /datum/adminTicketHolder/proc/checkForTicket(var/client/C)
 	var/list/tickets = list()
 	for(var/datum/admin_ticket/T in allTickets)
-		if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE)
+		if(T.clientName == C && (T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE))
 			tickets += T
 	if(tickets.len)
 		return tickets

code/modules/admin/topic.dm

@@ -39,35 +39,35 @@
 		switch(href_list["makeAntag"])
 			if("1")
 				log_admin("[key_name(usr)] has spawned a traitor.")
-				if(!src.makeTraitors())
+				if(!makeTraitors())
 					to_chat(usr, "<span class='warning'>Unfortunately there weren't enough candidates available.</span>")
 			if("2")
 				log_admin("[key_name(usr)] has spawned a changeling.")
-				if(!src.makeChanglings())
+				if(!makeChangelings())
 					to_chat(usr, "<span class='warning'>Unfortunately there weren't enough candidates available.</span>")
 			if("3")
 				log_admin("[key_name(usr)] has spawned revolutionaries.")
-				if(!src.makeRevs())
+				if(!makeRevs())
 					to_chat(usr, "<span class='warning'>Unfortunately there weren't enough candidates available.</span>")
 			if("4")
 				log_admin("[key_name(usr)] has spawned a cultists.")
-				if(!src.makeCult())
+				if(!makeCult())
 					to_chat(usr, "<span class='warning'>Unfortunately there weren't enough candidates available.</span>")
 			if("5")
 				log_admin("[key_name(usr)] has spawned a wizard.")
-				if(!src.makeWizard())
+				if(!makeWizard())
 					to_chat(usr, "<span class='warning'>Unfortunately there weren't enough candidates available.</span>")
 			if("6")
 				log_admin("[key_name(usr)] has spawned vampires.")
-				if(!src.makeVampires())
+				if(!makeVampires())
 					to_chat(usr, "<span class='warning'>Unfortunately there weren't enough candidates available.</span>")
 			if("7")
 				log_admin("[key_name(usr)] has spawned vox raiders.")
-				if(!src.makeVoxRaiders())
+				if(!makeVoxRaiders())
 					to_chat(usr, "<span class='warning'>Unfortunately there weren't enough candidates available.</span>")
 			if("8")
 				log_admin("[key_name(usr)] has spawned an abductor team.")
-				if(!src.makeAbductorTeam())
+				if(!makeAbductorTeam())
 					to_chat(usr, "<span class='warning'>Unfortunately there weren't enough candidates available.</span>")
 
 	else if(href_list["dbsearchckey"] || href_list["dbsearchadmin"] || href_list["dbsearchip"] || href_list["dbsearchcid"] || href_list["dbsearchbantype"])
@@ -337,7 +337,7 @@
 			if("queen")				M.change_mob_type( /mob/living/carbon/alien/humanoid/queen/large , null, null, delmob, 1 )
 			if("sentinel")			M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob, 1 )
 			if("larva")				M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob, 1 )
-			if("human")				M.change_mob_type( /mob/living/carbon/human/human , null, null, delmob, 1 )
+			if("human")				M.change_mob_type( /mob/living/carbon/human, null, null, delmob, 1 )
 			if("slime")				M.change_mob_type( /mob/living/carbon/slime , null, null, delmob, 1 )
 			if("monkey")			M.change_mob_type( /mob/living/carbon/human/monkey , null, null, delmob, 1 )
 			if("robot")				M.change_mob_type( /mob/living/silicon/robot , null, null, delmob, 1 )
@@ -1622,14 +1622,14 @@
 			H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand )
 			if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie)))
 				log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
-				message_admins("[key_name_admin(H)] has their hands full, so they did not receive their cookie, spawned by [key_name_admin(src.owner)].")
+				message_admins("[key_name_admin(H)] has [H.p_their()] hands full, so [H.p_they()] did not receive [H.p_their()] cookie, spawned by [key_name_admin(src.owner)].")
 				return
 			else
 				H.update_inv_r_hand()//To ensure the icon appears in the HUD
 		else
 			H.update_inv_l_hand()
 		log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]")
-		message_admins("[key_name_admin(H)] got their cookie, spawned by [key_name_admin(src.owner)]")
+		message_admins("[key_name_admin(H)] got [H.p_their()] cookie, spawned by [key_name_admin(src.owner)]")
 		feedback_inc("admin_cookies_spawned",1)
 		to_chat(H, "<span class='notice'>Your prayers have been answered!! You received the <b>best cookie</b>!</span>")
 
@@ -1675,21 +1675,22 @@
 		if(!check_rights(R_ADMIN))
 			return
 
-		var/mob/living/carbon/human/H = locate(href_list["CentcommReply"])
-		if(!istype(H))
-			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
-			return
-		if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
-			to_chat(usr, "The person you are trying to contact is not wearing a headset")
+		var/mob/M = locateUID(href_list["CentcommReply"])
+		usr.client.admin_headset_message(M, "Centcomm")
+
+	else if(href_list["SyndicateReply"])
+		if(!check_rights(R_ADMIN))
 			return
 
-		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcomm", "")
-		if(!input)	return
+		var/mob/M = locateUID(href_list["SyndicateReply"])
+		usr.client.admin_headset_message(M, "Syndicate")
 
-		to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
-		log_admin("[key_name(src.owner)] replied to [key_name(H)]'s Centcomm message with the message [input].")
-		message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)]'s Centcom message with: \"[input]\"")
-		to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks.  \"Please stand by for a message from Central Command.  Message as follows. [input].  Message ends.\"")
+	else if(href_list["HeadsetMessage"])
+		if(!check_rights(R_ADMIN))
+			return
+
+		var/mob/M = locateUID(href_list["HeadsetMessage"])
+		usr.client.admin_headset_message(M)
 
 	else if(href_list["EvilFax"])
 		if(!check_rights(R_ADMIN))
@@ -1942,7 +1943,7 @@
 					newtraitor.mind.special_role = SPECIAL_ROLE_TRAITOR
 					var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR]
 					tatorhud.join_hud(newtraitor)
-					ticker.mode.set_antag_hud(newtraitor, "hudsyndicate")
+					set_antag_hud(newtraitor, "hudsyndicate")
 				else
 					to_chat(usr, "ERROR: Failed to create a traitor.")
 					return
@@ -2051,7 +2052,7 @@
 		if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
 			to_chat(usr, "The person you are trying to contact is not wearing a headset")
 			return
-		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from The Syndicate", "")
+		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from The Syndicate", "")
 		if(!input)
 			return
 		to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -2067,7 +2068,7 @@
 			to_chat(usr, "The person you are trying to contact is not wearing a headset")
 			return
 
-		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from HONKplanet", "")
+		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from HONKplanet", "")
 		if(!input)	return
 
 		to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -2733,48 +2734,6 @@
 				for(var/mob/M in player_list)
 					if(M.stat != 2)
 						M.show_message(text("<span class='notice'>The chilling wind suddenly stops...</span>"), 1)
-/*				if("shockwave")
-				ok = 1
-				to_chat(world, "<span class='danger'><big>ALERT: STATION STRESS CRITICAL</big></span>")
-				sleep(60)
-				to_chat(world, "<span class='danger'><big>ALERT: STATION STRESS CRITICAL. TOLERABLE LEVELS EXCEEDED!</big></span>")
-				sleep(80)
-				to_chat(world, "<span class='danger'><big>ALERT: STATION STRUCTURAL STRESS CRITICAL. SAFETY MECHANISMS FAILED!</big></span>")
-				sleep(40)
-				for(var/mob/M in world)
-					shake_camera(M, 400, 1)
-				for(var/obj/structure/window/W in world)
-					spawn(0)
-						sleep(rand(10,400))
-						W.ex_act(rand(2,1))
-				for(var/obj/structure/grille/G in world)
-					spawn(0)
-						sleep(rand(20,400))
-						G.ex_act(rand(2,1))
-				for(var/obj/machinery/door/D in world)
-					spawn(0)
-						sleep(rand(20,400))
-						D.ex_act(rand(2,1))
-				for(var/turf/station/floor/Floor in world)
-					spawn(0)
-						sleep(rand(30,400))
-						Floor.ex_act(rand(2,1))
-				for(var/obj/structure/cable/Cable in world)
-					spawn(0)
-						sleep(rand(30,400))
-						Cable.ex_act(rand(2,1))
-				for(var/obj/structure/closet/Closet in world)
-					spawn(0)
-						sleep(rand(30,400))
-						Closet.ex_act(rand(2,1))
-				for(var/obj/machinery/Machinery in world)
-					spawn(0)
-						sleep(rand(30,400))
-						Machinery.ex_act(rand(1,3))
-				for(var/turf/station/wall/Wall in world)
-					spawn(0)
-						sleep(rand(30,400))
-						Wall.ex_act(rand(2,1)) */
 			if("lightout")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","LO")
@@ -2799,7 +2758,7 @@
 				var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No")
 				if(sure == "No")
 					return
-				weather_master.run_weather("the floor is lava")
+				SSweather.run_weather(/datum/weather/floor_is_lava)
 				message_admins("[key_name_admin(usr)] made the floor lava")
 			if("fakelava")
 				feedback_inc("admin_secrets_fun_used", 1)
@@ -2807,7 +2766,7 @@
 				var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No")
 				if(sure == "No")
 					return
-				weather_master.run_weather("fake lava")
+				SSweather.run_weather(/datum/weather/floor_is_lava/fake)
 				message_admins("[key_name_admin(usr)] made aesthetic lava on the floor")
 			if("weatherashstorm")
 				feedback_inc("admin_secrets_fun_used", 1)
@@ -2815,16 +2774,8 @@
 				var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No")
 				if(sure == "No")
 					return
-				weather_master.run_weather("ash storm")
+				SSweather.run_weather(/datum/weather/ash_storm)
 				message_admins("[key_name_admin(usr)] spawned an ash storm on the mining asteroid")
-			if("weatherdarkness")
-				feedback_inc("admin_secrets_fun_used", 1)
-				feedback_add_details("admin_secrets_fun_used", "WD")
-				var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No")
-				if(sure == "No")
-					return
-				weather_master.run_weather("advanced darkness")
-				message_admins("[key_name_admin(usr)] made the station go through advanced darkness")
 			if("retardify")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","RET")
@@ -2963,13 +2914,6 @@
 
 		var/ok = 0
 		switch(href_list["secretsadmin"])
-			if("clear_bombs")
-				//I do nothing
-			if("list_bombers")
-				var/dat = "<B>Bombing List<HR>"
-				for(var/l in bombers)
-					dat += text("[l]<BR>")
-				usr << browse(dat, "window=bombers")
 			if("list_signalers")
 				var/dat = "<B>Showing last [length(lastsignalers)] signalers.</B><HR>"
 				for(var/sig in lastsignalers)
@@ -3438,11 +3382,11 @@
 	to_chat(hunter_mob, "<span class='danger'>ATTENTION:</span> You are now on a mission!")
 	to_chat(hunter_mob, "<B>Goal: <span class='danger'>[killthem ? "MURDER" : "PROTECT"] [H.real_name]</span>, currently in [get_area(H.loc)]. </B>");
 	if(killthem)
-		to_chat(hunter_mob, "<B>If you kill them, they cannot be revived.</B>");
+		to_chat(hunter_mob, "<B>If you kill [H.p_them()], [H.p_they()] cannot be revived.</B>");
 	hunter_mob.mind.special_role = SPECIAL_ROLE_TRAITOR
 	var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR]
 	tatorhud.join_hud(hunter_mob)
-	ticker.mode.set_antag_hud(hunter_mob, "hudsyndicate")
+	set_antag_hud(hunter_mob, "hudsyndicate")
 
 /proc/admin_jump_link(var/atom/target)
 	if(!target) return

code/modules/admin/verbs/adminpm.dm

@@ -183,6 +183,8 @@
 					if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
 						to_chat(X, "<span class='boldnotice'>[type]: [key_name(src, TRUE, type)]-&gt;[key_name(C, TRUE, type)]: [emoji_msg]</span>")
 
+	if(type == "Mentorhelp")
+		return
 	//Check if the mob being PM'd has any open admin tickets.
 	var/tickets = list()
 	tickets = globAdminTicketHolder.checkForTicket(C)

code/modules/admin/verbs/adminsay.dm

@@ -12,6 +12,7 @@
 	if(check_rights(R_ADMIN,0))
 		for(var/client/C in admins)
 			if(R_ADMIN & C.holder.rights)
+				msg = "<span class='emoji_enabled'>[msg]</span>"
 				to_chat(C, "<span class='admin_channel'>ADMIN: <span class='name'>[key_name(usr, 1)]</span> ([admin_jump_link(mob)]): <span class='message'>[msg]</span></span>")
 
 	feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -38,6 +39,7 @@
 					display_name = "[holder.fakekey]/([key])"
 				else
 					display_name = holder.fakekey
+			msg = "<span class='emoji_enabled'>[msg]</span>"
 			to_chat(C, "<span class='[check_rights(R_ADMIN, 0) ? "mentor_channel_admin" : "mentor_channel"]'>MENTOR: <span class='name'>[display_name]</span> ([admin_jump_link(mob)]): <span class='message'>[msg]</span></span>")
 
 	feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/debug.dm

@@ -266,7 +266,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(!choice)
 		return 0
 	if(!istype(choice, /mob/dead/observer))
-		var/confirm = input("[choice.key] isn't ghosting right now. Are you sure you want to yank him out of them out of their body and place them in this pAI?", "Spawn pAI Confirmation", "No") in list("Yes", "No")
+		var/confirm = input("[choice.key] isn't ghosting right now. Are you sure you want to yank [choice.p_them()] out of [choice.p_their()] body and place [choice.p_them()] in this pAI?", "Spawn pAI Confirmation", "No") in list("Yes", "No")
 		if(confirm != "Yes")
 			return 0
 	var/obj/item/paicard/card = new(T)

code/modules/admin/verbs/gimmick_team.dm

@@ -70,7 +70,7 @@
 		H.dna.ready_dna(H)
 
 		H.mind_initialize()
-		H.mind.assigned_role = "MODE"
+		H.mind.assigned_role = "Event Character"
 		H.mind.special_role = "Event Character"
 
 		H.key = thisplayer.key

code/modules/admin/verbs/honksquad.dm

@@ -91,7 +91,7 @@ var/global/sent_honksquad = 0
 
 	//Creates mind stuff.
 	new_honksquad.mind_initialize()
-	new_honksquad.mind.assigned_role = "MODE"
+	new_honksquad.mind.assigned_role = SPECIAL_ROLE_HONKSQUAD
 	new_honksquad.mind.special_role = SPECIAL_ROLE_HONKSQUAD
 	new_honksquad.add_language("Clownish")
 	ticker.mode.traitors |= new_honksquad.mind//Adds them to current traitor list. Which is really the extra antagonist list.

code/modules/admin/verbs/infiltratorteam_syndicate.dm

@@ -109,7 +109,7 @@ var/global/sent_syndicate_infiltration_team = 0
 		new_syndicate_infiltrator.mind.store_memory("<B>Starting Equipment:</B> <BR>- Syndicate Headset ((.h for your radio))<BR>- Chameleon Jumpsuit ((right click to Change Color))<BR> - Agent ID card ((disguise as another job))<BR> - Uplink Implant ((top left of screen)) <BR> - Dust Implant ((destroys your body on death)) <BR> - Combat Gloves ((insulated, disguised as black gloves)) <BR> - Anything bought with your uplink implant")
 		var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS]
 		opshud.join_hud(new_syndicate_infiltrator.mind.current)
-		ticker.mode.set_antag_hud(new_syndicate_infiltrator.mind.current, "hudoperative")
+		set_antag_hud(new_syndicate_infiltrator.mind.current, "hudoperative")
 		new_syndicate_infiltrator.regenerate_icons()
 		num_spawned++
 		if(!teamsize)
@@ -127,7 +127,7 @@ var/global/sent_syndicate_infiltration_team = 0
 			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate, slot_wear_mask)
 			var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS]
 			opshud.join_hud(syndimgmtmob.mind.current)
-			ticker.mode.set_antag_hud(syndimgmtmob.mind.current, "hudoperative")
+			set_antag_hud(syndimgmtmob.mind.current, "hudoperative")
 			syndimgmtmob.mind.special_role = "Syndicate Management Consultant"
 			syndimgmtmob.regenerate_icons()
 			to_chat(syndimgmtmob, "<span class='userdanger'>You have spawned as Syndicate Management. You should brief them on their mission before they go.</span>")
@@ -149,7 +149,7 @@ var/global/sent_syndicate_infiltration_team = 0
 
 	//Creates mind stuff.
 	new_syndicate_infiltrator.mind_initialize()
-	new_syndicate_infiltrator.mind.assigned_role = "MODE"
+	new_syndicate_infiltrator.mind.assigned_role = "Syndicate Infiltrator"
 	new_syndicate_infiltrator.mind.special_role = "Syndicate Infiltrator"
 	ticker.mode.traitors |= new_syndicate_infiltrator.mind //Adds them to extra antag list
 	new_syndicate_infiltrator.equip_syndicate_infiltrator(syndicate_leader_selected, uplink_tc, is_mgmt)

code/modules/admin/verbs/mapping.dm

@@ -92,7 +92,7 @@ var/intercom_range_display_status = 0
 			if(!(locate(/obj/structure/grille,T)))
 				var/window_check = 0
 				for(var/obj/structure/window/W in T)
-					if(W.dir == turn(C1.dir,180) || W.is_fulltile() )
+					if(W.dir == turn(C1.dir,180) || W.fulltile)
 						window_check = 1
 						break
 				if(!window_check)

code/modules/admin/verbs/modifyvariables.dm

@@ -46,6 +46,8 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
 
 	else if(isfile(var_value))
 		. = VV_FILE
+	else if(istype(var_value, /regex))
+		. = VV_REGEX
 	else
 		. = VV_NULL
 
@@ -66,6 +68,7 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
 				VV_DATUM_TYPE,
 				VV_TYPE,
 				VV_MATRIX,
+				VV_REGEX,
 				VV_FILE,
 				VV_NEW_ATOM,
 				VV_NEW_DATUM,
@@ -141,6 +144,14 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
 				.["class"] = null
 				return
 
+		if(VV_REGEX)
+			var/reg = input("Enter regex", "Regex", "") as null|text
+			if(!reg)
+				return
+			.["value"] = regex(reg)
+			if(.["value"] == null)
+				.["class"] = null
+
 
 		if(VV_ATOM_REFERENCE)
 			var/type = pick_closest_path(FALSE)

code/modules/admin/verbs/one_click_antag.dm

@@ -25,6 +25,22 @@ client/proc/one_click_antag()
 	usr << browse(dat, "window=oneclickantag;size=400x400")
 	return
 
+/datum/admins/proc/CandCheck(var/role = null, var/mob/living/carbon/human/M, var/datum/game_mode/temp = null)
+  // You pass in ROLE define (optional), the applicant, and the gamemode, and it will return true / false depending on whether the applicant qualify for the candidacy in question
+	if(jobban_isbanned(M, "Syndicate"))
+		return FALSE
+	if(M.stat || !M.mind || M.mind.special_role)
+		return FALSE
+	if(temp)
+		if(M.mind.assigned_role in temp.restricted_jobs || M.client.prefs.species in temp.protected_species)
+			return FALSE
+	if(role) // Don't even bother evaluating if there's no role
+		if(player_old_enough_antag(M.client,role) && (role in M.client.prefs.be_special) && (!jobban_isbanned(M, role)))
+			return TRUE
+		else
+			return FALSE
+	else
+		return TRUE
 
 /datum/admins/proc/makeTraitors()
 	var/datum/game_mode/traitor/temp = new
@@ -35,35 +51,29 @@ client/proc/one_click_antag()
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
-	log_admin("[key_name(owner)] tried making Traitors with One-Click-Antag")
-	message_admins("[key_name_admin(owner)] tried making Traitors with One-Click-Antag")
+	var/antnum = input(owner, "How many traitors you want to create? Enter 0 to cancel","Amount:", 0) as num
+	if(!antnum || antnum <= 0)
+		return
+	log_admin("[key_name(owner)] tried making [antnum] traitors with One-Click-Antag")
+	message_admins("[key_name_admin(owner)] tried making [antnum] traitors with One-Click-Antag")
 
 	for(var/mob/living/carbon/human/applicant in player_list)
-		if(ROLE_TRAITOR in applicant.client.prefs.be_special)
-			if(player_old_enough_antag(applicant.client,ROLE_TRAITOR))
-				if(!applicant.stat)
-					if(applicant.mind)
-						if(!applicant.mind.special_role)
-							if(!jobban_isbanned(applicant, "traitor") && !jobban_isbanned(applicant, "Syndicate"))
-								if(!(applicant.mind.assigned_role in temp.restricted_jobs))
-									if(!(applicant.client.prefs.species in temp.protected_species))
-										candidates += applicant
+		if(CandCheck(ROLE_TRAITOR, applicant, temp))
+			candidates += applicant
 
 	if(candidates.len)
-		var/numTratiors = min(candidates.len, 3)
+		var/numTraitors = min(candidates.len, antnum)
 
-		for(var/i = 0, i<numTratiors, i++)
+		for(var/i = 0, i<numTraitors, i++)
 			H = pick(candidates)
-			H.mind.make_Tratior()
+			H.mind.make_Traitor()
 			candidates.Remove(H)
 
 		return 1
-
-
 	return 0
 
 
-/datum/admins/proc/makeChanglings()
+/datum/admins/proc/makeChangelings()
 
 	var/datum/game_mode/changeling/temp = new
 	if(config.protect_roles_from_antagonist)
@@ -72,30 +82,25 @@ client/proc/one_click_antag()
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
-	log_admin("[key_name(owner)] tried making Changelings with One-Click-Antag")
-	message_admins("[key_name_admin(owner)] tried making Changelings with One-Click-Antag")
+	var/antnum = input(owner, "How many changelings you want to create? Enter 0 to cancel.","Amount:", 0) as num
+	if(!antnum || antnum <= 0)
+		return
+	log_admin("[key_name(owner)] tried making [antnum] changelings with One-Click-Antag")
+	message_admins("[key_name_admin(owner)] tried making [antnum] changelings with One-Click-Antag")
 
 	for(var/mob/living/carbon/human/applicant in player_list)
-		if(ROLE_CHANGELING in applicant.client.prefs.be_special)
-			if(player_old_enough_antag(applicant.client,ROLE_CHANGELING))
-				if(!applicant.stat)
-					if(applicant.mind)
-						if(!applicant.mind.special_role)
-							if(!jobban_isbanned(applicant, "changeling") && !jobban_isbanned(applicant, "Syndicate"))
-								if(!(applicant.mind.assigned_role in temp.restricted_jobs))
-									if(!(applicant.client.prefs.species in temp.protected_species))
-										candidates += applicant
+		if(CandCheck(ROLE_CHANGELING, applicant, temp))
+			candidates += applicant
 
 	if(candidates.len)
-		var/numChanglings = min(candidates.len, 3)
+		var/numChangelings = min(candidates.len, antnum)
 
-		for(var/i = 0, i<numChanglings, i++)
+		for(var/i = 0, i<numChangelings, i++)
 			H = pick(candidates)
-			H.mind.make_Changling()
+			H.mind.make_Changeling()
 			candidates.Remove(H)
 
 		return 1
-
 	return 0
 
 /datum/admins/proc/makeRevs()
@@ -107,33 +112,31 @@ client/proc/one_click_antag()
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
-	log_admin("[key_name(owner)] tried making Revolutionaries with One-Click-Antag")
-	message_admins("[key_name_admin(owner)] tried making Revolutionaries with One-Click-Antag")
+	var/antnum = input(owner, "How many revolutionaries you want to create? Enter 0 to cancel","Amount:", 0) as num
+	if(!antnum || antnum <= 0)
+		return
+	log_admin("[key_name(owner)] tried making [antnum] revolutionaries with One-Click-Antag")
+	message_admins("[key_name_admin(owner)] tried making [antnum] revolutionaries with One-Click-Antag")
 
 	for(var/mob/living/carbon/human/applicant in player_list)
-		if(ROLE_REV in applicant.client.prefs.be_special)
-			if(player_old_enough_antag(applicant.client,ROLE_REV))
-				if(applicant.stat == CONSCIOUS)
-					if(applicant.mind)
-						if(!applicant.mind.special_role)
-							if(!jobban_isbanned(applicant, "revolutionary") && !jobban_isbanned(applicant, "Syndicate"))
-								if(!(applicant.mind.assigned_role in temp.restricted_jobs))
-									if(!(applicant.client.prefs.species in temp.protected_species))
-										candidates += applicant
+		if(CandCheck(ROLE_REV, applicant, temp))
+			candidates += applicant
 
 	if(candidates.len)
-		var/numRevs = min(candidates.len, 3)
+		var/numRevs = min(candidates.len, antnum)
 
 		for(var/i = 0, i<numRevs, i++)
 			H = pick(candidates)
 			H.mind.make_Rev()
 			candidates.Remove(H)
 		return 1
-
 	return 0
 
 /datum/admins/proc/makeWizard()
 
+	var/confirm = alert("Are you sure?", "Confirm creation", "Yes", "No")
+	if(confirm != "Yes")
+		return 0
 	var/list/candidates = pollCandidates("Do you wish to be considered for the position of a Wizard Foundation 'diplomat'?", "wizard")
 
 	log_admin("[key_name(owner)] tried making a Wizard with One-Click-Antag")
@@ -157,31 +160,25 @@ client/proc/one_click_antag()
 
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
-
+	var/antnum = input(owner, "How many cultists you want to create? Enter 0 to cancel.","Amount:", 0) as num
+	if(!antnum || antnum <= 0) // 5 because cultist can really screw balance over if spawned in high amount.
+		return
 	log_admin("[key_name(owner)] tried making a Cult with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making a Cult with One-Click-Antag")
 
 	for(var/mob/living/carbon/human/applicant in player_list)
-		if(ROLE_CULTIST in applicant.client.prefs.be_special)
-			if(player_old_enough_antag(applicant.client,ROLE_CULTIST))
-				if(applicant.stat == CONSCIOUS)
-					if(applicant.mind)
-						if(!applicant.mind.special_role)
-							if(!jobban_isbanned(applicant, "cultist") && !jobban_isbanned(applicant, "Syndicate"))
-								if(!(applicant.mind.assigned_role in temp.restricted_jobs))
-									if(!(applicant.client.prefs.species in temp.protected_species))
-										candidates += applicant
+		if(CandCheck(ROLE_CULTIST, applicant, temp))
+			candidates += applicant
 
 	if(candidates.len)
-		var/numCultists = min(candidates.len, 4)
+		var/numCultists = min(candidates.len, antnum)
 
 		for(var/i = 0, i<numCultists, i++)
 			H = pick(candidates)
-			H.mind.make_Cultist()
+			ticker.mode.add_cultist(H.mind)
 			candidates.Remove(H)
 
 		return 1
-
 	return 0
 
 
@@ -192,8 +189,11 @@ client/proc/one_click_antag()
 	var/mob/theghost = null
 	var/time_passed = world.time
 
-	log_admin("[key_name(owner)] tried making a Nuke Op Team with One-Click-Antag")
-	message_admins("[key_name_admin(owner)] tried making a Nuke Op Team with One-Click-Antag")
+	var/antnum = input(owner, "How many nuclear operative you want to create? Enter 0 to cancel.","Amount:", 0) as num
+	if(!antnum || antnum <= 0)
+		return
+	log_admin("[key_name(owner)] tried making a [antnum] person Nuke Op Team with One-Click-Antag")
+	message_admins("[key_name_admin(owner)] tried making a [antnum] person Nuke Op Team with One-Click-Antag")
 
 	for(var/mob/G in respawnable_list)
 		if(istype(G) && G.client && (ROLE_OPERATIVE in G.client.prefs.be_special))
@@ -213,10 +213,9 @@ client/proc/one_click_antag()
 	sleep(300)
 
 	if(candidates.len)
-		var/numagents = 5
 		var/agentcount = 0
 
-		for(var/i = 0, i<numagents,i++)
+		for(var/i = 0, i<antnum,i++)
 			shuffle(candidates) //More shuffles means more randoms
 			for(var/mob/j in candidates)
 				if(!j || !j.client)
@@ -276,12 +275,14 @@ client/proc/one_click_antag()
 
 		for(var/obj/machinery/nuclearbomb/bomb in world)
 			bomb.r_code = nuke_code						// All the nukes are set to this code.
-
 	return 1
 
-
 //Abductors
 /datum/admins/proc/makeAbductorTeam()
+
+	var/confirm = alert("Are you sure?", "Confirm creation", "Yes", "No")
+	if(confirm != "Yes")
+		return 0
 	new /datum/event/abductor
 
 	log_admin("[key_name(owner)] tried making Abductors with One-Click-Antag")
@@ -292,10 +293,13 @@ client/proc/one_click_antag()
 /datum/admins/proc/makeAliens()
 	var/datum/event/alien_infestation/E = new /datum/event/alien_infestation
 
+	var/antnum = input(owner, "How many aliens you want to create? Enter 0 to cancel.","Amount:", 0) as num
+	if(!antnum || antnum <= 0)
+		return
 	log_admin("[key_name(owner)] tried making Aliens with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making Aliens with One-Click-Antag")
 
-	E.spawncount = 3
+	E.spawncount = antnum
 	// TODO The fact we have to do this rather than just have events start
 	// when we ask them to, is bad.
 	E.processing = TRUE
@@ -315,67 +319,65 @@ client/proc/one_click_antag()
 	if(prob(10))
 		input = "Save Runtime and any other cute things on the station."
 
-	log_admin("[key_name(owner)] tried making a Death Squad with One-Click-Antag")
-	message_admins("[key_name_admin(owner)] tried making a Death Squad with One-Click-Antag")
+		var/antnum = input(owner, "How many deathsquad members you want to create? Enter 0 to cancel.","Amount:", 0) as num
+		if(!antnum || antnum <= 0)
+			return
+		log_admin("[key_name(owner)] tried making a [antnum] person Death Squad with One-Click-Antag")
+		message_admins("[key_name_admin(owner)] tried making a [antnum] person Death Squad with One-Click-Antag")
 
-	var/syndicate_leader_selected = 0 //when the leader is chosen. The last person spawned.
+		var/syndicate_leader_selected = 0 //when the leader is chosen. The last person spawned.
 
-	//Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
-	for(var/mob/G in respawnable_list)
-		if(!jobban_isbanned(G, "Syndicate"))
-			spawn(0)
-				switch(alert(G,"Do you wish to be considered for an elite syndicate strike team being sent in?","Please answer in 30 seconds!","Yes","No"))
-					if("Yes")
-						if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+		//Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
+		for(var/mob/G in respawnable_list)
+			if(!jobban_isbanned(G, "Syndicate"))
+				spawn(0)
+					switch(alert(G,"Do you wish to be considered for an elite syndicate strike team being sent in?","Please answer in 30 seconds!","Yes","No"))
+						if("Yes")
+							if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+								return
+							candidates += G
+						if("No")
 							return
-						candidates += G
-					if("No")
-						return
-					else
-						return
-	sleep(300)
+						else
+							return
+		sleep(300)
 
-	for(var/mob/dead/observer/G in candidates)
-		if(!G.key)
-			candidates.Remove(G)
+		for(var/mob/dead/observer/G in candidates)
+			if(!G.key)
+				candidates.Remove(G)
 
-	if(candidates.len)
-		var/numagents = 6
-		//Spawns commandos and equips them.
-		for(var/obj/effect/landmark/L in /area/syndicate_mothership/elite_squad)
-			if(numagents<=0)
-				break
-			if(L.name == "Syndicate-Commando")
-				syndicate_leader_selected = numagents == 1?1:0
-
-				var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
-
-
-				while((!theghost || !theghost.client) && candidates.len)
-					theghost = pick(candidates)
-					candidates.Remove(theghost)
-
-				if(!theghost)
-					qdel(new_syndicate_commando)
+		if(candidates.len)
+			//Spawns commandos and equips them.
+			for(var/obj/effect/landmark/L in /area/syndicate_mothership/elite_squad)
+				if(antnum <= 0)
 					break
+				if(L.name == "Syndicate-Commando")
+					syndicate_leader_selected = antnum == 1?1:0
 
-				new_syndicate_commando.key = theghost.key
-				new_syndicate_commando.internal = new_syndicate_commando.s_store
-				new_syndicate_commando.update_action_buttons_icon()
+					var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
 
-				//So they don't forget their code or mission.
+					while((!theghost || !theghost.client) && candidates.len)
+						theghost = pick(candidates)
+						candidates.Remove(theghost)
+
+					if(!theghost)
+						qdel(new_syndicate_commando)
+						break
+
+					new_syndicate_commando.key = theghost.key
+					new_syndicate_commando.internal = new_syndicate_commando.s_store
+					new_syndicate_commando.update_action_buttons_icon()
+
+					//So they don't forget their code or mission.
 
 
-				to_chat(new_syndicate_commando, "<span class='notice'>You are an Elite Syndicate. [!syndicate_leader_selected ? "commando" : "<B>LEADER</B>"] in the service of the Syndicate. \nYour current mission is: <span class='danger'>[input]</span></span>")
+					to_chat(new_syndicate_commando, "<span class='notice'>You are an Elite Syndicate. [!syndicate_leader_selected ? "commando" : "<B>LEADER</B>"] in the service of the Syndicate. \nYour current mission is: <span class='danger'>[input]</span></span>")
 
-				numagents--
-		if(numagents >= 6)
-			return 0
-
-		for(var/obj/effect/landmark/L in /area/shuttle/syndicate_elite)
-			if(L.name == "Syndicate-Commando-Bomb")
-				new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
+					antnum--
 
+			for(var/obj/effect/landmark/L in /area/shuttle/syndicate_elite)
+				if(L.name == "Syndicate-Commando-Bomb")
+					new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
 	return 1
 
 
@@ -411,7 +413,7 @@ client/proc/one_click_antag()
 
 	//Creates mind stuff.
 	new_syndicate_commando.mind_initialize()
-	new_syndicate_commando.mind.assigned_role = "MODE"
+	new_syndicate_commando.mind.assigned_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
 	new_syndicate_commando.mind.special_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
 
 	//Adds them to current traitor list. Which is really the extra antagonist list.
@@ -429,10 +431,12 @@ client/proc/one_click_antag()
 
 	var/leader_chosen = 0 //when the leader is chosen. The last person spawned.
 
+	var/antnum = input(owner, "How many raiders you want to create? Enter 0 to cancel.","Amount:", 0) as num
+	if(!antnum || antnum <= 0)
+		return
 	log_admin("[key_name(owner)] tried making Vox Raiders with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making Vox Raiders with One-Click-Antag")
-
-	//Generates a list of candidates from active ghosts.
+//Generates a list of candidates from active ghosts.
 	for(var/mob/G in respawnable_list)
 		if(istype(G) && G.client && (ROLE_RAIDER in G.client.prefs.be_special))
 			if(player_old_enough_antag(G.client,ROLE_RAIDER))
@@ -455,8 +459,7 @@ client/proc/one_click_antag()
 			candidates.Remove(G)
 
 	if(candidates.len)
-		var/max_raiders = 1
-		var/raiders = max_raiders
+		var/raiders = min(antnum, candidates.len)
 		//Spawns vox raiders and equips them.
 		for(var/obj/effect/landmark/L in world)
 			if(L.name == "voxstart")
@@ -480,8 +483,6 @@ client/proc/one_click_antag()
 				to_chat(new_vox, "<span class='warning'>Don't forget to turn on your nitrogen internals!</span>")
 
 				raiders--
-			if(raiders > max_raiders)
-				return 0
 	else
 		return 0
 	return 1
@@ -534,32 +535,26 @@ client/proc/one_click_antag()
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
+	var/antnum = input(owner, "How many vampires you want to create? Enter 0 to cancel","Amount:", 0) as num
+	if(!antnum || antnum <= 0)
+		return
+
 	log_admin("[key_name(owner)] tried making Vampires with One-Click-Antag")
 	message_admins("[key_name_admin(owner)] tried making Vampires with One-Click-Antag")
 
 	for(var/mob/living/carbon/human/applicant in player_list)
-		if(ROLE_VAMPIRE in applicant.client.prefs.be_special)
-			if(player_old_enough_antag(applicant.client,ROLE_VAMPIRE))
-				if(!applicant.stat)
-					if(applicant.mind)
-						if(!applicant.mind.special_role)
-							if(!jobban_isbanned(applicant, "vampire") && !jobban_isbanned(applicant, "Syndicate"))
-								if(!(applicant.job in temp.restricted_jobs))
-									if(!(applicant.client.prefs.species in temp.protected_species))
-										candidates += applicant
+		if(CandCheck(ROLE_VAMPIRE, applicant, temp))
+			candidates += applicant
 
 	if(candidates.len)
-		var/numVampires = min(candidates.len, 3)
+		var/numVampires = min(candidates.len, antnum)
 
 		for(var/i = 0, i<numVampires, i++)
 			H = pick(candidates)
-			ticker.mode.vampires += H.mind
-			ticker.mode.grant_vampire_powers(H)
-			ticker.mode.update_vampire_icons_added(H.mind)
+			H.mind.make_Vampire()
 			candidates.Remove(H)
 
 		return 1
-
 	return 0
 
 /datum/admins/proc/makeThunderdomeTeams() // Not strictly an antag, but this seemed to be the best place to put it.

code/modules/admin/verbs/onlyone.dm

@@ -3,14 +3,14 @@
 		alert("The game hasn't started yet!")
 		return
 
-	var/list/incompatible_species = list("Plasmaman", "Vox")
+	var/list/incompatible_species = list(/datum/species/plasmaman, /datum/species/vox)
 	for(var/mob/living/carbon/human/H in player_list)
 		if(H.stat == DEAD || !(H.client))
 			continue
 		if(is_special_character(H))
 			continue
-		if(H.species.name in incompatible_species)
-			H.set_species("Human")
+		if(is_type_in_list(H.dna.species, incompatible_species))
+			H.set_species(/datum/species/human)
 			var/datum/preferences/A = new()	// Randomize appearance
 			A.copy_to(H)
 
@@ -49,7 +49,7 @@
 		W.assignment = "Highlander"
 		W.registered_name = H.real_name
 		H.equip_to_slot_or_del(W, slot_wear_id)
-		H.species.after_equip_job(null, H)
+		H.dna.species.after_equip_job(null, H)
 		H.regenerate_icons()
 
 	message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)

code/modules/admin/verbs/onlyoneteam.dm

@@ -3,15 +3,15 @@
 		alert("The game hasn't started yet!")
 		return
 
-	var/list/incompatible_species = list("Plasmaman", "Vox")
+	var/list/incompatible_species = list(/datum/species/plasmaman, /datum/species/vox)
 	var/team_toggle = 0
 	for(var/mob/living/carbon/human/H in player_list)
 		if(H.stat == DEAD || !(H.client))
 			continue
 		if(is_special_character(H))
 			continue
-		if(H.species.name in incompatible_species)
-			H.set_species("Human")
+		if(is_type_in_list(H.dna.species, incompatible_species))
+			H.set_species(/datum/species/human)
 			var/datum/preferences/A = new()	// Randomize appearance
 			A.copy_to(H)
 
@@ -55,7 +55,7 @@
 			H.equip_to_slot_or_del(W, slot_wear_id)
 
 		team_toggle = !team_toggle
-		H.species.after_equip_job(null, H)
+		H.dna.species.after_equip_job(null, H)
 		H.regenerate_icons()
 
 	message_admins("[key_name_admin(usr)] used DODGEBAWWWWWWWL! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)

code/modules/admin/verbs/possess.dm

@@ -9,6 +9,10 @@
 
 	var/turf/T = get_turf(O)
 
+	var/confirm = alert("Are you sure you want to possess [O]?", "Confirm posession", "Yes", "No")
+
+	if(confirm != "Yes")
+		return
 	if(T)
 		log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
 		message_admins("[key_name_admin(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])", 1)
@@ -42,4 +46,4 @@
 	usr.loc = O.loc // Appear where the object you were controlling is -- TLE
 	usr.client.eye = usr
 	usr.control_object = null
-	feedback_add_details("admin_verb","RO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	feedback_add_details("admin_verb","RO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/randomverbs.dm

@@ -141,6 +141,46 @@
 	message_admins("<span class='boldnotice'>DirectNarrate: [key_name_admin(usr)] to ([key_name_admin(M)]): [msg]<BR></span>", 1)
 	feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+
+
+
+/client/proc/cmd_admin_headset_message(mob/M in mob_list)
+	set category = "Event"
+	set name = "Headset Message"
+
+	admin_headset_message(M)
+
+/client/proc/admin_headset_message(mob/M in mob_list, sender = null)
+	var/mob/living/carbon/human/H = M
+
+	if(!check_rights(R_ADMIN))
+		return
+
+	if(!istype(H))
+		to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+		return
+	if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
+		to_chat(usr, "The person you are trying to contact is not wearing a headset")
+		return
+
+	if(!sender)
+		sender = input("Who is the message from?", "Sender") as null|anything in list("Centcomm", "Syndicate")
+		if(!sender)
+			return
+
+	message_admins("[key_name_admin(src)] has started answering [key_name_admin(H)]'s [sender] request.")
+	var/input = input("Please enter a message to reply to [key_name(H)] via their headset.", "Outgoing message from [sender]", "") as text|null
+	if(!input)
+		message_admins("[key_name_admin(src)] decided not to answer [key_name_admin(H)]'s [sender] request.")
+		return
+
+	log_admin("[key_name(src)] replied to [key_name(H)]'s [sender] message with the message [input].")
+	message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"")
+	to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks.  \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"].  Message as follows[sender == "Syndicate" ? ", agent." : ":"] <span class='bold'>[input].</span> Message ends.\"")
+
+
+
+
 /client/proc/cmd_admin_godmode(mob/M as mob in mob_list)
 	set category = "Admin"
 	set name = "Godmode"
@@ -429,7 +469,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	//Announces the character on all the systems, based on the record.
 	if(!issilicon(new_character))//If they are not a cyborg/AI.
-		if(!record_found&&new_character.mind.assigned_role!="MODE")//If there are no records for them. If they have a record, this info is already in there. MODE people are not announced anyway.
+		if(!record_found && new_character.mind.assigned_role != new_character.mind.special_role)//If there are no records for them. If they have a record, this info is already in there. Offstation special characters announced anyway.
 			//Power to the user!
 			if(alert(new_character,"Warning: No data core entry detected. Would you like to announce the arrival of this character by adding them to various databases, such as medical records?",,"No","Yes")=="Yes")
 				data_core.manifest_inject(new_character)

code/modules/admin/verbs/striketeam.dm

@@ -37,8 +37,8 @@ var/global/sent_strike_team = 0
 			break
 
 	// Find ghosts willing to be DS
-	var/list/commando_ckeys = pollCandidatesByKeyWithVeto(src, usr, commandos_possible, "Join the DeathSquad?",, 21, 600, 1, role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE)
-	if(!commando_ckeys.len)
+	var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, commandos_possible, "Join the DeathSquad?",, 21, 600, 1, role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE)
+	if(!commando_ghosts.len)
 		to_chat(usr, "<span class='userdanger'>Nobody volunteered to join the DeathSquad.</span>")
 		return
 
@@ -47,53 +47,62 @@ var/global/sent_strike_team = 0
 	// Spawns commandos and equips them.
 	var/commando_number = commandos_possible //for selecting a leader
 	var/is_leader = TRUE // set to FALSE after leader is spawned
+
 	for(var/obj/effect/landmark/L in landmarks_list)
-		if(commando_number<=0)	break
+
+		if(commando_number <= 0)
+			break
+
 		if(L.name == "Commando")
 
-			spawn(0)
-				var/use_ds_borg = FALSE
-				var/ghost_key // Ghost ckey that we intend to put into the commando. Can remain undefined if we don't have one.
-				if(commando_ckeys.len)
-					ghost_key = pick(commando_ckeys)
-					commando_ckeys -= ghost_key
-					if(!is_leader)
-						var/new_gender = alert(src, "Select Deathsquad Type.", "DS Character Generation", "Organic", "Cyborg")
-						if(new_gender == "Cyborg")
-							use_ds_borg = TRUE
+			if(!commando_ghosts.len)
+				break
 
-				if(use_ds_borg)
-					var/mob/living/silicon/robot/deathsquad/R = new()
-					R.forceMove(get_turf(L))
-					var/rnum = rand(1,1000)
-					var/borgname = "Epsilon [rnum]"
-					R.name = borgname
-					R.custom_name = borgname
-					R.real_name = R.name
-					R.mind = new
-					R.mind.current = R
-					R.mind.original = R
-					R.mind.assigned_role = "MODE"
-					R.mind.special_role = SPECIAL_ROLE_DEATHSQUAD
-					if(!(R.mind in ticker.minds))
-						ticker.minds += R.mind
-					ticker.mode.traitors += R.mind
-					if(ghost_key)
-						R.key = ghost_key
-					if(nuke_code)
-						R.mind.store_memory("<B>Nuke Code:</B> <span class='warning'>[nuke_code].</span>")
-					R.mind.store_memory("<B>Mission:</B> <span class='warning'>[input].</span>")
-					to_chat(R, "<span class='userdanger'>You are a Special Operations cyborg, in the service of Central Command. \nYour current mission is: <span class='danger'>[input]</span></span>")
-				else
-					var/mob/living/carbon/human/new_commando = create_death_commando(L, is_leader)
-					if(ghost_key)
-						new_commando.key = ghost_key
-						new_commando.internal = new_commando.s_store
-						new_commando.update_action_buttons_icon()
-					if(nuke_code)
-						new_commando.mind.store_memory("<B>Nuke Code:</B> <span class='warning'>[nuke_code].</span>")
-					new_commando.mind.store_memory("<B>Mission:</B> <span class='warning'>[input].</span>")
-					to_chat(new_commando, "<span class='userdanger'>You are a Special Ops [is_leader ? "<B>TEAM LEADER</B>" : "commando"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: <span class='danger'>[input]</span></span>")
+			var/use_ds_borg = FALSE
+			var/mob/ghost_mob = pick(commando_ghosts)
+			commando_ghosts -= ghost_mob
+			if(!ghost_mob || !ghost_mob.key || !ghost_mob.client)
+				continue
+
+			if(!is_leader)
+				var/new_dstype = alert(ghost_mob.client, "Select Deathsquad Type.", "DS Character Generation", "Organic", "Cyborg")
+				if(new_dstype == "Cyborg")
+					use_ds_borg = TRUE
+
+			if(!ghost_mob || !ghost_mob.key || !ghost_mob.client) // Have to re-check this due to the above alert() call
+				continue
+
+			if(use_ds_borg)
+				var/mob/living/silicon/robot/deathsquad/R = new()
+				R.forceMove(get_turf(L))
+				var/rnum = rand(1,1000)
+				var/borgname = "Epsilon [rnum]"
+				R.name = borgname
+				R.custom_name = borgname
+				R.real_name = R.name
+				R.mind = new
+				R.mind.current = R
+				R.mind.original = R
+				R.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD
+				R.mind.special_role = SPECIAL_ROLE_DEATHSQUAD
+				if(!(R.mind in ticker.minds))
+					ticker.minds += R.mind
+				ticker.mode.traitors += R.mind
+				R.key = ghost_mob.key
+				if(nuke_code)
+					R.mind.store_memory("<B>Nuke Code:</B> <span class='warning'>[nuke_code].</span>")
+				R.mind.store_memory("<B>Mission:</B> <span class='warning'>[input].</span>")
+				to_chat(R, "<span class='userdanger'>You are a Special Operations cyborg, in the service of Central Command. \nYour current mission is: <span class='danger'>[input]</span></span>")
+			else
+				var/mob/living/carbon/human/new_commando = create_death_commando(L, is_leader)
+				new_commando.mind.key = ghost_mob.key
+				new_commando.key = ghost_mob.key
+				new_commando.internal = new_commando.s_store
+				new_commando.update_action_buttons_icon()
+				if(nuke_code)
+					new_commando.mind.store_memory("<B>Nuke Code:</B> <span class='warning'>[nuke_code].</span>")
+				new_commando.mind.store_memory("<B>Mission:</B> <span class='warning'>[input].</span>")
+				to_chat(new_commando, "<span class='userdanger'>You are a Special Ops [is_leader ? "<B>TEAM LEADER</B>" : "commando"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: <span class='danger'>[input]</span></span>")
 
 			is_leader = FALSE
 			commando_number--
@@ -133,11 +142,12 @@ var/global/sent_strike_team = 0
 		A.real_name = "[commando_rank] [commando_name]"
 	A.copy_to(new_commando)
 
+
 	new_commando.dna.ready_dna(new_commando)//Creates DNA.
 
 	//Creates mind stuff.
 	new_commando.mind_initialize()
-	new_commando.mind.assigned_role = "MODE"
+	new_commando.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD
 	new_commando.mind.special_role = SPECIAL_ROLE_DEATHSQUAD
 	ticker.mode.traitors |= new_commando.mind//Adds them to current traitor list. Which is really the extra antagonist list.
 	new_commando.equip_death_commando(is_leader)

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -45,8 +45,8 @@ var/global/sent_syndicate_strike_team = 0
 			break
 
 	// Find ghosts willing to be SST
-	var/list/commando_ckeys = pollCandidatesByKeyWithVeto(src, usr, syndicate_commandos_possible, "Join the Syndicate Strike Team?",, 21, 600, 1, role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE)
-	if(!commando_ckeys.len)
+	var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, syndicate_commandos_possible, "Join the Syndicate Strike Team?",, 21, 600, 1, role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE)
+	if(!commando_ghosts.len)
 		to_chat(usr, "<span class='userdanger'>Nobody volunteered to join the SST.</span>")
 		return
 
@@ -54,15 +54,29 @@ var/global/sent_syndicate_strike_team = 0
 
 	//Spawns commandos and equips them.
 	for(var/obj/effect/landmark/L in landmarks_list)
-		if(syndicate_commando_number<=0)	break
+
+		if(syndicate_commando_number <= 0)
+			break
+
 		if(L.name == "Syndicate-Commando")
+
+			if(!commando_ghosts.len)
+				break
+
+			var/mob/ghost_mob = pick(commando_ghosts)
+			commando_ghosts -= ghost_mob
+
+			if(!ghost_mob || !ghost_mob.key || !ghost_mob.client)
+				continue
+
 			var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, is_leader)
 
-			if(commando_ckeys.len)
-				new_syndicate_commando.key = pick(commando_ckeys)
-				commando_ckeys -= new_syndicate_commando.key
-				new_syndicate_commando.internal = new_syndicate_commando.s_store
-				new_syndicate_commando.update_action_buttons_icon()
+			if(!new_syndicate_commando)
+				continue
+
+			new_syndicate_commando.key = ghost_mob.key
+			new_syndicate_commando.internal = new_syndicate_commando.s_store
+			new_syndicate_commando.update_action_buttons_icon()
 
 			//So they don't forget their code or mission.
 			if(nuke_code)
@@ -101,7 +115,7 @@ var/global/sent_syndicate_strike_team = 0
 
 	//Creates mind stuff.
 	new_syndicate_commando.mind_initialize()
-	new_syndicate_commando.mind.assigned_role = "MODE"
+	new_syndicate_commando.mind.assigned_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
 	new_syndicate_commando.mind.special_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
 	ticker.mode.traitors |= new_syndicate_commando.mind	//Adds them to current traitor list. Which is really the extra antagonist list.
 	new_syndicate_commando.equip_syndicate_commando(is_leader)