merge conflicts

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>"

code/modules/admin/admin_verbs.dm

@@ -868,10 +868,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!
 
@@ -902,12 +902,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/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"])
@@ -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>")
 
@@ -1683,7 +1683,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 Centcomm", "")
+		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from Centcomm", "")
 		if(!input)	return
 
 		to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -1941,7 +1941,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
@@ -2045,7 +2045,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.")
@@ -2061,7 +2061,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.")
@@ -2727,48 +2727,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")
@@ -2793,7 +2751,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)
@@ -2801,7 +2759,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)
@@ -2809,16 +2767,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")
@@ -2957,13 +2907,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)
@@ -3432,11 +3375,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/atmosdebug.dm

@@ -51,7 +51,7 @@
 		return
 	feedback_add_details("admin_verb","CPOW") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-	for(var/datum/powernet/PN in powernets)
+	for(var/datum/powernet/PN in SSmachines.powernets)
 		if(!PN.nodes || !PN.nodes.len)
 			if(PN.cables && (PN.cables.len > 1))
 				var/obj/structure/cable/C = PN.cables[1]

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)
@@ -387,7 +387,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	if(!check_rights(R_DEBUG))
 		return
 
-	makepowernets()
+	SSmachines.makepowernets()
 	log_admin("[key_name(src)] has remade the powernet. makepowernets() called.")
 	message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
 	feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

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/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

@@ -429,7 +429,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

@@ -5,14 +5,16 @@ var/global/sent_strike_team = 0
 
 /client/proc/strike_team()
 	if(!ticker)
-		to_chat(usr, "<font color='red'>The game hasn't started yet!</font>")
+		to_chat(usr, "<span class='userdanger'>The game hasn't started yet!</span>")
 		return
 	if(sent_strike_team == 1)
-		to_chat(usr, "<font color='red'>CentComm is already sending a team.</font>")
+		to_chat(usr, "<span class='userdanger'>CentComm is already sending a team.</span>")
 		return
 	if(alert("Do you want to send in the CentComm death squad? Once enabled, this is irreversible.",,"Yes","No")!="Yes")
 		return
-	alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned commandos have internals cameras which are viewable through a monitor inside the Spec. Ops. Office. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.")
+	alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned commandos have internals cameras which are viewable through a monitor inside the Spec. Ops. Office. The first one selected/spawned will be the team leader.")
+
+	message_admins("<span class='notice'>[key_name_admin(usr)] has started to spawn a CentComm DeathSquad.</span>", 1)
 
 	var/input = null
 	while(!input)
@@ -25,13 +27,7 @@ var/global/sent_strike_team = 0
 		to_chat(usr, "Looks like someone beat you to it.")
 		return
 
-	sent_strike_team = 1
-
-	shuttle_master.cancelEvac()
-	var/commando_number = commandos_possible //for selecting a leader
-	var/leader_selected = 0 //when the leader is chosen. The last person spawned.
-
-//Code for spawning a nuke auth code.
+	// Find the nuclear auth code
 	var/nuke_code
 	var/temp_code
 	for(var/obj/machinery/nuclearbomb/N in world)
@@ -40,42 +36,78 @@ var/global/sent_strike_team = 0
 			nuke_code = N.r_code
 			break
 
-//Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
-	var/list/candidates = list()	//candidates for being a commando out of all the active ghosts in world.
-	var/list/commandos = list()			//actual commando ghosts as picked by the user.
-	for(var/mob/dead/observer/G	 in player_list)
-		if(!G.client.holder && !G.client.is_afk())	//Whoever called/has the proc won't be added to the list.
-			if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
-				candidates += G.key
-	for(var/i=commandos_possible,(i>0&&candidates.len),i--)//Decrease with every commando selected.
-		var/candidate = input("Pick characters to spawn as the commandos. This will go on until there either no more ghosts to pick from or the slots are full.", "Active Players") as null|anything in candidates	//It will auto-pick a person when there is only one candidate.
-		candidates -= candidate		//Subtract from candidates.
-		commandos += candidate//Add their ghost to commandos.
+	// Find ghosts willing to be DS
+	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
+
+	sent_strike_team = 1
+
+	// 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
 
-//Spawns commandos and equips them.
 	for(var/obj/effect/landmark/L in landmarks_list)
-		if(commando_number<=0)	break
+
+		if(commando_number <= 0)
+			break
+
 		if(L.name == "Commando")
-			leader_selected = commando_number == 1?1:0
 
-			var/mob/living/carbon/human/new_commando = create_death_commando(L, leader_selected)
+			if(!commando_ghosts.len)
+				break
 
-			if(commandos.len)
-				new_commando.key = pick(commandos)
-				commandos -= new_commando.key
+			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>")
 
-			//So they don't forget their code or mission.
-			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='notice'>You are a Special Ops. [!leader_selected ? "commando" : "<B>LEADER</B>"] 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--
 
-//Spawns the rest of the commando gear.
+	//Spawns the rest of the commando gear.
 	for(var/obj/effect/landmark/L in landmarks_list)
 		if(L.name == "Commando_Manual")
 			//new /obj/item/gun/energy/pulse_rifle(L.loc)
@@ -92,43 +124,44 @@ var/global/sent_strike_team = 0
 			new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
 			qdel(L)
 
-	message_admins("<span class='notice'>[key_name_admin(usr)] has spawned a CentComm strike squad.</span>", 1)
+	message_admins("<span class='notice'>[key_name_admin(usr)] has spawned a CentComm DeathSquad.</span>", 1)
 	log_admin("[key_name(usr)] used Spawn Death Squad.")
 	return 1
 
-/client/proc/create_death_commando(obj/spawn_location, leader_selected = 0)
+/client/proc/create_death_commando(obj/spawn_location, is_leader = FALSE)
 	var/mob/living/carbon/human/new_commando = new(spawn_location.loc)
 	var/commando_leader_rank = pick("Lieutenant", "Captain", "Major")
 	var/commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
 	var/commando_name = pick(last_names)
 
 	var/datum/preferences/A = new()//Randomize appearance for the commando.
-	if(leader_selected)
+	if(is_leader)
 		A.age = rand(35,45)
 		A.real_name = "[commando_leader_rank] [commando_name]"
 	else
 		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(leader_selected)
+	new_commando.equip_death_commando(is_leader)
 	return new_commando
 
-/mob/living/carbon/human/proc/equip_death_commando(leader_selected = 0)
+/mob/living/carbon/human/proc/equip_death_commando(is_leader = FALSE)
 
 	var/obj/item/radio/R = new /obj/item/radio/headset/alt(src)
 	R.set_frequency(DTH_FREQ)
 	equip_to_slot_or_del(R, slot_l_ear)
-	if(leader_selected == 0)
-		equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform)
-	else
+	if(is_leader)
 		equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
+	else
+		equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform)
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/advance(src), slot_shoes)
 	equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad(src), slot_wear_suit)
 	equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves)
@@ -143,20 +176,19 @@ var/global/sent_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/flashlight(src), slot_in_backpack)
-	if(!leader_selected)
-		equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
-	else
-		equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack)
+	equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack)
+	if(is_leader)
 		equip_to_slot_or_del(new /obj/item/disk/nuclear(src), slot_in_backpack)
+	else
+		equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
+
 
 	equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber(src), slot_l_store)
 	equip_to_slot_or_del(new /obj/item/shield/energy(src), slot_r_store)
 	equip_to_slot_or_del(new /obj/item/tank/emergency_oxygen/double/full(src), slot_s_store)
 	equip_to_slot_or_del(new /obj/item/gun/projectile/revolver/mateba(src), slot_belt)
-
 	equip_to_slot_or_del(new /obj/item/gun/energy/pulse(src), slot_r_hand)
 
-
 	var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(src)
 	L.implant(src)
 

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -17,7 +17,9 @@ var/global/sent_syndicate_strike_team = 0
 		return
 	if(alert("Do you want to send in the Syndicate Strike Team? Once enabled, this is irreversible.",,"Yes","No")=="No")
 		return
-	alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned syndicates have internals cameras which are viewable through a monitor inside the Syndicate Mothership Bridge. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.")
+	alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned syndicates have internals cameras which are viewable through a monitor inside the Syndicate Mothership Bridge. Assigning the team's detailed task is recommended from there. The first one selected/spawned will be the team leader.")
+
+	message_admins("<span class='notice'>[key_name_admin(usr)] has started to spawn a Syndicate Strike Team.</span>", 1)
 
 	var/input = null
 	while(!input)
@@ -30,15 +32,10 @@ var/global/sent_syndicate_strike_team = 0
 		to_chat(src, "Looks like someone beat you to it.")
 		return
 
-	sent_syndicate_strike_team = 1
-
-	//if(emergency_shuttle.can_recall())
-	//	emergency_shuttle.recall()	//why, exactly? Admins can do this themselves.
-
 	var/syndicate_commando_number = syndicate_commandos_possible //for selecting a leader
-	var/syndicate_leader_selected = 0 //when the leader is chosen. The last person spawned.
+	var/is_leader = TRUE // set to FALSE after leader is spawned
 
-//Code for spawning a nuke auth code.
+	// Find the nuclear auth code
 	var/nuke_code
 	var/temp_code
 	for(var/obj/machinery/nuclearbomb/N in world)
@@ -47,39 +44,48 @@ var/global/sent_syndicate_strike_team = 0
 			nuke_code = N.r_code
 			break
 
-//Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
-	var/list/candidates = list()	//candidates for being a commando out of all the active ghosts in world.
-	var/list/commandos = list()			//actual commando ghosts as picked by the user.
-	for(var/mob/dead/observer/G	 in player_list)
-		if(!G.client.holder && !G.client.is_afk())	//Whoever called/has the proc won't be added to the list.
-			if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
-				candidates += G.key
-	for(var/i=commandos_possible,(i>0&&candidates.len),i--)//Decrease with every commando selected.
-		var/candidate = input("Pick characters to spawn as the commandos. This will go on until there either no more ghosts to pick from or the slots are full.", "Active Players") as null|anything in candidates	//It will auto-pick a person when there is only one candidate.
-		candidates -= candidate		//Subtract from candidates.
-		commandos += candidate//Add their ghost to commandos.
+	// Find ghosts willing to be SST
+	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
 
-//Spawns commandos and equips them.
+	sent_syndicate_strike_team = 1
+
+	//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")
-			syndicate_leader_selected = syndicate_commando_number == 1?1:0
 
-			var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
+			if(!commando_ghosts.len)
+				break
 
-			if(commandos.len)
-				new_syndicate_commando.key = pick(commandos)
-				commandos -= new_syndicate_commando.key
-				new_syndicate_commando.internal = new_syndicate_commando.s_store
-				new_syndicate_commando.update_action_buttons_icon()
+			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(!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)
 				new_syndicate_commando.mind.store_memory("<B>Nuke Code:</B> <span class='warning'>[nuke_code]</span>.")
 			new_syndicate_commando.mind.store_memory("<B>Mission:</B> <span class='warning'>[input]</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>")
+			to_chat(new_syndicate_commando, "<span class='notice'>You are an Elite Syndicate [is_leader ? "<B>TEAM LEADER</B>" : "commando"] in the service of the Syndicate. \nYour current mission is: <span class='userdanger'>[input]</span></span>")
 			new_syndicate_commando.faction += "syndicate"
+			is_leader = FALSE
 			syndicate_commando_number--
 
 	for(var/obj/effect/landmark/L in landmarks_list)
@@ -91,14 +97,14 @@ var/global/sent_syndicate_strike_team = 0
 	log_admin("[key_name(usr)] used Spawn Syndicate Squad.")
 	feedback_add_details("admin_verb","SDTHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0)
+/client/proc/create_syndicate_death_commando(obj/spawn_location, is_leader = FALSE)
 	var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc)
 	var/syndicate_commando_leader_rank = pick("Lieutenant", "Captain", "Major")
 	var/syndicate_commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
 	var/syndicate_commando_name = pick(last_names)
 
 	var/datum/preferences/A = new()//Randomize appearance for the commando.
-	if(syndicate_leader_selected)
+	if(is_leader)
 		A.age = rand(35,45)
 		A.real_name = "[syndicate_commando_leader_rank] [syndicate_commando_name]"
 	else
@@ -109,29 +115,29 @@ 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(syndicate_leader_selected)
+	new_syndicate_commando.equip_syndicate_commando(is_leader)
 	qdel(spawn_location)
 	return new_syndicate_commando
 
-/mob/living/carbon/human/proc/equip_syndicate_commando(syndicate_leader_selected = 0)
+/mob/living/carbon/human/proc/equip_syndicate_commando(is_leader = FALSE)
 
 	var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt/syndteam(src)
 	R.set_frequency(SYNDTEAM_FREQ)
 	equip_to_slot_or_del(R, slot_l_ear)
 	equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), slot_w_uniform)
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_shoes)
-	if(!syndicate_leader_selected)
-		equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/strike(src), slot_wear_suit)
-	else
+	if(is_leader)
 		equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/red/strike(src), slot_wear_suit)
-	equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves)
-	if(!syndicate_leader_selected)
-		equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/strike(src), slot_head)
 	else
+		equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/strike(src), slot_wear_suit)
+	equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves)
+	if(is_leader)
 		equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/red/strike(src), slot_head)
+	else
+		equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/strike(src), slot_head)
 	equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), slot_wear_mask)
 	equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
 
@@ -142,13 +148,12 @@ var/global/sent_syndicate_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/flashlight(src), slot_in_backpack)
-	if(!syndicate_leader_selected)
-		equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
-		equip_to_slot_or_del(new /obj/item/card/emag(src), slot_in_backpack)
-	else
+	if(is_leader)
 		equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack)
 		equip_to_slot_or_del(new /obj/item/disk/nuclear(src), slot_in_backpack)
-
+	else
+		equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
+		equip_to_slot_or_del(new /obj/item/card/emag(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber(src), slot_l_store)
 	equip_to_slot_or_del(new /obj/item/grenade/empgrenade(src), slot_r_store)
 	equip_to_slot_or_del(new /obj/item/tank/emergency_oxygen/double/full(src), slot_s_store)

code/modules/alarm/alarm.dm

@@ -134,5 +134,3 @@
 
 /mob/living/silicon/robot/syndicate/get_alarm_cameras()
 	return list()
-
-#undef ALARM_LOSS_DELAY

code/modules/antagonists/_common/antag_datum.dm

@@ -0,0 +1,137 @@
+GLOBAL_LIST_EMPTY(antagonists)
+
+/datum/antagonist
+	var/name = "Antagonist"
+	var/roundend_category = "other antagonists"				//Section of roundend report, datums with same category will be displayed together, also default header for the section
+	var/show_in_roundend = TRUE								//Set to false to hide the antagonists from roundend report
+	var/datum/mind/owner						//Mind that owns this datum
+	var/silent = FALSE							//Silent will prevent the gain/lose texts to show
+	var/can_coexist_with_others = TRUE			//Whether or not the person will be able to have more than one datum
+	var/list/typecache_datum_blacklist = list()	//List of datums this type can't coexist with
+	var/delete_on_mind_deletion = TRUE
+	var/job_rank
+	var/replace_banned = TRUE //Should replace jobbaned player with ghosts if granted.
+	var/list/objectives = list()
+	var/antag_memory = ""//These will be removed with antag datum
+
+/datum/antagonist/New()
+	GLOB.antagonists += src
+	typecache_datum_blacklist = typecacheof(typecache_datum_blacklist)
+
+/datum/antagonist/Destroy()
+	GLOB.antagonists -= src
+	if(owner)
+		LAZYREMOVE(owner.antag_datums, src)
+	owner = null
+	return ..()
+
+/datum/antagonist/proc/can_be_owned(datum/mind/new_owner)
+	. = TRUE
+	var/datum/mind/tested = new_owner || owner
+	if(tested.has_antag_datum(type))
+		return FALSE
+	for(var/i in tested.antag_datums)
+		var/datum/antagonist/A = i
+		if(is_type_in_typecache(src, A.typecache_datum_blacklist))
+			return FALSE
+
+//This will be called in add_antag_datum before owner assignment.
+//Should return antag datum without owner.
+/datum/antagonist/proc/specialization(datum/mind/new_owner)
+	return src
+
+/datum/antagonist/proc/on_body_transfer(mob/living/old_body, mob/living/new_body)
+	remove_innate_effects(old_body)
+	apply_innate_effects(new_body)
+
+//This handles the application of antag huds/special abilities
+/datum/antagonist/proc/apply_innate_effects(mob/living/mob_override)
+	return
+
+//This handles the removal of antag huds/special abilities
+/datum/antagonist/proc/remove_innate_effects(mob/living/mob_override)
+	return
+
+//Assign default team and creates one for one of a kind team antagonists
+/datum/antagonist/proc/create_team(datum/team/team)
+	return
+
+//Proc called when the datum is given to a mind.
+/datum/antagonist/proc/on_gain()
+	if(owner && owner.current)
+		if(!silent)
+			greet()
+		apply_innate_effects()
+		if(is_banned(owner.current) && replace_banned)
+			replace_banned_player()
+
+/datum/antagonist/proc/is_banned(mob/M)
+	if(!M)
+		return FALSE
+	. = (jobban_isbanned(M, ROLE_SYNDICATE) || (job_rank && jobban_isbanned(M, job_rank)))
+
+/datum/antagonist/proc/replace_banned_player()
+	set waitfor = FALSE
+
+	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a [name]?", job_rank, TRUE, 50)
+	if(LAZYLEN(candidates))
+		var/mob/dead/observer/C = pick(candidates)
+		to_chat(owner, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")
+		message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(owner.current)]) to replace a jobbaned player.")
+		owner.current.ghostize(0)
+		owner.current.key = C.key
+
+/datum/antagonist/proc/on_removal()
+	remove_innate_effects()
+	if(owner)
+		LAZYREMOVE(owner.antag_datums, src)
+		if(!silent && owner.current)
+			farewell()
+		owner.objectives -= objectives
+	var/datum/team/team = get_team()
+	if(team)
+		team.remove_member(owner)
+	qdel(src)
+
+/datum/antagonist/proc/greet()
+	return
+
+/datum/antagonist/proc/farewell()
+	return
+
+
+//Returns the team antagonist belongs to if any.
+/datum/antagonist/proc/get_team()
+	return
+
+//Individual roundend report
+/datum/antagonist/proc/roundend_report()
+	var/list/report = list()
+
+	if(!owner)
+		CRASH("antagonist datum without owner")
+
+	report += printplayer(owner)
+
+	var/objectives_complete = TRUE
+	if(owner.objectives.len)
+		report += printobjectives(owner)
+		for(var/datum/objective/objective in owner.objectives)
+			if(!objective.check_completion())
+				objectives_complete = FALSE
+				break
+
+	if(owner.objectives.len == 0 || objectives_complete)
+		report += "<span class='greentext big'>The [name] was successful!</span>"
+	else
+		report += "<span class='redtext big'>The [name] has failed!</span>"
+
+	return report.Join("<br>")
+
+//Displayed at the start of roundend_category section, default to roundend_category header
+/datum/antagonist/proc/roundend_report_header()
+	return 	"<span class='header'>The [roundend_category] were:</span><br>"
+
+//Displayed at the end of roundend_category section
+/datum/antagonist/proc/roundend_report_footer()
+	return

code/modules/antagonists/_common/antag_helpers.dm

@@ -0,0 +1,19 @@
+//Returns MINDS of the assigned antags of given type/subtypes
+/proc/get_antag_minds(antag_type, specific = FALSE)
+	. = list()
+	for(var/datum/antagonist/A in GLOB.antagonists)
+		if(!A.owner)
+			continue
+		if(!antag_type || !specific && istype(A, antag_type) || specific && A.type == antag_type)
+			. += A.owner
+
+//Get all teams [of type team_type]
+/proc/get_all_teams(team_type)
+	. = list()
+	for(var/V in GLOB.antagonists)
+		var/datum/antagonist/A = V
+		if(!A.owner)
+			continue
+		var/datum/team/T = A.get_team()
+		if(!team_type || istype(T, team_type))
+			. |= T

code/modules/antagonists/_common/antag_hud.dm

@@ -0,0 +1,90 @@
+/datum/atom_hud/antag
+	hud_icons = list(SPECIALROLE_HUD,NATIONS_HUD)
+	var/self_visible = TRUE
+
+/datum/atom_hud/antag/hidden
+	self_visible = FALSE
+
+/datum/atom_hud/antag/proc/join_hud(mob/M, slave)
+	//sees_hud should be set to 0 if the mob does not get to see it's own hud type.
+	if(!istype(M))
+		CRASH("join_hud(): [M] ([M.type]) is not a mob!")
+	if(M.mind.antag_hud && !slave) //note: please let this runtime if a mob has no mind, as mindless mobs shouldn't be getting antagged
+		M.mind.antag_hud.leave_hud(M)
+	add_to_hud(M)
+	if(self_visible)
+		add_hud_to(M)
+	M.mind.antag_hud = src
+
+/datum/atom_hud/antag/proc/leave_hud(mob/M)
+	if(!M)
+		return
+	if(!istype(M))
+		CRASH("leave_hud(): [M] ([M.type]) is not a mob!")
+	remove_from_hud(M)
+	remove_hud_from(M)
+	if(M.mind)
+		M.mind.antag_hud = null
+
+
+//GAME_MODE PROCS
+//called to set a mob's antag icon state
+/proc/set_antag_hud(mob/M, new_icon_state)
+	if(!istype(M))
+		CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!")
+	var/image/holder = M.hud_list[SPECIALROLE_HUD]
+	if(holder)
+		holder.icon_state = new_icon_state
+	if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime
+		M.mind.antag_hud_icon_state = new_icon_state
+
+//Nations Icons
+/proc/set_nations_hud(mob/M, new_icon_state)
+	if(!istype(M))
+		CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!")
+	var/image/holder = M.hud_list[NATIONS_HUD]
+	if(holder)
+		holder.icon_state = new_icon_state
+	if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime
+		M.mind.antag_hud_icon_state = new_icon_state
+
+//MIND PROCS
+//these are called by mind.transfer_to()
+/datum/mind/proc/transfer_antag_huds(datum/atom_hud/antag/newhud)
+	leave_all_huds()
+	set_antag_hud(current, antag_hud_icon_state)
+	if(newhud)
+		newhud.join_hud(current)
+
+/datum/mind/proc/leave_all_huds()
+	for(var/datum/atom_hud/antag/hud in huds)
+		if(current in hud.hudusers)
+			hud.leave_hud(current)
+
+	for(var/datum/atom_hud/data/hud in huds)
+		if(current in hud.hudusers)
+			hud.remove_hud_from(current)
+
+
+///Master Servent Datum Sytems,Based on TG Gang system//
+
+/datum/mindslaves
+	var/name = "ERROR"
+	var/list/datum/mind/masters = list()
+	var/list/datum/mind/serv = list()
+	var/datum/atom_hud/antag/thrallhud
+	var/icontype
+
+/datum/mindslaves/New(loc,mastername)
+
+	name = mastername
+	thrallhud = new()
+
+/datum/mindslaves/proc/add_serv_hud(datum/mind/serv_mind, icon)
+	thrallhud.join_hud(serv_mind.current, 1)
+	icontype = "hud[icon]"
+	set_antag_hud(serv_mind.current, icontype)
+
+/datum/mindslaves/proc/leave_serv_hud(datum/mind/free_mind)
+	thrallhud.leave_hud(free_mind.current)
+	set_antag_hud(free_mind.current, null)

code/modules/antagonists/_common/antag_spawner.dm

@@ -0,0 +1,138 @@
+/obj/item/antag_spawner
+	throw_speed = 1
+	throw_range = 5
+	w_class = WEIGHT_CLASS_TINY
+	var/used = FALSE
+
+/obj/item/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "")
+	return
+
+/obj/item/antag_spawner/proc/equip_antag(mob/target)
+	return
+
+
+/obj/item/antag_spawner/borg_tele
+	name = "syndicate cyborg teleporter"
+	desc = "A single-use teleporter used to deploy a Syndicate Cyborg on the field."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "locator"
+	var/checking = FALSE
+	var/TC_cost = 0
+	var/borg_to_spawn
+	var/list/possible_types = list("Assault", "Medical")
+
+/obj/item/antag_spawner/borg_tele/attack_self(mob/user)
+	if(used)
+		to_chat(user, "<span class='warning'>[src] is out of power!</span>")
+		return
+	if(!(user.mind in ticker.mode.syndicates))
+		to_chat(user, "<span class='danger'>AUTHENTICATION FAILURE. ACCESS DENIED.</span>")
+		return FALSE
+	if(checking)
+		to_chat(user, "<span class='warning'>[src] is already checking for possible borgs.</span>")
+		return
+	borg_to_spawn = input("What type of borg would you like to teleport?", "Cyborg Type", type) as null|anything in possible_types
+	if(!borg_to_spawn || checking || used)
+		return
+	checking = TRUE
+	to_chat(user, "<span class='notice'>The device is now checking for possible borgs.</span>")
+	var/list/borg_candidates = pollCandidates("Do you want to play as a Syndicate [borg_to_spawn] borg?", ROLE_OPERATIVE, 1)
+	if(borg_candidates.len > 0 && !used)
+		checking = FALSE
+		used = TRUE
+		var/mob/M = pick(borg_candidates)
+		var/client/C = M.client
+		spawn_antag(C, get_turf(src.loc), "syndieborg")
+	else
+		checking = FALSE
+		to_chat(user, "<span class='notice'>Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.</span>")
+		return
+
+/obj/item/antag_spawner/borg_tele/spawn_antag(client/C, turf/T, type = "")
+	if(!borg_to_spawn) //If there's no type at all, let it still be used but don't do anything
+		used = FALSE
+		return
+	var/datum/effect_system/spark_spread/S = new /datum/effect_system/spark_spread
+	S.set_up(4, 1, src)
+	S.start()
+	var/mob/living/silicon/robot/R
+	switch(borg_to_spawn)
+		if("Medical")
+			R = new /mob/living/silicon/robot/syndicate/medical(T)
+		else
+			R = new /mob/living/silicon/robot/syndicate(T) //Assault borg by default
+	R.key = C.key
+	ticker.mode.syndicates += R.mind
+	ticker.mode.update_synd_icons_added(R.mind)
+	R.mind.special_role = SPECIAL_ROLE_NUKEOPS
+	R.faction = list("syndicate")
+
+/obj/item/antag_spawner/slaughter_demon //Warning edgiest item in the game
+	name = "vial of blood"
+	desc = "A magically infused bottle of blood, distilled from countless murder victims. Used in unholy rituals to attract horrifying creatures."
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "vial"
+	var/shatter_msg = "<span class='notice'>You shatter the bottle, no \
+		turning back now!</span>"
+	var/veil_msg = "<span class='warning'>You sense a dark presence lurking \
+		just beyond the veil...</span>"
+	var/objective_verb = "Kill"
+	var/mob/living/demon_type = /mob/living/simple_animal/slaughter
+
+/obj/item/antag_spawner/slaughter_demon/attack_self(mob/user)
+	if(level_blocks_magic(user.z))//this is to make sure the wizard does NOT summon a demon from the Den..
+		to_chat(user, "<span class='notice'>You should probably wait until you reach the station.</span>")
+		return
+
+	if(used)
+		to_chat(user, "<span class='notice'>This bottle already has a broken seal.</span>")
+		return
+	used = TRUE
+	to_chat(user, "<span class='notice'>You break the seal on the bottle, calling upon the dire spirits of the underworld...</span>")
+
+	var/list/candidates = pollCandidates("Do you want to play as a slaughter demon summoned by [user.real_name]?", ROLE_DEMON, 1, 100)
+
+	if(candidates.len > 0)
+		var/mob/C = pick(candidates)
+		spawn_antag(C, get_turf(src.loc), initial(demon_type.name), user)
+		to_chat(user, "[shatter_msg]")
+		to_chat(user, "[veil_msg]")
+		playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
+		qdel(src)
+	else
+		used = FALSE
+		to_chat(user, "<span class='notice'>The demons do not respond to your summon. Perhaps you should try again later.</span>")
+
+/obj/item/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "", mob/user)
+	var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T)
+	var/mob/living/simple_animal/slaughter/S = new demon_type(holder)
+	S.vialspawned = TRUE
+	S.holder = holder
+	S.key = C.key
+	S.mind.assigned_role = S.name
+	S.mind.special_role = S.name
+	ticker.mode.traitors += S.mind
+	var/datum/objective/assassinate/KillDaWiz = new /datum/objective/assassinate
+	KillDaWiz.owner = S.mind
+	KillDaWiz.target = user.mind
+	KillDaWiz.explanation_text = "[objective_verb] [user.real_name], the one who was foolish enough to summon you."
+	S.mind.objectives += KillDaWiz
+	var/datum/objective/KillDaCrew = new /datum/objective
+	KillDaCrew.owner = S.mind
+	KillDaCrew.explanation_text = "[objective_verb] everyone else while you're at it."
+	S.mind.objectives += KillDaCrew
+	S.mind.objectives += KillDaCrew
+	to_chat(S, "<B>Objective #[1]</B>: [KillDaWiz.explanation_text]")
+	to_chat(S, "<B>Objective #[2]</B>: [KillDaCrew.explanation_text]")
+
+
+/obj/item/antag_spawner/slaughter_demon/laughter
+	name = "vial of tickles"
+	desc = "A magically infused bottle of clown love, distilled from \
+		countless hugging attacks. Used in funny rituals to attract \
+		adorable creatures."
+	color = "#FF69B4" // HOT PINK
+	veil_msg = "<span class='warning'>You sense an adorable presence \
+		lurking just beyond the veil...</span>"
+	objective_verb = "Hug and Tickle"
+	demon_type = /mob/living/simple_animal/slaughter/laughter

code/modules/antagonists/_common/antag_team.dm

@@ -0,0 +1,24 @@
+//A barebones antagonist team.
+/datum/team
+	var/list/datum/mind/members = list()
+	var/name = "team"
+	var/member_name = "member"
+	var/list/objectives = list() //common objectives, these won't be added or removed automatically, subtypes handle this, this is here for bookkeeping purposes.
+
+/datum/team/New(starting_members)
+	. = ..()
+	if(starting_members)
+		if(islist(starting_members))
+			for(var/datum/mind/M in starting_members)
+				add_member(M)
+		else
+			add_member(starting_members)
+
+/datum/team/proc/is_solo()
+	return members.len == 1
+
+/datum/team/proc/add_member(datum/mind/new_member)
+	members |= new_member
+
+/datum/team/proc/remove_member(datum/mind/member)
+	members -= member

code/modules/antagonists/wishgranter/wishgranter.dm

@@ -0,0 +1,81 @@
+/datum/antagonist/wishgranter
+	name = "Wishgranter Avatar"
+
+/datum/antagonist/wishgranter/proc/forge_objectives()
+	var/datum/objective/hijack/hijack = new
+	hijack.owner = owner
+	objectives += hijack
+	owner.objectives |= objectives
+
+/datum/antagonist/wishgranter/on_gain()
+	owner.special_role = "Avatar of the Wish Granter"
+	forge_objectives()
+	. = ..()
+	give_powers()
+
+/datum/antagonist/wishgranter/greet()
+	to_chat(owner.current, "<B>Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!</B>")
+	owner.announce_objectives()
+
+/datum/antagonist/wishgranter/proc/give_powers()
+	var/mob/living/carbon/human/H = owner.current
+	if(!istype(H))
+		return
+	H.ignore_gene_stability = TRUE
+	H.dna.SetSEState(HULKBLOCK, TRUE)
+	genemutcheck(H, HULKBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(XRAYBLOCK, TRUE)
+	genemutcheck(H, XRAYBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(FIREBLOCK, TRUE)
+	genemutcheck(H, FIREBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(COLDBLOCK, TRUE)
+	genemutcheck(H, COLDBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(TELEBLOCK, TRUE)
+	genemutcheck(H, TELEBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(INCREASERUNBLOCK, TRUE)
+	genemutcheck(H, INCREASERUNBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(BREATHLESSBLOCK, TRUE)
+	genemutcheck(H, BREATHLESSBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(REGENERATEBLOCK, TRUE)
+	genemutcheck(H, REGENERATEBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(SHOCKIMMUNITYBLOCK, TRUE)
+	genemutcheck(H, SHOCKIMMUNITYBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(SMALLSIZEBLOCK, TRUE)
+	genemutcheck(H, SMALLSIZEBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(SOBERBLOCK, TRUE)
+	genemutcheck(H, SOBERBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(PSYRESISTBLOCK, TRUE)
+	genemutcheck(H, PSYRESISTBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(SHADOWBLOCK, TRUE)
+	genemutcheck(H, SHADOWBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(CRYOBLOCK, TRUE)
+	genemutcheck(H, CRYOBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(EATBLOCK, TRUE)
+	genemutcheck(H, EATBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(JUMPBLOCK, TRUE)
+	genemutcheck(H, JUMPBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(SUPERFARTBLOCK, TRUE)
+	genemutcheck(H, SUPERFARTBLOCK, null, MUTCHK_FORCED)
+
+	H.dna.SetSEState(IMMOLATEBLOCK, TRUE)
+	genemutcheck(H, IMMOLATEBLOCK, null, MUTCHK_FORCED)
+
+	H.mutations.Add(LASER)
+	H.update_mutations()
+	H.update_body()

code/modules/arcade/mob_hunt/battle_computer.dm

@@ -27,11 +27,11 @@
 	team = "Blue"
 	avatar_y_offset = 1
 
-/obj/machinery/computer/mob_battle_terminal/red/initialize()
+/obj/machinery/computer/mob_battle_terminal/red/Initialize()
 	..()
 	check_connection()
 
-/obj/machinery/computer/mob_battle_terminal/blue/initialize()
+/obj/machinery/computer/mob_battle_terminal/blue/Initialize()
 	..()
 	check_connection()
 

code/modules/assembly/bomb.dm

@@ -45,13 +45,13 @@
 	if((istype(W, /obj/item/weldingtool) && W:welding))
 		if(!status)
 			status = 1
-			bombers += "[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]"
-			msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]")
+			investigate_log("[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", INVESTIGATE_BOMB)
+			msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", ATKLOG_FEW)
 			log_game("[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature - T0C]")
 			to_chat(user, "<span class='notice'>A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.</span>")
 		else
 			status = 0
-			bombers += "[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]"
+			investigate_log("[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", INVESTIGATE_BOMB)
 			to_chat(user, "<span class='notice'>The hole has been closed.</span>")
 	add_fingerprint(user)
 	..()

code/modules/assembly/igniter.dm

@@ -28,7 +28,7 @@
 		if(istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
 			var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
 			if(tank)
-				tank.boom()
+				tank.boom(TRUE)
 		if(istype(src.loc.loc, /obj/item/reagent_containers/glass/beaker/))
 			var/obj/item/reagent_containers/glass/beaker/beakerbomb = src.loc.loc
 			if(beakerbomb)
@@ -41,4 +41,4 @@
 /obj/item/assembly/igniter/attack_self(mob/user as mob)
 	activate()
 	add_fingerprint(user)
-	return
+	return

code/modules/assembly/mousetrap.dm

@@ -75,7 +75,7 @@
 				if(!user.hand)
 					which_hand = "r_hand"
 				triggered(user, which_hand)
-				user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking their fingers.</span>", \
+				user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking [user.p_their()] fingers.</span>", \
 									 "<span class='warning'>You accidentally trigger [src]!</span>")
 				return
 			to_chat(user, "<span class='notice'>You disarm [src].</span>")
@@ -91,7 +91,7 @@
 				if(!user.hand)
 					which_hand = "r_hand"
 				triggered(user, which_hand)
-				user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking their fingers.</span>", \
+				user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking [user.p_their()] fingers.</span>", \
 									 "<span class='warning'>You accidentally trigger [src]!</span>")
 				return
 		..()
@@ -114,7 +114,7 @@
 
 	on_found(mob/finder as mob)
 		if(armed)
-			finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking their fingers.</span>", \
+			finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking [finder.p_their()] fingers.</span>", \
 								   "<span class='warning'>You accidentally trigger [src]!</span>")
 			triggered(finder, finder.hand ? "l_hand" : "r_hand")
 			return 1	//end the search!

code/modules/assembly/signaler.dm

@@ -23,7 +23,8 @@
 	if(radio_controller)
 		set_frequency(frequency)
 
-/obj/item/assembly/signaler/initialize()
+/obj/item/assembly/signaler/Initialize()
+	..()
 	if(radio_controller)
 		set_frequency(frequency)
 

code/modules/assembly/timer.dm

@@ -114,7 +114,7 @@
 			timing = !timing
 			if(timing && istype(holder, /obj/item/transfer_valve))
 				message_admins("[key_name_admin(usr)] activated [src] attachment on [holder].")
-				bombers += "[key_name(usr)] activated [src] attachment for [loc]"
+				investigate_log("[key_name(usr)] activated [src] attachment for [loc]", INVESTIGATE_BOMB)
 				log_game("[key_name(usr)] activated [src] attachment for [loc]")
 			update_icon()
 		if(href_list["reset"])

code/modules/awaymissions/corpse.dm

@@ -29,7 +29,8 @@
 	var/brute_damage = 0
 	var/oxy_damage = 0
 
-/obj/effect/landmark/corpse/initialize()
+/obj/effect/landmark/corpse/Initialize()
+	..()
 	if(istype(src,/obj/effect/landmark/corpse/clown))
 		var/obj/effect/landmark/corpse/clown/C = src
 		C.chooseRank()

code/modules/awaymissions/gateway.dm

@@ -9,7 +9,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
 	unacidable = 1
 	var/active = 0
 
-/obj/machinery/gateway/initialize()
+/obj/machinery/gateway/Initialize()
 	..()
 	update_icon()
 	update_density_from_dir()
@@ -44,7 +44,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
 	if(!the_gateway)
 		the_gateway = src
 
-/obj/machinery/gateway/centerstation/initialize()
+/obj/machinery/gateway/centerstation/Initialize()
 	..()
 	update_icon()
 	wait = world.time + config.gateway_delay	//+ thirty minutes default
@@ -170,7 +170,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
 	var/obj/machinery/gateway/centeraway/stationgate = null
 
 
-/obj/machinery/gateway/centeraway/initialize()
+/obj/machinery/gateway/centeraway/Initialize()
 	..()
 	update_icon()
 	stationgate = locate(/obj/machinery/gateway/centerstation) in world

code/modules/awaymissions/loot.dm

@@ -5,7 +5,8 @@
 	var/lootdoubles = 0		//if the same item can be spawned twice
 	var/loot = ""			//a list of possible items to spawn- a string of paths
 
-/obj/effect/spawner/away/lootdrop/initialize()
+/obj/effect/spawner/away/lootdrop/Initialize()
+	..()
 	var/list/things = params2list(loot)
 
 	if(things && things.len)

code/modules/awaymissions/map_rng.dm

@@ -18,13 +18,8 @@
 		template_name = tname
 	if(template_name)
 		template = map_templates[template_name]
-	// Catches the interim-zone of worldstart and roundstart
-	// I want both the ticker to exist (so mapped-in maploaders don't trip this)
-	// but also not have started yet (since the zlevel system would handle this on its own otherwise)
-	if((ticker && ticker.current_state < GAME_STATE_PLAYING))
-		attempt_init()
 
-/obj/effect/landmark/map_loader/initialize()
+/obj/effect/landmark/map_loader/Initialize()
 	..()
 	if(template)
 		load(template)
@@ -48,7 +43,7 @@
 /obj/effect/landmark/map_loader/random
 	var/template_list = ""
 
-/obj/effect/landmark/map_loader/random/initialize()
+/obj/effect/landmark/map_loader/random/Initialize()
 	..()
 	if(template_list)
 		template_name = safepick(splittext(template_list, ";"))

code/modules/awaymissions/maploader/reader.dm

@@ -422,13 +422,6 @@ var/global/dmm_suite/preloader/_preloader = new
 
 	return to_return
 
-//atom creation method that preloads variables at creation
-/atom/New()
-	if(use_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
-		_preloader.load(src)
-
-	. = ..()
-
 /dmm_suite/Destroy()
 	..()
 	return QDEL_HINT_HARDDEL_NOW

code/modules/awaymissions/mission_code/spacehotel.dm

@@ -54,7 +54,7 @@
 	name = "space hotel pamphlet"
 	info = "<h3>Welcome to Deep Space Hotel 419!</h3>Thank you for choosing our hotel. Simply hand your credit or debit card to the concierge and get your room key! To check out, hand your credit card back.<small><h4>Conditions:</h4><ul><li>The hotel is not responsible for any losses due to time or space anomalies.<li>The hotel is not responsible for events that occur outside of the hotel station, including, but not limited to, events that occur inside of dimensional pockets.<li>The hotel is not responsible for overcharging your account.<li>The hotel is not responsible for missing persons.<li>The hotel is not responsible for mind-altering effects due to drugs, magic, demons, or space worms.</ul></small>"
 
-/obj/effect/landmark/map_loader/hotel_room/initialize()
+/obj/effect/landmark/map_loader/hotel_room/Initialize()
 	..()
 	// load and randomly assign rooms
 	var/global/list/south_room_templates = list()
@@ -299,6 +299,4 @@
 		return
 
 	S.retal_target = target
-	S.retal = 1
-
-#undef CHECKOUT_TIME
+	S.retal = 1

code/modules/awaymissions/zvis.dm

@@ -22,7 +22,7 @@
 	..()
 	levels += src
 
-/obj/effect/levelref/initialize()
+/obj/effect/levelref/Initialize()
 	..()
 	for(var/obj/effect/levelref/O in levels)
 		if(id == O.id && O != src)
@@ -161,7 +161,7 @@
 	..()
 	portals += src
 
-/obj/effect/view_portal/initialize()
+/obj/effect/view_portal/Initialize()
 	..()
 	if(id)
 		for(var/obj/effect/view_portal/O in portals)

code/modules/client/preference/preferences.dm

@@ -54,15 +54,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		return max(0, days - C.player_age)
 	return 0
 
-//used for alternate_option
-#define GET_RANDOM_JOB 0
-#define BE_CIVILIAN 1
-#define RETURN_TO_LOBBY 2
-
 #define MAX_SAVE_SLOTS 20 // Save slots for regular players
 #define MAX_SAVE_SLOTS_MEMBER 20 // Save slots for BYOND members
 
-
 #define TAB_CHAR 0
 #define TAB_GAME 1
 #define TAB_GEAR 2
@@ -96,6 +90,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	var/UI_style_alpha = 255
 	var/windowflashing = TRUE
 	var/clientfps = 0
+	var/atklog = ATKLOG_ALL
 
 	//ghostly preferences
 	var/ghost_anonsay = 0
@@ -209,6 +204,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
 
 	max_gear_slots = config.max_loadout_points
+	var/loaded_preferences_successfully = FALSE
 	if(istype(C))
 		if(!IsGuestKey(C.key))
 			unlock_content = C.IsByondMember()
@@ -217,16 +213,17 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			if(C.donator_level >= DONATOR_LEVEL_ONE)
 				max_gear_slots += 5
 
-	var/loaded_preferences_successfully = load_preferences(C)
-	if(loaded_preferences_successfully)
-		if(load_character(C))
-			return
+		loaded_preferences_successfully = load_preferences(C) // Do not call this with no client/C, it generates a runtime / SQL error
+		if(loaded_preferences_successfully)
+			if(load_character(C))
+				return
 	//we couldn't load character data so just randomize the character appearance + name
 	random_character()		//let's create a random character then - rather than a fat, bald and naked man.
 	real_name = random_name(gender)
-	if(!loaded_preferences_successfully)
-		save_preferences(C)
-	save_character(C)		//let's save this new random character so it doesn't keep generating new ones.
+	if(istype(C))
+		if(!loaded_preferences_successfully)
+			save_preferences(C) // Do not call this with no client/C, it generates a runtime / SQL error
+		save_character(C)		// Do not call this with no client/C, it generates a runtime / SQL error
 
 /datum/preferences/proc/color_square(colour)
 	return "<span style='font-face: fixedsys; background-color: [colour]; color: [colour]'>___</span>"
@@ -699,7 +696,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	switch(alternate_option)
 		if(GET_RANDOM_JOB)
 			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Get random job if preferences unavailable</font></a></u></center><br>"
-		if(BE_CIVILIAN)
+		if(BE_ASSISTANT)
 			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Be a civilian if preferences unavailable</font></a></u></center><br>"
 		if(RETURN_TO_LOBBY)
 			HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Return to lobby if preferences unavailable</font></a></u></center><br>"
@@ -1051,7 +1048,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				ResetJobs()
 				SetChoices(user)
 			if("random")
-				if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_CIVILIAN)
+				if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_ASSISTANT)
 					alternate_option += 1
 				else if(alternate_option == RETURN_TO_LOBBY)
 					alternate_option = 0

code/modules/client/preference/preferences_mysql.dm

@@ -17,7 +17,8 @@
 					windowflashing,
 					ghost_anonsay,
 					exp,
-					clientfps
+					clientfps,
+					atklog
 					FROM [format_table_name("player")]
 					WHERE ckey='[C.ckey]'"}
 					)
@@ -48,6 +49,7 @@
 		ghost_anonsay = text2num(query.item[15])
 		exp = query.item[16]
 		clientfps = text2num(query.item[17])
+		atklog = text2num(query.item[18])
 
 	//Sanitize
 	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
@@ -66,6 +68,7 @@
 	ghost_anonsay = sanitize_integer(ghost_anonsay, 0, 1, initial(ghost_anonsay))
 	exp	= sanitize_text(exp, initial(exp))
 	clientfps = sanitize_integer(clientfps, 0, 1000, initial(clientfps))
+	atklog = sanitize_integer(atklog, 0, 100, initial(atklog))
 	return 1
 
 /datum/preferences/proc/save_preferences(client/C)
@@ -85,6 +88,7 @@
 					be_role='[sanitizeSQL(list2params(be_special))]',
 					default_slot='[default_slot]',
 					toggles='[toggles]',
+					atklog='[atklog]',
 					sound='[sound]',
 					randomslot='[randomslot]',
 					volume='[volume]',
@@ -93,7 +97,8 @@
 					lastchangelog='[lastchangelog]',
 					windowflashing='[windowflashing]',
 					ghost_anonsay='[ghost_anonsay]',
-					clientfps='[clientfps]'
+					clientfps='[clientfps]',
+					atklog='[atklog]'
 					WHERE ckey='[C.ckey]'"}
 					)
 

code/modules/clothing/clothing.dm

@@ -411,7 +411,7 @@ BLIND     // can't see anything
 				desc = "[desc] They have had their toes opened up."
 				update_icon()
 			else
-				to_chat(user, "<span class='notice'>[src] have already had their toes cut open!</span>")
+				to_chat(user, "<span class='notice'>[src] have already had [p_their()] toes cut open!</span>")
 			return
 	else
 		..()
@@ -489,7 +489,7 @@ BLIND     // can't see anything
 									for(var/obj/item/I in O.contents) //Dump the pocket out onto the floor below the user.
 										user.unEquip(I,1)
 
-					user.visible_message("<span class='warning'>[user] bellows, [pick("shredding", "ripping open", "tearing off")] their jacket in a fit of rage!</span>","<span class='warning'>You accidentally [pick("shred", "rend", "tear apart")] \the [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")]!</span>")
+					user.visible_message("<span class='warning'>[user] bellows, [pick("shredding", "ripping open", "tearing off")] [user.p_their()] jacket in a fit of rage!</span>","<span class='warning'>You accidentally [pick("shred", "rend", "tear apart")] [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")]!</span>")
 					user.unEquip(src)
 					qdel(src) //Now that the pockets have been emptied, we can safely destroy the jacket.
 					user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))

code/modules/clothing/gloves/miscellaneous.dm

@@ -132,3 +132,14 @@
 			cell.forceMove(get_turf(loc))
 			cell = null
 			update_icon()
+
+/obj/item/clothing/gloves/fingerless/rapid
+	name = "Gloves of the North Star"
+	desc = "Just looking at these fills you with an urge to beat the shit out of people."
+
+/obj/item/clothing/gloves/fingerless/rapid/Touch(mob/living/target, proximity = TRUE)
+	var/mob/living/M = loc
+
+	if(M.a_intent == INTENT_HARM)
+		M.changeNext_move(CLICK_CD_RAPID)
+	.= FALSE

code/modules/clothing/head/misc.dm

@@ -222,7 +222,7 @@
 		return 1
 
 /obj/item/clothing/head/fedora/proc/tip_fedora(mob/user)
-	user.visible_message("[user] tips their fedora.", "You tip your fedora")
+	user.visible_message("[user] tips [user.p_their()] fedora.", "You tip your fedora")
 
 
 /obj/item/clothing/head/fez

code/modules/clothing/masks/miscellaneous.dm

@@ -8,7 +8,7 @@
 	gas_transfer_coefficient = 0.90
 	put_on_delay = 20
 	var/resist_time = 0 //deciseconds of how long you need to gnaw to get rid of the gag, 0 to make it impossible to remove
-	var/mute = MUTE_ALL
+	var/mute = MUZZLE_MUTE_ALL
 	var/security_lock = FALSE // Requires brig access to remove 0 - Remove as normal
 	var/locked = FALSE //Indicates if a mask is locked, should always start as 0.
 	species_fit = list("Vox")
@@ -22,8 +22,8 @@
 		return 0
 	else if(security_lock && locked)
 		if(do_unlock(user))
-			visible_message("<span class='danger'>[user] unlocks their [src.name].</span>", \
-								"<span class='userdanger'>[user] unlocks their [src.name].</span>")
+			visible_message("<span class='danger'>[user] unlocks [user.p_their()] [src.name].</span>", \
+								"<span class='userdanger'>[user] unlocks [user.p_their()] [src.name].</span>")
 	..()
 	return 1
 
@@ -93,7 +93,7 @@
 	item_state = null
 	w_class = WEIGHT_CLASS_TINY
 	resist_time = 150
-	mute = MUTE_MUFFLE
+	mute = MUZZLE_MUTE_MUFFLE
 	flags = DROPDEL
 	species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey")
 	sprite_sheets = list(
@@ -117,7 +117,7 @@
 	name = "safety muzzle"
 	desc = "A muzzle designed to prevent biting."
 	resist_time = 600
-	mute = MUTE_NONE
+	mute = MUZZLE_MUTE_NONE
 	security_lock = TRUE
 	locked = FALSE
 
@@ -169,7 +169,7 @@
 		return 1
 
 /obj/item/clothing/mask/fakemoustache/proc/pontificate(mob/user)
-	user.visible_message("<span class='danger'>\ [user] twirls \his moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly")]!</span>")
+	user.visible_message("<span class='danger'>\ [user] twirls [user.p_their()] moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly")]!</span>")
 
 //scarves (fit in in mask slot)
 

code/modules/clothing/shoes/magboots.dm

@@ -6,6 +6,7 @@
 	var/magboot_state = "magboots"
 	var/magpulse = 0
 	var/slowdown_active = 2
+	var/slowdown_passive = SHOES_SLOWDOWN
 	actions_types = list(/datum/action/item_action/toggle)
 	strip_delay = 70
 	put_on_delay = 70
@@ -14,7 +15,7 @@
 /obj/item/clothing/shoes/magboots/attack_self(mob/user)
 	if(magpulse)
 		flags &= ~NOSLIP
-		slowdown = SHOES_SLOWDOWN
+		slowdown = slowdown_passive
 	else
 		flags |= NOSLIP
 		slowdown = slowdown_active
@@ -53,4 +54,18 @@
 obj/item/clothing/shoes/magboots/syndie/advance //For the Syndicate Strike Team
 	desc = "Reverse-engineered magboots that appear to be based on an advanced model, as they have a lighter magnetic pull. Property of Gorlex Marauders."
 	name = "advanced blood-red magboots"
-	slowdown_active = SHOES_SLOWDOWN
+	slowdown_active = SHOES_SLOWDOWN
+
+/obj/item/clothing/shoes/magboots/clown
+	desc = "The prankster's standard-issue clowning shoes. Damn they're huge! There's a red light on the side."
+	name = "clown shoes"
+	icon_state = "clownmag0"
+	magboot_state = "clownmag"
+	item_state = "clown_shoes"
+	slowdown = SHOES_SLOWDOWN+1
+	slowdown_active = SHOES_SLOWDOWN+1
+	slowdown_passive = SHOES_SLOWDOWN+1
+	item_color = "clown"
+	silence_steps = 1
+	shoe_sound = "clownstep"
+	origin_tech = "magnets=4;syndicate=2"

code/modules/clothing/spacesuits/ert.dm

@@ -9,9 +9,10 @@
 	var/obj/machinery/camera/camera
 	var/has_camera = TRUE
 	strip_delay = 130
-	species_fit = list("Grey")
+	species_fit = list("Grey", "Vox")
 	sprite_sheets = list(
-		"Grey" = 'icons/mob/species/grey/helmet.dmi'
+		"Grey" = 'icons/mob/species/grey/helmet.dmi',
+		"Vox" = 'icons/mob/species/vox/helmet.dmi'
 		)
 
 /obj/item/clothing/head/helmet/space/hardsuit/ert/attack_self(mob/user)
@@ -41,9 +42,10 @@
 	/obj/item/radio, /obj/item/analyzer, /obj/item/gun/energy/laser, /obj/item/gun/energy/pulse, \
 	/obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun)
 	strip_delay = 130
-	species_fit = list("Drask")
+	species_fit = list("Drask", "Vox")
 	sprite_sheets = list(
-		"Drask" = 'icons/mob/species/drask/suit.dmi'
+		"Drask" = 'icons/mob/species/drask/suit.dmi',
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
 		)
 
 //Commander

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -71,6 +71,11 @@
 	allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/tank,/obj/item/kitchen/knife/combat)
 	armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20)
 	strip_delay = 120
+	species_restricted = list("exclude", "Diona", "Wryn")
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		)
 
 /obj/item/clothing/head/helmet/space/deathsquad/beret
 	name = "officer's beret"

code/modules/clothing/spacesuits/rig/rig.dm

@@ -366,7 +366,7 @@
 				correct_piece.icon_state = "[initial(icon_state)]"
 				switch(msg_type)
 					if("boots")
-						to_chat(wearer, "<font color='blue'>\The [correct_piece] relax their grip on your legs.</font>")
+						to_chat(wearer, "<font color='blue'>\The [correct_piece] relax [correct_piece.p_their()] grip on your legs.</font>")
 						if(user != wearer)
 							to_chat(user, "<span class='notice'>\The [correct_piece] has been unsealed.</span>")
 						wearer.update_inv_shoes()

code/modules/clothing/suits/bio.dm

@@ -9,6 +9,10 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	burn_state = FIRE_PROOF
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/helmet.dmi'
+		)
 
 /obj/item/clothing/suit/bio_suit
 	name = "bio suit"

code/modules/clothing/suits/utility.dm

@@ -77,7 +77,7 @@
 	burn_state = FIRE_PROOF
 	species_fit = list("Vox")
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/head.dmi'
+		"Vox" = 'icons/mob/species/vox/helmet.dmi'
 		)
 
 /obj/item/clothing/suit/bomb_suit
@@ -108,16 +108,12 @@
 /obj/item/clothing/head/bomb_hood/security
 	icon_state = "bombsuitsec"
 	item_state = "bombsuitsec"
-	species_fit = null
-	sprite_sheets = null
 
 
 /obj/item/clothing/suit/bomb_suit/security
 	icon_state = "bombsuitsec"
 	item_state = "bombsuitsec"
 	allowed = list(/obj/item/gun/energy,/obj/item/melee/baton,/obj/item/restraints/handcuffs)
-	species_fit = null
-	sprite_sheets = null
 
 /*
  * Radiation protection

code/modules/clothing/under/accessories/accessory.dm

@@ -131,7 +131,7 @@
 /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
 	if(ishuman(M) && isliving(user))
 		if(user == M)
-			user.visible_message("[user] places \the [src] against \his chest and listens attentively.", "You place \the [src] against your chest...")
+			user.visible_message("[user] places [src] against [user.p_their()] chest and listens attentively.", "You place [src] against your chest...")
 		else
 			user.visible_message("[user] places \the [src] against [M]'s chest and listens attentively.", "You place \the [src] against [M]'s chest...")
 		var/obj/item/organ/internal/H = M.get_int_organ(/obj/item/organ/internal/heart)
@@ -250,7 +250,7 @@
 		to_chat(user, "Waving around a badge before swiping an ID would be pretty pointless.")
 		return
 	if(isliving(user))
-		user.visible_message("<span class='warning'>[user] displays their Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.</span>","<span class='warning'>You display your Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.</span>")
+		user.visible_message("<span class='warning'>[user] displays [user.p_their()] Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.</span>","<span class='warning'>You display your Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.</span>")
 
 /obj/item/clothing/accessory/holobadge/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
 	if(istype(O, /obj/item/card/id) || istype(O, /obj/item/pda))
@@ -284,7 +284,7 @@
 
 /obj/item/clothing/accessory/holobadge/attack(mob/living/carbon/human/M, mob/living/user)
 	if(isliving(user))
-		user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into their face insistently. You are the law.</span>")
+		user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into [M.p_their()] face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into [M.p_their()] face insistently. You are the law.</span>")
 
 /obj/item/storage/box/holobadge
 	name = "holobadge box"

code/modules/clothing/under/jobs/civilian.dm

@@ -69,9 +69,10 @@
 	item_state = "clown"
 	item_color = "clown"
 	flags_size = ONESIZEFITSALL
+	var/honk_sound = 'sound/items/bikehorn.ogg'
 
 /obj/item/clothing/under/rank/clown/hit_reaction()
-	playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
+	playsound(loc, honk_sound, 50, 1, -1)
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
 		if(H.mind && H.mind.assigned_role == "Clown")

code/modules/customitems/item_defines.dm

@@ -46,7 +46,7 @@
 	var/mob/living/carbon/human/target = M
 
 	if(istype(target.species, /datum/species/machine))
-		to_chat(user, "<span class= 'notice'>[target] has no skin, how do you expect to tattoo them?</span>")
+		to_chat(user, "<span class= 'notice'>[target] has no skin, how do you expect to tattoo [target.p_them()]?</span>")
 		return
 
 	if(target.m_styles["body"] != "None")
@@ -497,8 +497,8 @@
 #undef USED_MOD_SUIT
 
 /obj/item/fluff/merchant_sallet_modkit //Travelling Merchant: Trav Noble. This is what they spawn in with
-	name = "sallet modkit"
-	desc = "A modkit that can make most helmets look like a steel sallet."
+	name = "SG Helmet modkit"
+	desc = "A modkit that can make most helmets look like a Shellguard Helmet."
 	icon_state = "modkit"
 	w_class = WEIGHT_CLASS_SMALL
 	force = 0
@@ -649,49 +649,49 @@
 	icon_state = "kakicharakiti"
 
 /obj/item/clothing/head/helmet/fluff/merchant_sallet //Travelling Merchant: Trav Noble. This >>IS NOT<< what they spawn in with
-	name = "Steel Sallet"
-	desc = "A heavy steel sallet with the word Noble scratched into the side. Comes with a Bevor attached."
+	name = "Shellguard Helmet"
+	desc = "A Shellguard Helmet with the name Noble written on the inside."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "merchant_sallet_visor_bevor"
 	item_state = "merchant_sallet_visor_bevor"
 	actions_types = list(/datum/action/item_action/toggle_helmet_mode)
 	toggle_cooldown = 20
-	toggle_sound = 'sound/items/ZippoClose.ogg'
+	toggle_sound = 'sound/items/change_jaws.ogg'
 	flags = BLOCKHAIR
 	flags_inv = HIDEEYES|HIDEMASK|HIDEFACE|HIDEEARS
-	var/state = "Visor & Bevor"
+	var/state = "Soldier Up"
 
 /obj/item/clothing/head/helmet/fluff/merchant_sallet/attack_self(mob/user)
 	if(!user.incapacitated() && (world.time > cooldown + toggle_cooldown) && Adjacent(user))
 		var/list/options = list()
-		options["Visor & Bevor"] = list(
+		options["Soldier Up"] = list(
 			"icon_state"	= "merchant_sallet_visor_bevor",
-			"visor_flags"	= HIDEEYES,
-			"mask_flags"	= HIDEMASK|HIDEFACE
-			)
-		options["Visor Only"] = list(
-			"icon_state"	= "merchant_sallet_visor",
-			"visor_flags"	= HIDEEYES,
-			"mask_flags"	= HIDEFACE
-			)
-		options["Bevor Only"] = list(
-			"icon_state"	= "merchant_sallet_bevor",
-			"visor_flags"	= null,
-			"mask_flags"	= HIDEMASK|HIDEFACE
-			)
-		options["Neither Visor nor Bevor"] = list(
-			"icon_state"	= "merchant_sallet",
 			"visor_flags"	= null,
 			"mask_flags"	= null
 			)
+		options["Soldier Down"] = list(
+			"icon_state"	= "merchant_sallet_visor",
+			"visor_flags"	= HIDEEYES,
+			"mask_flags"	= HIDEMASK|HIDEFACE
+			)
+		options["Technician Up"] = list(
+			"icon_state"	= "merchant_sallet_bevor",
+			"visor_flags"	= null,
+			"mask_flags"	= null
+			)
+		options["Technician Down"] = list(
+			"icon_state"	= "merchant_sallet",
+			"visor_flags"	= HIDEEYES,
+			"mask_flags"	= HIDEMASK|HIDEFACE
+			)
 
-		var/choice = input(user, "How would you like to adjust the sallet?", "Adjust Sallet") as null|anything in options
+		var/choice = input(user, "How would you like to adjust the helmet?", "Adjust Helmet") as null|anything in options
 
 		if(choice && choice != state && !user.incapacitated() && Adjacent(user))
 			var/list/new_state = options[choice]
 			icon_state = new_state["icon_state"]
 			state = choice
-			to_chat(user, "You adjust the sallet.")
+			to_chat(user, "You adjust the helmet.")
 			playsound(src.loc, "[toggle_sound]", 100, 0, 4)
 			user.update_inv_head()
 			return 1
@@ -1265,6 +1265,8 @@
 	name = "engraved hand mirror"
 	desc = "A very classy hand mirror, with fancy detailing."
 	icon = 'icons/obj/custom_items.dmi'
+	lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
 	icon_state = "hand_mirror"
 	attack_verb = list("smacked")
 	hitsound = 'sound/weapons/tap.ogg'
@@ -1311,6 +1313,8 @@
 	name = "Classy victorian suit"
 	desc = "A blue and black victorian suit with silver buttons, very fancy!"
 	icon = 'icons/obj/custom_items.dmi'
+	lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
 	icon_state = "victorianlightfire"
 	item_state = "victorianvest"
 	item_color = "victorianlightfire"
@@ -1330,7 +1334,7 @@
 		to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
 		return
 
-	to_chat(user, "<span class='notice'>You modify the appearance of [target] based on the kite blueprints.</span>")
+	to_chat(user, "<span class='notice'>You modify the appearance of [target] based on the kit blueprints.</span>")
 	var/obj/spacepod/pod = target
 	pod.icon = 'icons/48x48/custom_pod.dmi'
 	pod.icon_state = "pod_dece"
@@ -1350,9 +1354,36 @@
 	item_state = "teri_horn"
 	honk_sound = 'sound/items/teri_horn.ogg'
 
-/obj/item/clothing/accessory/medal/fluff/elo
+/obj/item/clothing/accessory/medal/fluff/elo	//V-Force_Bomber: E.L.O.
 	name = "distinguished medal of loyalty and excellence"
 	desc = "This medal is cut into the shape of a Victoria Cross, and is awarded to those who have proven themselves to Nanotrasen with a long and successful career."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "elo-medal"
-	item_color = "elo-medal"
+	item_color = "elo-medal"
+
+/obj/item/clothing/suit/fluff/vetcoat //Furasian: Fillmoore Grayson
+	name = "Veteran Coat"
+	desc = "An old, yet well-kept Nanotrasen uniform. Very few of its kind are still produced."
+	icon = 'icons/obj/custom_items.dmi'
+	lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
+	icon_state = "alchemistcoatblack"
+	item_state = "alchemistcoatblack"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+
+/obj/item/clothing/suit/fluff/vetcoat/red //Furasian: Fillmoore Grayson
+	icon_state = "alchemistcoatred"
+	item_state = "alchemistcoatred"
+
+/obj/item/clothing/suit/fluff/vetcoat/navy //Furasian: Fillmoore Grayson
+	icon_state = "alchemistcoatnavy"
+	item_state = "alchemistcoatnavy"
+
+/obj/item/clothing/accessory/medal/fluff/panzermedal //PanzerSkull: GRN-DER
+	name = "Cross of Valor"
+	desc = "A medal from the bygone Asteroid Wars. Its Ruby shines with a strange intensity."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "panzermedal"
+	item_state = "panzermedal"
+	item_color = "panzermedal"
+	slot_flags = SLOT_TIE

code/modules/economy/ATM.dm

@@ -38,7 +38,7 @@ log transactions
 	..()
 	machine_id = "[station_name()] RT #[num_financial_terminals++]"
 
-/obj/machinery/atm/initialize()
+/obj/machinery/atm/Initialize()
 	..()
 	reconnect_database()
 
@@ -122,6 +122,8 @@ log transactions
 	if(issilicon(user))
 		to_chat(user, "<span class='warning'>Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005.</span>")
 		return
+	if(!linked_db)
+		reconnect_database()
 	ui_interact(user)
 
 /obj/machinery/atm/attack_ghost(mob/user)
@@ -199,12 +201,9 @@ log transactions
 					authenticated_account.security_level = new_sec_level
 			if("attempt_auth")
 				if(linked_db)
-					// check if they have low security enabled
-					scan_user(usr)
-
-					if(!ticks_left_locked_down && held_card)
+					if(!ticks_left_locked_down)
 						var/tried_account_num = text2num(href_list["account_num"])
-						if(!tried_account_num)
+						if(!tried_account_num && held_card)
 							tried_account_num = held_card.associated_account_number
 						var/tried_pin = text2num(href_list["account_pin"])
 
@@ -323,30 +322,3 @@ log transactions
 //create the most effective combination of notes to make up the requested amount
 /obj/machinery/atm/proc/withdraw_arbitrary_sum(arbitrary_sum)
 	new /obj/item/stack/spacecash(get_step(get_turf(src), turn(dir, 180)), arbitrary_sum)
-
-//stolen wholesale and then edited a bit from newscasters, which are awesome and by Agouri
-/obj/machinery/atm/proc/scan_user(mob/living/carbon/human/H)
-	if(!authenticated_account && linked_db)
-		if(H.wear_id)
-			var/obj/item/card/id/I
-			if(istype(H.wear_id, /obj/item/card/id) )
-				I = H.wear_id
-			else if(istype(H.wear_id, /obj/item/pda) )
-				var/obj/item/pda/P = H.wear_id
-				I = P.id
-			if(I)
-				authenticated_account = attempt_account_access(I.associated_account_number)
-				if(authenticated_account)
-					to_chat(H, "[bicon(src)]<span class='notice'>Access granted. Welcome user '[authenticated_account.owner_name].'</span>")
-
-					//create a transaction log entry
-					var/datum/transaction/T = new()
-					T.target_name = authenticated_account.owner_name
-					T.purpose = "Remote terminal access"
-					T.source_terminal = machine_id
-					T.date = current_date_string
-					T.time = station_time_timestamp()
-					authenticated_account.transaction_log.Add(T)
-
-					view_screen = NO_SCREEN
-					SSnanoui.update_uis(src)

code/modules/economy/Economy.dm

@@ -38,7 +38,7 @@
 #define MINERALS 8
 
 #define EMERGENCY 9
-#define GAS 10
+#define EGAS 10
 #define MAINTENANCE 11
 #define ELECTRICAL 12
 #define ROBOTICS 13

code/modules/economy/Economy_Events.dm

@@ -29,16 +29,16 @@
 			if(INDUSTRIAL_ACCIDENT)
 				dearer_goods = list(EMERGENCY, BIOMEDICAL, ROBOTICS)
 			if(BIOHAZARD_OUTBREAK)
-				dearer_goods = list(BIOMEDICAL, GAS)
+				dearer_goods = list(BIOMEDICAL, EGAS)
 			if(PIRATES)
 				dearer_goods = list(SECURITY, MINERALS)
 			if(CORPORATE_ATTACK)
 				dearer_goods = list(SECURITY, MAINTENANCE)
 			if(ALIEN_RAIDERS)
 				dearer_goods = list(BIOMEDICAL, ANIMALS)
-				cheaper_goods = list(GAS, MINERALS)
+				cheaper_goods = list(EGAS, MINERALS)
 			if(AI_LIBERATION)
-				dearer_goods = list(EMERGENCY, GAS, MAINTENANCE)
+				dearer_goods = list(EMERGENCY, EGAS, MAINTENANCE)
 			if(MOURNING)
 				cheaper_goods = list(MINERALS, MAINTENANCE)
 			if(CULT_CELL_REVEALED)

code/modules/error_handler/error_handler.dm

@@ -96,7 +96,7 @@ var/total_runtimes_skipped = 0
 
 	// Now to actually output the error info...
 	log_world("\[[time_stamp()]] Runtime in [e.file],[e.line]: [e]")
-	log_runtime_txt("\[[time_stamp()]] Runtime in [e.file],[e.line]: [e]")
+	log_runtime_txt("Runtime in [e.file],[e.line]: [e]")
 	for(var/line in desclines)
 		log_world(line)
 		log_runtime_txt(line)

code/modules/events/aurora_caelus.dm

@@ -6,11 +6,11 @@
 	var/aurora_progress = 0 //this cycles from 1 to 7, slowly changing colors from gentle green to gentle blue
 
 /datum/event/aurora_caelus/announce()
-	event_announcement.Announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull.\
-Nanotrasen has approved a short break for all employees to relax and observe this very rare event.\
-During this time, starlight will be bright but gentle, shifting between quiet green and blue colors.\
-Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space.\
-We hope you enjoy the lights.", "Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meterology Divison")
+	event_announcement.Announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. \
+Nanotrasen has approved a short break for all employees to relax and observe this very rare event. \
+During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. \
+Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. \
+We hope you enjoy the lights.", "Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meteorology Division")
 	for(var/V in player_list)
 		var/mob/M = V
 		if((M.client.prefs.toggles & SOUND_MIDI) && is_station_level(M.z))
@@ -37,10 +37,10 @@ We hope you enjoy the lights.", "Harmless ions approaching", new_sound = 'sound/
 	for(var/s in GLOB.station_level_space_turfs)
 		var/turf/space/S = s
 		fade_to_black(S)
-	event_announcement.Announce("The aurora caelus event is now ending. Starlight conditions will slowly return to normal.\
-When this has concluded, please return to your workplace and continue work as normal.\
+	event_announcement.Announce("The Aurora Caelus event is now ending. Starlight conditions will slowly return to normal. \
+When this has concluded, please return to your workplace and continue work as normal. \
 Have a pleasant shift, [station_name()], and thank you for watching with us.",
-"Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meterology Divison")
+"Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meteorology Division")
 
 /datum/event/aurora_caelus/proc/fade_to_black(turf/space/S)
 	set waitfor = FALSE
@@ -48,4 +48,4 @@ Have a pleasant shift, [station_name()], and thank you for watching with us.",
 	while(S.light_range > new_light)
 		S.set_light(S.light_range - 0.2)
 		sleep(30)
-	S.set_light(new_light, 1, l_color = "") // we should be able to use `, null` as the last arg but BYOND is a piece of FUCKING SHIT AND SET_LIGHT DOESN'T WORK THAT WAY DESPITE EVERY FUCKING THING ABOUT IT INDICATING THAT IT GODDAMN WELL SHOULD AAAAAAAAAAAAAAAAA
+	S.set_light(new_light, 1, l_color = "") // we should be able to use `, null` as the last arg but BYOND is a piece of FUCKING SHIT AND SET_LIGHT DOESN'T WORK THAT WAY DESPITE EVERY FUCKING THING ABOUT IT INDICATING THAT IT GODDAMN WELL SHOULD AAAAAAAAAAAAAAAAA

code/modules/events/disease_outbreak.dm

@@ -11,7 +11,7 @@
 
 /datum/event/disease_outbreak/start()
 	if(!virus_type)
-		virus_type = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis)
+		virus_type = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis, /datum/disease/beesease, /datum/disease/anxiety, /datum/disease/fake_gbs, /datum/disease/fluspanish, /datum/disease/pierrot_throat, /datum/disease/lycan)
 
 	for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
 		if(issmall(H)) //don't infect monkies; that's a waste

code/modules/events/infestation.dm

@@ -107,7 +107,6 @@
 #undef LOC_HYDRO
 #undef LOC_VAULT
 #undef LOC_TECH
-#undef LOC_TACTICAL
 
 #undef VERM_MICE
 #undef VERM_LIZARDS

code/modules/events/ion_storm.dm

@@ -493,7 +493,7 @@
 /proc/generate_static_ion_law()
 	/var/list/players = list()
 	for(var/mob/living/carbon/human/player in player_list)
-		if(	!player.mind || player.mind.assigned_role == "MODE" || player.client.inactivity > MinutesToTicks(10))
+		if(	!player.mind || player.mind.assigned_role == player.mind.special_role || player.client.inactivity > MinutesToTicks(10))
 			continue
 		players += player.real_name
 	var/random_player = "The Captain"

code/modules/events/radiation_storm.dm

@@ -1,70 +1,11 @@
-/datum/event/radiation_storm
-	announceWhen	= 1
-	var/safe_zones = list(
-		/area/maintenance,
-		/area/crew_quarters/sleep,
-		/area/security/brig,
-		/area/shuttle,
-		/area/vox_station,
-		/area/syndicate_station
-		)
-
+/datum/event/radiation_storm/setup()
+	startWhen = 3
+	endWhen = startWhen + 1
+	announceWhen = 1
 
 /datum/event/radiation_storm/announce()
-	// Don't do anything, we want to pack the announcement with the actual event
-
-/datum/event/radiation_storm/proc/is_safe_zone(var/area/A)
-	for(var/szt in safe_zones)
-		if(istype(A, szt))
-			return 1
-	return 0
+	priority_announcement.Announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
+	//sound not longer matches the text, but an audible warning is probably good
 
 /datum/event/radiation_storm/start()
-	spawn()
-		event_announcement.Announce("High levels of radiation detected near the station. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
-
-		for(var/area/A in world)
-			if(!is_station_level(A.z) || is_safe_zone(A))
-				continue
-			A.radiation_alert()
-
-		make_maint_all_access()
-
-		sleep(600)
-
-		event_announcement.Announce("The station has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert")
-
-		for(var/i = 0, i < 10, i++)
-			for(var/mob/living/carbon/human/H in living_mob_list)
-				var/armor = H.getarmor(type = "rad")
-				if((RADIMMUNE in H.species.species_traits) || armor >= 100) // Leave radiation-immune species/fully rad armored players completely unaffected
-					continue
-				var/turf/T = get_turf(H)
-				if(!T)
-					continue
-				if(!is_station_level(T.z) || is_safe_zone(T.loc))
-					continue
-
-				if(istype(H,/mob/living/carbon/human))
-					H.apply_effect((rand(15,35)),IRRADIATE,0)
-					if(prob(5))
-						H.apply_effect((rand(40,70)),IRRADIATE,0)
-						if(prob(75))
-							randmutb(H) // Applies bad mutation
-							domutcheck(H,null,1)
-						else
-							randmutg(H) // Applies good mutation
-							domutcheck(H,null,1)
-
-			sleep(100)
-
-		event_announcement.Announce("The station has passed the radiation belt. Please report to medbay if you experience any unusual symptoms. Maintenance will lose all access again shortly.", "Anomaly Alert")
-
-		for(var/area/A in world)
-			if(!is_station_level(A.z) || is_safe_zone(A))
-				continue
-			A.reset_radiation_alert()
-
-		sleep(600) // Want to give them time to get out of maintenance.
-
-		revoke_maint_all_access()
+	SSweather.run_weather(/datum/weather/rad_storm)

code/modules/fish/fish_items.dm

@@ -26,7 +26,7 @@
 	throw_range = 7
 
 	suicide_act(mob/user)			//"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw
-		to_chat(viewers(user), "<span class='warning'>[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide.</span>")
+		to_chat(viewers(user), "<span class='warning'>[user] places the [src.name] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 		return(OXYLOSS)
 
 /obj/item/fishfood
@@ -52,7 +52,7 @@
 	attack_verb = list("scrubbed", "brushed", "scraped")
 
 	suicide_act(mob/user)
-		to_chat(viewers(user), "<span class='warning'>[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide.</span>")
+		to_chat(viewers(user), "<span class='warning'>[user] is vigorously scrubbing [user.p_them()]self raw with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 		return(BRUTELOSS|FIRELOSS)
 
 //////////////////////////////////////////////

code/modules/fish/fishtank.dm

@@ -1,6 +1,6 @@
 
 //////////////////////////////
-//		Fish Tanks!			//
+//		Fish Tanks			//
 //////////////////////////////
 
 
@@ -9,44 +9,41 @@
 	desc = "So generic, it might as well have no description at all."
 	icon = 'icons/obj/fish_items.dmi'
 	icon_state = "tank1"
-	density = 0
-	anchored = 0
+	density = FALSE
+	anchored = FALSE
 	pass_flags = 0
 
 	var/tank_type = ""			// Type of aquarium, used for icon updating
 	var/water_capacity = 0		// Number of units the tank holds (varies with tank type)
 	var/water_level = 0			// Number of units currently in the tank (new tanks start empty)
 	var/light_switch = 0		// 0 = off, 1 = on (off by default)
-	var/filth_level = 0.0		// How dirty the tank is (max 10)
+	var/filth_level = 0		// How dirty the tank is (max 10)
 	var/lid_switch = 0			// 0 = open, 1 = closed (open by default)
 	var/max_fish = 0			// How many fish the tank can support (varies with tank type, 1 fish per 50 units sounds reasonable)
 	var/food_level = 0			// Amount of fishfood floating in the tank (max 10)
 	var/fish_count = 0			// Number of fish in the tank
-	var/list/fish_list = null	// Tracks the current types of fish in the tank
+	var/list/fish_list = list()	// Tracks the current types of fish in the tank
 	var/egg_count = 0			// How many fish eggs can be harvested from the tank (capped at the max_fish value)
-	var/list/egg_list = null	// Tracks the current types of harvestable eggs in the tank
+	var/list/egg_list = list()	// Tracks the current types of harvestable eggs in the tank
 
-	var/has_lid = 0				// 0 if the tank doesn't have a lid/light, 1 if it does
-	var/max_health = 0			// Can handle a couple hits
-	var/cur_health = 0			// Current health, starts at max_health
-	var/leaking = 0				// 0 if not leaking, 1 if minor leak, 2 if major leak (not leaking by default)
+	var/has_lid = FALSE			// 0 if the tank doesn't have a lid/light, 1 if it does
+	var/leaking = FALSE			// 0 if not leaking, 1 if minor leak, 2 if major leak (not leaking by default)
 	var/shard_count = 0			// Number of glass shards to salvage when broken (1 less than the number of sheets to build the tank)
 
 /obj/machinery/fishtank/bowl
 	name = "fish bowl"
 	desc = "A small bowl capable of housing a single fish, commonly found on desks. This one has a tiny treasure chest in it!"
 	icon_state = "bowl1"
-	density = 0					// Small enough to not block stuff
-	anchored = 0				// Small enough to move even when filled
+	density = FALSE				// Small enough to not block stuff
+	anchored = FALSE			// Small enough to move even when filled
 	pass_flags = PASSTABLE | LETPASSTHROW // Just like at the county fair, you can't seem to throw the ball in to win the goldfish, and it's small enough to pull onto a table
 
 	tank_type = "bowl"
 	water_capacity = 50			// Not very big, therefore it can't hold much
 	max_fish = 1				// What a lonely fish
 
-	has_lid = 0
-	max_health = 15				// Not very sturdy
-	cur_health = 15
+	has_lid = FALSE
+	max_integrity = 15				// Not very sturdy
 	shard_count = 0				// No salvageable shards
 
 /obj/machinery/fishtank/tank
@@ -54,17 +51,16 @@
 	desc = "A large glass tank designed to house aquatic creatures. Contains an integrated water circulation system."
 	icon = 'icons/obj/fish_items.dmi'
 	icon_state = "tank1"
-	density = 1
-	anchored = 1
+	density = TRUE
+	anchored = TRUE
 	pass_flags = LETPASSTHROW
 
 	tank_type = "tank"
 	water_capacity = 200		// Decent sized, holds almost 2 full buckets
 	max_fish = 4				// Room for a few fish
 
-	has_lid = 1
-	max_health = 50				// Average strength, will take a couple hits from a toolbox.
-	cur_health = 50
+	has_lid = TRUE
+	max_integrity = 50				// Average strength, will take a couple hits from a toolbox.
 	shard_count = 2
 
 
@@ -72,17 +68,16 @@
 	name = "wall aquarium"
 	desc = "This aquarium is massive! It completely occupies the same space as a wall, and looks very sturdy too!"
 	icon_state = "wall1"
-	density = 1
-	anchored = 1
+	density = TRUE
+	anchored = TRUE
 	pass_flags = 0				// This thing is the size of a wall, you can't throw past it.
 
 	tank_type = "wall"
 	water_capacity = 500		// This thing fills an entire tile, it holds a lot.
 	max_fish = 10				// Plenty of room for a lot of fish
 
-	has_lid = 1
-	max_health = 100			// This thing is a freaking wall, it can handle abuse.
-	cur_health = 100
+	has_lid = TRUE
+	max_integrity = 100			// This thing is a freaking wall, it can handle abuse.
 	shard_count = 3
 
 
@@ -94,9 +89,10 @@
 	set name = "Toggle Tank Lid"
 	set category = "Object"
 	set src in view(1)
-	toggle_lid(usr)
 
-/obj/machinery/fishtank/proc/toggle_lid(var/mob/living/user)
+	toggle_lid()
+
+/obj/machinery/fishtank/proc/toggle_lid()
 	lid_switch = !lid_switch
 	update_icon()
 
@@ -104,12 +100,13 @@
 	set name = "Toggle Tank Light"
 	set category = "Object"
 	set src in view(1)
-	toggle_light(usr)
 
-/obj/machinery/fishtank/proc/toggle_light(var/mob/living/user)
+	toggle_light()
+
+/obj/machinery/fishtank/proc/toggle_light()
 	light_switch = !light_switch
 	if(light_switch)
-		set_light(2,2,"#a0a080")
+		set_light(2, 2, "#a0a080")
 	else
 		adjust_tank_light()
 
@@ -119,8 +116,6 @@
 
 /obj/machinery/fishtank/New()
 	..()
-	fish_list = new/list()
-	egg_list = new/list()
 	if(!has_lid)				//Tank doesn't have a lid/light, remove the verbs for then
 		verbs -= /obj/machinery/fishtank/verb/toggle_lid_verb
 		verbs -= /obj/machinery/fishtank/verb/toggle_light_verb
@@ -154,7 +149,8 @@
 		overlays += "over_leak_[leaking]"				//Green if we aren't leaking, light blue and slow blink if minor link, dark blue and rapid flashing for major leak
 
 	//Update water overlay
-	if(water_level == 0) return							//Skip the rest of this if there is no water in the aquarium
+	if(!water_level)
+		return							//Skip the rest of this if there is no water in the aquarium
 	var/water_type = "_clean"							//Default to clean water
 	if(filth_level > 5)	water_type = "_dirty"			//Show dirty water above filth_level 5 (breeding threshold)
 	if(water_level > (water_capacity * 0.85))			//Show full if the water_level is over 85% of water_capacity
@@ -162,15 +158,13 @@
 	else if(water_level > (water_capacity * 0.35))		//Show half-full if the water_level is over 35% of water_capacity
 		overlays += "over_[tank_type]_half[water_type]"
 
-	return
-
 //////////////////////////////
 //		PROCESS PROC		//
 //////////////////////////////
 
 //Stops atmos from passing wall tanks, since they are effectively full-windows.
-/obj/machinery/fishtank/wall/CanAtmosPass(var/turf/T)
-	return 0
+/obj/machinery/fishtank/wall/CanAtmosPass(turf/T)
+	return FALSE
 
 /obj/machinery/fishtank/process()
 	//Start by counting fish in the tank
@@ -238,9 +232,7 @@
 	adjust_tank_light()
 
 /obj/machinery/fishtank/proc/adjust_tank_light()
-	if(light_switch)								//tank light overrides fish lights
-		return
-	else
+	if(!light_switch)								//tank light overrides fish lights
 		var/glo_light = 0
 		for(var/datum/fish/fish in fish_list)
 			if(istype(fish, /datum/fish/glofish))
@@ -261,19 +253,13 @@
 	food_level = min(10, max(0, food_level + amount))
 
 /obj/machinery/fishtank/proc/check_health()
-	//Max value check
-	if(cur_health > max_health)						//Cur_health cannot exceed max_health, set it to max_health if it does
-		cur_health = max_health
 	//Leaking status check
-	if(cur_health <= (max_health * 0.25))			//Major leak at or below 25% health (-10 water/cycle)
+	if(obj_integrity <= (max_integrity * 0.25))			//Major leak at or below 25% health (-10 water/cycle)
 		leaking = 2
-	else if(cur_health <= (max_health * 0.5))		//Minor leak at or below 50% health (-1 water/cycle)
+	else if(obj_integrity <= (max_integrity * 0.5))		//Minor leak at or below 50% health (-1 water/cycle)
 		leaking = 1
 	else											//Not leaking above 50% health
 		leaking = 0
-	//Destruction check
-	if(cur_health <= 0)								//The tank is broken, destroy it
-		destroy()
 
 /obj/machinery/fishtank/proc/kill_fish(datum/fish/fish_type = null)
 	//Check if we were passed a fish to kill, otherwise kill a random one
@@ -292,12 +278,12 @@
 		fish_list.Add(fish_type)					//Add a fish of the specified type
 		fish_count++								//Increase fish_count to reflect the introduction of a fish, so the everything else works fine
 		//Announce the new fish
-		visible_message("A new [fish_type.fish_name] has hatched in \the [src]!")
+		visible_message("A new [fish_type.fish_name] has hatched in [src]!")
 	//Null type fish are dud eggs, give a message to inform the player
 	else
 		to_chat(usr, "The eggs disolve in the water. They were duds!")
 
-/obj/machinery/fishtank/proc/harvest_eggs(var/mob/user)
+/obj/machinery/fishtank/proc/harvest_eggs(mob/user)
 	if(!egg_count)									//Can't harvest non-existant eggs
 		return
 
@@ -312,62 +298,39 @@
 
 	egg_list.Cut()									//Destroy any excess eggs, clearing the egg_list
 
-/obj/machinery/fishtank/proc/harvest_fish(var/mob/user)
-	if(fish_count <= 0)									//Can't catch non-existant fish!	
-		to_chat(usr, "There are no fish in \the [src] to catch!")
+/obj/machinery/fishtank/proc/harvest_fish(mob/user)
+	if(fish_count <= 0)									//Can't catch non-existant fish!
+		to_chat(user, "There are no fish in [src] to catch!")
 		return
 	var/list/fish_names_list = list()
 	for(var/datum/fish/fish_type in fish_list)
 		fish_names_list += list("[fish_type.fish_name]" = fish_type)
 	var/caught_fish = input("Select a fish to catch.", "Fishing") as null|anything in fish_names_list		//Select a fish from the tank
 	if(fish_count <= 0)
-		to_chat(usr, "There are no fish in \the [src] to catch!")
+		to_chat(user, "There are no fish in [src] to catch!")
 		return
 	else if(caught_fish)
-		user.visible_message("[user.name] harvests \a [caught_fish] from \the [src].", "You scoop \a [caught_fish] out of \the [src].")
+		user.visible_message("[user.name] harvests \a [caught_fish] from [src].", "You scoop \a [caught_fish] out of [src].")
 		var/datum/fish/fish_type = fish_names_list[caught_fish]
 		var/fish_item = fish_type.fish_item
 		if(fish_item)
 			new fish_item(get_turf(user))			//Spawn the appropriate fish_item at the user's feet.
 		kill_fish(fish_type)						//Kill the caught fish from the tank
-
-/obj/machinery/fishtank/proc/destroy(var/deconstruct = 0)
-	var/turf/T = get_turf(src)										//Store the tank's turf for atmos updating after deletion of tank
-	if(!deconstruct)												//Check if we are deconstructing or breaking the tank
-		var/shards_left = shard_count
-		while(shards_left > 0)										//Produce the appropriate number of glass shards
-			new /obj/item/shard(get_turf(src))
-			shards_left --
-		if(water_level)												//Spill any water that was left in the tank when it broke
-			spill_water()
-	else															//We are deconstructing, make glass sheets instead of shards
-		var/sheets = shard_count + 1								//Deconstructing it salvages all the glass used to build the tank
-		new /obj/item/stack/sheet/glass(get_turf(src), sheets)		//Produce the appropriate number of glass sheets, in a single stack
-	qdel(src)														//qdel the tank and it's contents
-	T.air_update_turf(1)											//Update the air for the turf, to avoid permanent atmos sealing with wall tanks
-
+													//Update the air for the turf, to avoid permanent atmos sealing with wall tanks
 /obj/machinery/fishtank/proc/spill_water()
+	var/turf/simulated/T = get_turf(src)
 	switch(tank_type)
 		if("bowl")										//Fishbowl: Wets it's own tile
-			var/turf/T = get_turf(src)
-			if(!istype(T, /turf/simulated)) return
-			var/turf/simulated/S = T
-			S.MakeSlippery()
+			if(istype(T))
+				T.MakeSlippery()
 		if("tank")										//Fishtank: Wets it's own tile and the 4 adjacent tiles (cardinal directions)
-			var/turf/ST = get_turf(src)
-			if(istype(ST, /turf/simulated))
-				var/turf/simulated/ST2 = ST
-				ST2.MakeSlippery()
-			var/list/L = ST.CardinalTurfs()
-			for(var/turf/T in L)
-				if(!istype(T, /turf/simulated)) continue
-				var/turf/simulated/S = T
-				S.MakeSlippery()
+			if(istype(T))
+				T.MakeSlippery()
+				for(var/turf/simulated/ST in T.CardinalTurfs())
+					ST.MakeSlippery()
 		if("wall")										//Wall-tank: Wets it's own tile and the surrounding 8 tiles (3x3 square)
-			for(var/turf/T in spiral_range_turfs(1, src.loc))
-				if(!istype(T, /turf/simulated)) continue
-				var/turf/simulated/S = T
-				S.MakeSlippery()
+			for(var/turf/simulated/ST in spiral_range_turfs(1, loc))
+				ST.MakeSlippery()
 
 /obj/machinery/fishtank/proc/breed_fish()
 	var/list/breed_candidates = fish_list.Copy()
@@ -412,20 +375,20 @@
 
 	examine_message += "Water level: "
 
-	if(water_level == 0)
-		examine_message += "\The [src] is empty! "
+	if(!water_level)
+		examine_message += "[src] is empty! "
 	else if(water_level < water_capacity * 0.1)
-		examine_message += "\The [src] is nearly empty! "
+		examine_message += "[src] is nearly empty! "
 	else if(water_level <= water_capacity * 0.25)
-		examine_message += "\The [src] is about one-quarter filled. "
+		examine_message += "[src] is about one-quarter filled. "
 	else if(water_level <= water_capacity * 0.5)
-		examine_message += "\The [src] is about half filled. "
+		examine_message += "[src] is about half filled. "
 	else if(water_level <= water_capacity * 0.75)
-		examine_message += "\The [src] is about three-quarters filled. "
+		examine_message += "[src] is about three-quarters filled. "
 	else if(water_level < water_capacity)
-		examine_message += "\The [src] is nearly full! "
+		examine_message += "[src] is nearly full! "
 	else if(water_level == water_capacity)
-		examine_message += "\The [src] is full! "
+		examine_message += "[src] is full! "
 
 	examine_message += "<br>Cleanliness level: "
 
@@ -467,7 +430,7 @@
 
 	//Report the number and types of live fish if there is water in the tank
 	if(fish_count == 0)
-		examine_message += "\The [src] doesn't contain any live fish. "
+		examine_message += "[src] doesn't contain any live fish. "
 	else
 		//Build a message reporting the types of fish
 		var/fish_num = fish_count
@@ -483,7 +446,7 @@
 				message +=", "
 		message +="."							//No more fish, end the message with a period
 		//Display the number of fish and previously constructed message
-		examine_message += "\The [src] contains [fish_count] live fish. [message] "
+		examine_message += "[src] contains [fish_count] live fish. [message] "
 
 	examine_message += "<br>"
 
@@ -498,12 +461,16 @@
 	examine_message += "<br>"
 
 	//Report if the tank is leaking/cracked
-	if(water_level > 0)							//Tank has water, so it's actually leaking
-		if(leaking == 1) examine_message += "\The [src] is leaking."
-		if(leaking == 2) examine_message += "\The [src] is leaking profusely!"
+	if(water_level)							//Tank has water, so it's actually leaking
+		if(leaking == 1)
+			examine_message += "[src] is leaking."
+		if(leaking == 2)
+			examine_message += "[src] is leaking profusely!"
 	else										//No water, report the cracks instead
-		if(leaking == 1) examine_message += "\The [src] is cracked."
-		if(leaking == 2) examine_message += "\The [src] is nearly shattered!"
+		if(leaking == 1)
+			examine_message += "[src] is cracked."
+		if(leaking == 2)
+			examine_message += "[src] is nearly shattered!"
 
 
 	//Finally, report the full examine_message constructed from the above reports
@@ -514,127 +481,113 @@
 //		ATACK PROCS			//
 //////////////////////////////
 
-/obj/machinery/fishtank/attack_animal(mob/living/simple_animal/M as mob)
+/obj/machinery/fishtank/attack_animal(mob/living/simple_animal/M)
 	if(istype(M, /mob/living/simple_animal/pet/cat))
 		if(M.a_intent == INTENT_HELP)							//Cats can try to fish in open tanks on help intent
 			if(lid_switch)									//Can't fish in a closed tank. Fishbowls are ALWAYS open.
-				M.visible_message("[M.name] stares at into \the [src] while sitting perfectly still.", "The lid is closed, so you stare into \the [src] intently.")
+				M.visible_message("[M.name] stares at into [src] while sitting perfectly still.", "The lid is closed, so you stare into [src] intently.")
 			else
 				if(fish_count)								//Tank must actually have fish to try catching one
-					M.visible_message("[M.name] leaps up onto  \the[src] and attempts to fish through the opening!", "You jump up onto \the [src] and begin fishing through the opening!")
-					spawn(10)
-						if(water_level && prob(45))			//If there is water, there is a chance the cat will slip, Syndicat will spark like E-N when this happens
-							M.visible_message("[M.name] slipped and got soaked!", "You slipped and got soaked!")
-							if(istype(M, /mob/living/simple_animal/pet/cat/Syndi))
-								var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-								s.set_up(3, 1, src)
-								s.start()
-						else								//No water or didn't slip, get that fish!
-							M.visible_message("[M.name] catches and devours a live fish!", "You catch and devour a live fish, yum!")
-							kill_fish()						//Kill a random fish
-							M.health = M.maxHealth			//Eating fish heals the predator
+					M.visible_message("[M.name] leaps up onto [src] and attempts to fish through the opening!", "You jump up onto [src] and begin fishing through the opening!")
+					if(water_level && prob(45))			//If there is water, there is a chance the cat will slip, Syndicat will spark like E-N when this happens
+						M.visible_message("[M.name] slipped and got soaked!", "You slipped and got soaked!")
+						if(istype(M, /mob/living/simple_animal/pet/cat/Syndi))
+							var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+							s.set_up(3, 1, src)
+							s.start()
+					else								//No water or didn't slip, get that fish!
+						M.visible_message("[M.name] catches and devours a live fish!", "You catch and devour a live fish, yum!")
+						kill_fish()						//Kill a random fish
+						M.health = M.maxHealth			//Eating fish heals the predator
 				else
-					to_chat(usr, "There are no fish in [src]!")
+					to_chat(M, "There are no fish in [src]!")
 		else
-			attack_generic(M, M.harm_intent_damage)
+			return ..()
 	else if(istype(M, /mob/living/simple_animal/hostile/bear))
 		if(M.a_intent == INTENT_HELP)							//Bears can try to fish in open tanks on help intent
 			if(lid_switch)									//Can't fish in a closed tank. Fishbowls are ALWAYS open.
-				M.visible_message("[M.name] scrapes it's claws along \the [src]'s lid.", "The lid is closed, so you scrape your claws against \the [src]'s lid.")
+				M.visible_message("[M.name] scrapes it's claws along [src]'s lid.", "The lid is closed, so you scrape your claws against [src]'s lid.")
 			else
 				if(fish_count)								//Tank must actually have fish to try catching one
-					M.visible_message("[M.name] reaches into  \the[src] and attempts to fish through the opening!", "You reach into \the [src] and begin fishing through the opening!")
-					spawn(5)
-						if(water_level && prob(5))			//Bears are good at catching fish, only a 5% chance to fail
-							M.visible_message("[M.name] swipes at the water!", "You just barely missed that fish!")
-						else								//No water or didn't slip, get that fish!
-							M.visible_message("[M.name] catches and devours a live fish!", "You catch and devour a live fish, yum!")
-							kill_fish()						//Kill a random fish
-							M.health = M.maxHealth			//Eating fish heals the predator
+					M.visible_message("[M.name] reaches into [src] and attempts to fish through the opening!", "You reach into [src] and begin fishing through the opening!")
+					if(water_level && prob(5))			//Bears are good at catching fish, only a 5% chance to fail
+						M.visible_message("[M.name] swipes at the water!", "You just barely missed that fish!")
+					else								//No water or didn't slip, get that fish!
+						M.visible_message("[M.name] catches and devours a live fish!", "You catch and devour a live fish, yum!")
+						kill_fish()						//Kill a random fish
+						M.health = M.maxHealth			//Eating fish heals the predator
 				else
-					to_chat(usr, "There are no fish in [src]!")
+					to_chat(M, "There are no fish in [src]!")
 		else
-			attack_generic(M, M.harm_intent_damage)
+			return ..()
 	else
-		if(M.melee_damage_upper > 0)						//If the simple_animal has a melee_damage_upper defined, use that for the damage
-			attack_generic(M, M.melee_damage_upper)
-		else if(M.a_intent == INTENT_HARM)						//Let any simple_animal try to break tanks when on harm intent
-			if(M.harm_intent_damage <= 0) return			//If it doesn't do damage, don't bother with the attack
-			attack_generic(M, M.harm_intent_damage)
-	check_health()
+		return ..()
 
-/obj/machinery/fishtank/attack_alien(mob/living/user as mob)
-	if(islarva(user)) return
-	attack_generic(user, 15)
-
-/obj/machinery/fishtank/attack_slime(mob/living/user as mob)
-	var/mob/living/carbon/slime/S = user
-	if(!S.is_adult)
-		return
-	attack_generic(user, rand(10, 15))
-
-/obj/machinery/fishtank/attack_hand(mob/user as mob)
-	if(HULK in user.mutations)
-		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
-		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
-		destroy()
-	else if(usr.a_intent == INTENT_HARM)
-		user.changeNext_move(CLICK_CD_MELEE)
+/obj/machinery/fishtank/attack_hand(mob/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	if(user.a_intent == INTENT_HARM)
 		playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
-		usr.visible_message("<span class='danger'>[usr.name] bangs against the [src.name]!</span>", \
-							"<span class='danger'>You bang against the [src.name]!</span>", \
+		user.visible_message("<span class='danger'>[user.name] bangs against the [name]!</span>", \
+							"<span class='danger'>You bang against the [name]!</span>", \
 							"You hear a banging sound.")
 	else
-		user.changeNext_move(CLICK_CD_MELEE)
-		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
-		usr.visible_message("[usr.name] taps on the [src.name].", \
-							"You tap on the [src.name].", \
+		playsound(loc, 'sound/effects/glassknock.ogg', 80, 1)
+		user.visible_message("[user.name] taps on the [name].", \
+							"You tap on the [name].", \
 							"You hear a knocking sound.")
-	return
 
-/obj/machinery/fishtank/proc/hit(var/damage, var/sound_effect = 1)
-	cur_health = max(0, cur_health - damage)
-	if(sound_effect)
-		playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
-	check_health()
-
-/obj/machinery/fishtank/attack_generic(mob/living/user, damage = 0)	//used by attack_alien, attack_animal, and attack_slime
-	user.changeNext_move(CLICK_CD_MELEE)
-	user.do_attack_animation(src)
-	cur_health -= damage
-	if(cur_health <= 0)
-		user.visible_message("<span class='danger'>[user] smashes through \the [src]!</span>")
-		destroy()
-	else	//for nicer text~
-		user.visible_message("<span class='danger'>[user] smashes into \the [src]!</span>")
-		playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
+/obj/machinery/fishtank/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
+	. = ..()
+	if(.) //received damage
 		check_health()
 
-/obj/machinery/fishtank/attackby(var/obj/item/O, var/mob/user as mob)
+/obj/machinery/fishtank/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			if(damage_amount)
+				playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
+			else
+				playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+		if(BURN)
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
+
+/obj/machinery/fishtank/deconstruct(disassembled = TRUE)
+	if(QDELETED(src))
+		return
+	if(!disassembled)
+		playsound(src, "shatter", 70, 1)
+		for(var/i in 1 to shard_count)	//Produce the appropriate number of glass shards
+			var/obj/item/shard/S = new /obj/item/shard(get_turf(src))
+			transfer_fingerprints_to(S)
+		if(water_level)												//Spill any water that was left in the tank when it broke
+			spill_water()
+	else															//We are deconstructing, make glass sheets instead of shards
+		new /obj/item/stack/sheet/glass(get_turf(src), shard_count + 1)		//Produce the appropriate number of glass sheets, in a single stack
+	qdel(src)
+
+/obj/machinery/fishtank/attackby(obj/item/O, mob/user)
 	//Welders repair damaged tanks on help intent, damage on all others
-	if(istype(O, /obj/item/weldingtool))
+	if(iswelder(O))
 		var/obj/item/weldingtool/W = O
 		if(user.a_intent == INTENT_HELP)
 			if(W.isOn())
-				if(cur_health < max_health)
+				if(obj_integrity < max_integrity)
 					playsound(loc, W.usesound, 50, 1)
-					to_chat(usr, "You repair some of the cracks on \the [src].")
-					cur_health += 20
+					to_chat(user, "You repair some of the cracks on [src].")
+					obj_integrity = min(obj_integrity + 20, max_integrity)
 					check_health()
 				else
-					to_chat(usr, "There is no damage to fix!")
+					to_chat(user, "There is no damage to fix!")
 			else
-				if(cur_health < max_health)
-					to_chat(usr, "[W.name] must be on to repair this damage.")
+				if(obj_integrity < max_integrity)
+					to_chat(user, "[W] must be on to repair this damage.")
 		else
-			user.changeNext_move(CLICK_CD_MELEE)
-			hit(W.force)
-		return
+			return ..()
 	//Open reagent containers add and remove water
-	if(O.is_open_container())
+	else if(O.is_open_container())
 		if(istype(O, /obj/item/reagent_containers/glass))
 			if(lid_switch)
-				to_chat(usr, "Open the lid on \the [src] first!")
+				to_chat(user, "Open the lid on [src] first!")
 				return
 			var/obj/item/reagent_containers/glass/C = O
 			//Containers with any reagents will get dumped in
@@ -652,57 +605,52 @@
 					C.reagents.clear_reagents()
 				else
 					if(water_level == water_capacity)
-						to_chat(usr, "[src] is already full!")
-						return
+						to_chat(user, "[src] is already full!")
 					else
 						message = "The filtration process purifies the water, raising the water level."
 
 						if((water_level + water_value) == water_capacity)
-							message += " You filled \the [src] to the brim!"
+							message += " You filled [src] to the brim!"
 						if((water_level + water_value) > water_capacity)
-							message += " You overfilled \the [src] and some water runs down the side, wasted."
+							message += " You overfilled [src] and some water runs down the side, wasted."
 						C.reagents.clear_reagents()
 						adjust_water_level(water_value)
-				user.visible_message("[user.name] pours the contents of [C.name] into \the [src].", "[message]")
-				return
+				user.visible_message("[user.name] pours the contents of [C.name] into [src].", "[message]")
 			//Empty containers will scoop out water, filling the container as much as possible from the water_level
 			else
-				if(water_level == 0)
-					to_chat(usr, "[src] is empty!")
+				if(!water_level)
+					to_chat(user, "[src] is empty!")
 				else
 					if(water_level >= C.volume)										//Enough to fill the container completely
 						C.reagents.add_reagent("fishwater", C.volume)
 						adjust_water_level(-C.volume)
-						user.visible_message("[user.name] scoops out some water from \the [src].", "You completely fill [C.name] from \the [src].")
+						user.visible_message("[user.name] scoops out some water from [src].", "You completely fill [C.name] from [src].")
 					else															//Fill the container as much as possible with the water_level
 						C.reagents.add_reagent("fishwater", water_level)
 						adjust_water_level(-water_level)
-						user.visible_message("[user.name] scoops out some water from \the [src].", "You fill [C.name] with the last of the water in \the [src].")
-			return
+						user.visible_message("[user.name] scoops out some water from [src].", "You fill [C.name] with the last of the water in [src].")
 	//Wrenches can deconstruct empty tanks, but not tanks with any water. Kills any fish left inside and destroys any unharvested eggs in the process
-	if(istype(O, /obj/item/wrench))
-		if(water_level == 0)
-			to_chat(usr, "<span class='notice'>Now disassembling [src].</span>")
-			playsound(src.loc, O.usesound, 50, 1)
+	else if(iswrench(O))
+		if(!water_level)
+			to_chat(user, "<span class='notice'>Now disassembling [src].</span>")
+			playsound(loc, O.usesound, 50, 1)
 			if(do_after(user, 50 * O.toolspeed, target = src))
-				destroy(1)
+				deconstruct(TRUE)
 		else
-			to_chat(usr, "[src] must be empty before you disassemble it!")
-		return
+			to_chat(user, "[src] must be empty before you disassemble it!")
 	//Fish eggs
 	else if(istype(O, /obj/item/fish_eggs))
 		var/obj/item/fish_eggs/egg = O
 		//Don't add eggs if there is no water (they kinda need that to live)
-		if(water_level == 0)
-			to_chat(usr, "[src] has no water; [egg.name] won't hatch without water!")
+		if(!water_level)
+			to_chat(user, "[src] has no water; [egg.name] won't hatch without water!")
 		else
 			//Don't add eggs if the tank already has the max number of fish
 			if(fish_count >= max_fish)
-				to_chat(usr, "[src] can't hold any more fish.")
+				to_chat(user, "[src] can't hold any more fish.")
 			else
 				add_fish(egg.fish_type)
 				qdel(egg)
-		return
 	//Fish food
 	else if(istype(O, /obj/item/fishfood))
 		//Only add food if there is water and it isn't already full of food
@@ -711,33 +659,28 @@
 				if(fish_count == 0)
 					user.visible_message("[user.name] shakes some fish food into the empty [src]... How sad.", "You shake some fish food into the empty [src]... If only it had fish.")
 				else
-					user.visible_message("[user.name] feeds the fish in \the [src]. The fish look excited!", "You feed the fish in \the [src]. They look excited!")
+					user.visible_message("[user.name] feeds the fish in [src]. The fish look excited!", "You feed the fish in [src]. They look excited!")
 				adjust_food_level(10)
 			else
-				to_chat(usr, "[src] already has plenty of food in it. You decide to not add more.")
+				to_chat(user, "[src] already has plenty of food in it. You decide to not add more.")
 		else
-			to_chat(usr, "[src] doesn't have any water in it. You should fill it with water first.")
-		return
+			to_chat(user, "[src] doesn't have any water in it. You should fill it with water first.")
 	//Fish egg scoop
 	else if(istype(O, /obj/item/egg_scoop))
 		if(egg_count)
-			user.visible_message("[user.name] harvests some fish eggs from \the [src].", "You scoop the fish eggs out of \the [src].")
+			user.visible_message("[user.name] harvests some fish eggs from [src].", "You scoop the fish eggs out of [src].")
 			harvest_eggs(user)
 		else
-			user.visible_message("[user.name] fails to harvest any fish eggs from \the [src].", "There are no fish eggs in \the [src] to scoop out.")
-		return
+			user.visible_message("[user.name] fails to harvest any fish eggs from [src].", "There are no fish eggs in [src] to scoop out.")
 	//Fish net
-	if(istype(O, /obj/item/fish_net))
+	else if(istype(O, /obj/item/fish_net))
 		harvest_fish(user)
-		return
 	//Tank brush
-	if(istype(O, /obj/item/tank_brush))
+	else if(istype(O, /obj/item/tank_brush))
 		if(filth_level == 0)
-			to_chat(usr, "[src] is already spotless!")
+			to_chat(user, "[src] is already spotless!")
 		else
 			adjust_filth_level(-filth_level)
-			user.visible_message("[user.name] scrubs the inside of \the [src], cleaning the filth.", "You scrub the inside of \the [src], cleaning the filth.")
-	else if(O && O.force)
-		user.visible_message("<span class='danger'>\The [src] has been attacked by [user.name] with \the [O]!</span>")
-		hit(O.force)
-	return
+			user.visible_message("[user.name] scrubs the inside of [src], cleaning the filth.", "You scrub the inside of [src], cleaning the filth.")
+	else
+		return ..()

code/modules/flufftext/Dreaming.dm

@@ -43,7 +43,7 @@
 		nightmare()
 		if(ishuman(src))
 			if(prob(10))
-				emote("writhes in their sleep.")
+				emote("writhes in [p_their()] sleep.")
 				dir = pick(cardinal)
 
 /mob/living/carbon/proc/experience_dream(dream_image, isNightmare)

code/modules/flufftext/Hallucination.dm

@@ -641,6 +641,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 			updateimage()
 		else
 			if(prob(15))
+				do_attack_animation(my_target, ATTACK_EFFECT_PUNCH)
 				if(weapon_name)
 					my_target.playsound_local(my_target, weap.hitsound, 1)
 					my_target.show_message("<span class='danger'>[src.name] has attacked [my_target] with [weapon_name]!</span>", 1)

code/modules/food_and_drinks/drinks/drinks.dm

@@ -47,7 +47,7 @@
 		to_chat(chugger, "<span class='notice'>You need to open [src] first!</span>")
 		return
 	if(istype(chugger) && loc == chugger && src == chugger.get_active_hand() && reagents.total_volume)
-		chugger.visible_message("<span class='notice'>[chugger] raises the [src] to their mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!</span>", "<span class='notice'>You start chugging \the [src].</span>", "<span class='notice'>You hear what sounds like gulping.</span>")
+		chugger.visible_message("<span class='notice'>[chugger] raises the [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!</span>", "<span class='notice'>You start chugging [src].</span>", "<span class='notice'>You hear what sounds like gulping.</span>")
 		while(do_mob(chugger, chugger, 40)) //Between the default time for do_mob and the time it takes for a vampire to suck blood.
 			chugger.eat(src, chugger, 25) //Half of a glass, quarter of a bottle.
 			if(!reagents.total_volume) //Finish in style.

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -102,8 +102,8 @@
 		target.visible_message("<span class='danger'>[user] has hit [target][head_attack_message] with a bottle of [name]!</span>", \
 				"<span class='userdanger'>[user] has hit [target][head_attack_message] with a bottle of [name]!</span>")
 	else
-		user.visible_message("<span class='danger'>[target] hits \himself with a bottle of [name][head_attack_message]!</span>", \
-				"<span class='userdanger'>[target] hits \himself with a bottle of [name][head_attack_message]!</span>")
+		user.visible_message("<span class='danger'>[target] hits [target.p_them()]self with a bottle of [name][head_attack_message]!</span>", \
+				"<span class='userdanger'>[target] hits [target.p_them()]self with a bottle of [name][head_attack_message]!</span>")
 
 	//Attack logs
 	add_attack_logs(user, target, "Hit with [src]")

code/modules/food_and_drinks/drinks/drinks/cans.dm

@@ -33,14 +33,14 @@
 		to_chat(user, "<span class='notice'>You need to open the drink!</span>")
 		return
 	else if(M == user && !reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_sel.selecting == "head")
-		user.visible_message("<span class='warning'>[user] crushes ["\the [src]"] on \his forehead!</span>", "<span class='notice'>You crush \the [src] on your forehead.</span>")
+		user.visible_message("<span class='warning'>[user] crushes [src] on [user.p_their()] forehead!</span>", "<span class='notice'>You crush [src] on your forehead.</span>")
 		crush(user)
 		return
 	return ..()
 
 /obj/item/reagent_containers/food/drinks/cans/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/storage/bag/trash/cyborg))
-		user.visible_message("<span class='notice'>[user] crushes \the [src] in their trash compactor.</span>", "<span class='notice'>You crush \the [src] in your trash compactor.</span>")
+		user.visible_message("<span class='notice'>[user] crushes [src] in [user.p_their()] trash compactor.</span>", "<span class='notice'>You crush [src] in your trash compactor.</span>")
 		var/obj/can = crush(user)
 		can.attackby(I, user, params)
 		return 1

code/modules/food_and_drinks/drinks/drinks/shotglass.dm

@@ -38,7 +38,7 @@
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
 	if(burn_state != ON_FIRE)
 		return
-	user.visible_message("<span class = 'warning'>[user] pours [src] all over themself!</span>", "<span class = 'danger'>You pour [src] all over yourself!</span>", "<span class = 'warning'>You hear a 'whoompf' and a sizzle.</span>")
+	user.visible_message("<span class = 'warning'>[user] pours [src] all over [user.p_them()]self!</span>", "<span class = 'danger'>You pour [src] all over yourself!</span>", "<span class = 'warning'>You hear a 'whoompf' and a sizzle.</span>")
 	extinguish(TRUE)
 	reagents.reaction(user, TOUCH)
 	reagents.clear_reagents()
@@ -90,7 +90,7 @@
 	if((CLUMSY in user.mutations) && prob(50))
 		clumsilyDrink(user)
 	else
-		user.visible_message("<span class = 'notice'>[user] places their hand over [src] to put it out!</span>", "<span class = 'notice'>You use your hand to extinguish [src]!</span>")
+		user.visible_message("<span class = 'notice'>[user] places [user.p_their()] hand over [src] to put it out!</span>", "<span class = 'notice'>You use your hand to extinguish [src]!</span>")
 		extinguish()
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/MouseDrop(mob/living/carbon/human/user)

code/modules/food_and_drinks/food/condiment.dm

@@ -131,7 +131,7 @@
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] begins to swap forms with the salt shaker! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	var/newname = "[name]"
 	name = "[user.name]"
 	user.name = newname

code/modules/food_and_drinks/food/snacks.dm

@@ -99,6 +99,7 @@
 		U.overlays += I
 
 		var/obj/item/reagent_containers/food/snacks/collected = new type
+		collected.name = name
 		collected.loc = U
 		collected.reagents.remove_any(collected.reagents.total_volume)
 		collected.trash = null
@@ -1040,6 +1041,21 @@
 	filling_color = "#EDDD00"
 	list_reagents = list("nutriment" = 1, "vitamin" = 1)
 
+/obj/item/reagent_containers/food/snacks/macaroni
+	name = "Macaroni twists"
+	desc = "These are little twists of raw macaroni."
+	icon_state = "macaroni"
+	filling_color = "#EDDD00"
+	list_reagents = list("nutriment" = 1, "vitamin" = 1)
+
+/obj/item/reagent_containers/food/snacks/macncheese
+	name = "Macaroni cheese"
+	desc = "One of the most comforting foods in the world. Apparently."
+	trash = /obj/item/trash/snack_bowl
+	icon_state = "macncheese"
+	filling_color = "#ffe45d"
+	list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4)
+
 /obj/item/reagent_containers/food/snacks/cheesyfries
 	name = "Cheesy Fries"
 	desc = "Fries. Covered in cheese. Duh."
@@ -1250,7 +1266,14 @@
 /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
 	if(!QDELETED(src))
 		visible_message("<span class='notice'>[src] expands!</span>")
-		new/mob/living/carbon/human(get_turf(src), monkey_type)
+		if(fingerprintslast)
+			log_game("Cube ([monkey_type]) inflated, last touched by: " + fingerprintslast)
+		else
+			log_game("Cube ([monkey_type]) inflated, last touched by: NO_DATA")
+		var/mob/living/carbon/human/creature = new /mob/living/carbon/human(get_turf(src))
+		if(LAZYLEN(fingerprintshidden))
+			creature.fingerprintshidden = fingerprintshidden.Copy()
+		creature.set_species(monkey_type)
 		qdel(src)
 
 /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
@@ -2065,6 +2088,20 @@
 	icon_state = "hawaiianpizzaslice"
 	filling_color = "#e5b437"
 
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+	name = "Macaroni cheese pizza"
+	desc = "Gastronomists have yet to classify this dish as 'pizza'."
+	icon_state = "macpizza"
+	slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice
+	list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
+	filling_color = "#ffe45d"
+
+/obj/item/reagent_containers/food/snacks/macpizzaslice
+	name = "Macaroni cheese pizza slice"
+	desc = "A delicious slice of pizza topped with macaroni cheese... wait, what the hell? Who would do this?!"
+	icon_state = "macpizzaslice"
+	filling_color = "#ffe45d"
+
 /obj/item/pizzabox
 	name = "pizza box"
 	desc = "A box suited for pizzas."

code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

@@ -58,7 +58,7 @@
 		C.emote("scream")
 		user.changeNext_move(CLICK_CD_MELEE)
 		C.apply_damage(25, BURN, "head") //25 fire damage and disfigurement because your face was just deep fried!
-		head.disfigure("burn")
+		head.disfigure()
 		add_attack_logs(user, G.affecting, "Deep-fried with [src]")
 		qdel(G) //Removes the grip so the person MIGHT have a small chance to run the fuck away and to prevent rapid dunks.
 		return 0

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -260,7 +260,7 @@
 	new /obj/effect/decal/cleanable/blood/gibs(src)
 
 	if(!UserOverride)
-		add_attack_logs(user, occupant, "Gibbed in [src]", !!occupant.ckey)
+		add_attack_logs(user, occupant, "Gibbed in [src]", !!occupant.ckey ? ATKLOG_FEW : ATKLOG_ALL)
 
 		if(!iscarbon(user))
 			occupant.LAssailant = null

code/modules/food_and_drinks/kitchen_machinery/processor.dm

@@ -87,6 +87,10 @@
 	input = /obj/item/reagent_containers/food/snacks/doughslice
 	output = /obj/item/reagent_containers/food/snacks/spaghetti
 
+/datum/food_processor_process/macaroni
+	input = /obj/item/reagent_containers/food/snacks/spaghetti
+	output = /obj/item/reagent_containers/food/snacks/macaroni
+
 /datum/food_processor_process/parsnip
 	input = /obj/item/reagent_containers/food/snacks/grown/parsnip
 	output = /obj/item/reagent_containers/food/snacks/roastparsnip

code/modules/food_and_drinks/recipes/recipes_microwave.dm

@@ -396,6 +396,14 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/spesslaw
 
+/datum/recipe/microwave/macncheese
+	reagents = list("water" = 5, "milk" = 5)
+	items = list(
+		/obj/item/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/reagent_containers/food/snacks/macaroni,
+	)
+	result = /obj/item/reagent_containers/food/snacks/macncheese
+
 /datum/recipe/microwave/superbiteburger
 	reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
 	items = list(

code/modules/food_and_drinks/recipes/recipes_oven.dm

@@ -264,6 +264,15 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
 
+/datum/recipe/oven/macncheesepizza
+	items = list(
+		/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+		/obj/item/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/reagent_containers/food/snacks/macncheese,
+	)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+
 /datum/recipe/oven/amanita_pie
 	items = list(
 		/obj/item/reagent_containers/food/snacks/sliceable/flatdough,

code/modules/hydroponics/beekeeping/beebox.dm

@@ -179,7 +179,7 @@
 			visible_message("<span class='notice'>The [qb] refuses to settle down. Maybe it's something to do with its reagent?</span>")
 
 		if(queen_bee)
-			visible_message("<span class='notice'>[user] sets [qb] down inside the apiary, making it their new home.</span>")
+			visible_message("<span class='notice'>[user] sets [qb] down inside the apiary, making it [user.p_their()] new home.</span>")
 			var/relocated = 0
 			for(var/b in bees)
 				var/mob/living/simple_animal/hostile/poison/bees/worker/B = b

code/modules/hydroponics/grown/banana.dm

@@ -25,7 +25,7 @@
 	bitesize = 5
 
 /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is aiming the [src.name] at themself! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is aiming the [name] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
 	sleep(25)
 	if(!user)
@@ -34,7 +34,7 @@
 	sleep(25)
 	if(!user)
 		return (OXYLOSS)
-	user.visible_message("<B>[user]</B> laughs so hard they begin to suffocate!")
+	user.visible_message("<B>[user]</B> laughs so hard [user.p_they()] begin[user.p_s()] to suffocate!")
 	return (OXYLOSS)
 
 /obj/item/grown/bananapeel
@@ -49,7 +49,7 @@
 	throw_range = 7
 
 /obj/item/grown/bananapeel/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is deliberately slipping on the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1)
 	return (BRUTELOSS)
 

code/modules/hydroponics/grown/citrus.dm

@@ -109,7 +109,7 @@
 	var/area/A = get_area(user)
 	user.visible_message("<span class='warning'>[user] primes the [src]!</span>", "<span class='userdanger'>You prime the [src]!</span>")
 	var/message = "[ADMIN_LOOKUPFLW(user)] primed a combustible lemon for detonation at [A] [ADMIN_COORDJMP(user)]"
-	bombers += message
+	investigate_log("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB)
 	message_admins(message)
 	log_game("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].")
 	if(iscarbon(user))

code/modules/hydroponics/grown/kudzu.dm

@@ -22,7 +22,7 @@
 	return S
 
 /obj/item/seeds/kudzu/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..</span>")
+	user.visible_message("<span class='suicide'>[user] swallows the pack of kudzu seeds! It looks like [user.p_theyre()] trying to commit suicide..</span>")
 	plant(user)
 	return (BRUTELOSS)
 

code/modules/hydroponics/grown/nettle.dm

@@ -44,7 +44,7 @@
 	attack_verb = list("stung")
 
 /obj/item/grown/nettle/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is eating some of the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	return (BRUTELOSS|TOXLOSS)
 
 /obj/item/grown/nettle/pickup(mob/living/user)

code/modules/hydroponics/hydroitemdefines.dm

@@ -33,7 +33,7 @@
 	reagents.add_reagent("atrazine", 100)
 
 /obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	return (TOXLOSS)
 
 /obj/item/reagent_containers/spray/pestspray // -- Skie
@@ -55,7 +55,7 @@
 	reagents.add_reagent("pestkiller", 100)
 
 /obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	return (TOXLOSS)
 
 /obj/item/cultivator
@@ -89,7 +89,7 @@
 	sharp = 1
 
 /obj/item/hatchet/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is chopping at \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is chopping at [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
 	return (BRUTELOSS)
 
@@ -119,7 +119,7 @@
 	var/swiping = FALSE
 
 /obj/item/scythe/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is beheading \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is beheading [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		var/obj/item/organ/external/affecting = H.get_organ("head")

code/modules/library/computers/checkout.dm

@@ -49,7 +49,7 @@
 			if(src.arcanecheckout)
 				new /obj/item/tome(src.loc)
 				to_chat(user, "<span class='warning'>Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.</span>")
-				user.visible_message("[user] stares at the blank screen for a few moments, his expression frozen in fear. When he finally awakens from it, he looks a lot older.", 2)
+				user.visible_message("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older.", 2)
 				src.arcanecheckout = 0
 		if(1)
 			// Inventory

code/modules/library/lib_items.dm

@@ -24,7 +24,7 @@
 	var/tmp/busy = 0
 	var/list/allowed_books = list(/obj/item/book, /obj/item/spellbook, /obj/item/storage/bible, /obj/item/tome) //Things allowed in the bookcase
 
-/obj/structure/bookcase/initialize()
+/obj/structure/bookcase/Initialize()
 	..()
 	for(var/obj/item/I in loc)
 		if(is_type_in_list(I, allowed_books))

code/modules/lighting/lighting_atom.dm

@@ -40,16 +40,6 @@
 		else
 			light = new /datum/light_source(src, .)
 
-/atom/New()
-	. = ..()
-
-	if(light_power && light_range)
-		update_light()
-
-	if(opacity && isturf(loc))
-		var/turf/T = loc
-		T.has_opaque_atom = TRUE // No need to recalculate it in this case, it's guranteed to be on afterwards anyways.
-
 /atom/Destroy()
 	if(light)
 		light.destroy()

code/modules/lighting/lighting_overlay.dm

@@ -9,7 +9,6 @@
 	invisibility = INVISIBILITY_LIGHTING
 	color = LIGHTING_BASE_MATRIX
 	icon_state = "light1"
-	auto_init = 0 // doesn't need special init
 	blend_mode = BLEND_MULTIPLY
 
 	var/lum_r = 0

code/modules/logic/logic_base.dm

@@ -50,7 +50,7 @@
 	component_parts += LG
 	component_parts += new /obj/item/stack/cable_coil(null, 1)
 
-/obj/machinery/logic_gate/initialize()
+/obj/machinery/logic_gate/Initialize()
 	..()
 	set_frequency(frequency)
 

code/modules/martial_arts/brawling.dm

@@ -11,7 +11,7 @@
 
 /datum/martial_art/boxing/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 
-	A.do_attack_animation(D)
+	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 
 	var/atk_verb = pick("left hook","right hook","straight punch")
 
@@ -62,7 +62,7 @@
 
 /datum/martial_art/drunk_brawling/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	add_attack_logs(A, D, "Melee attacked with [src]")
-	A.do_attack_animation(D)
+	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 
 	var/atk_verb = pick("jab","uppercut","overhand punch","drunken right hook","drunken left hook")
 

code/modules/martial_arts/krav_maga.dm

@@ -109,7 +109,6 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi
 	if(check_streak(A,D))
 		return 1
 	add_attack_logs(A, D, "Melee attacked with [src]")
-	A.do_attack_animation(D)
 	var/picked_hit_type = pick("punches", "kicks")
 	var/bonus_damage = 10
 	if(D.weakened || D.resting || D.lying)
@@ -117,8 +116,10 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi
 		picked_hit_type = "stomps on"
 	D.apply_damage(bonus_damage, BRUTE)
 	if(picked_hit_type == "kicks" || picked_hit_type == "stomps")
+		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, 1, -1)
 	else
+		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1)
 	D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
 					  "<span class='userdanger'>[A] [picked_hit_type] you!</span>")

code/modules/martial_arts/martial.dm

@@ -33,7 +33,6 @@
 
 /datum/martial_art/proc/basic_hit(var/mob/living/carbon/human/A,var/mob/living/carbon/human/D)
 
-	A.do_attack_animation(D)
 	var/damage = rand(A.species.punchdamagelow, A.species.punchdamagehigh)
 	var/datum/unarmed_attack/attack = A.species.unarmed
 
@@ -41,6 +40,12 @@
 	if(D.lying)
 		atk_verb = "kick"
 
+	switch(atk_verb)
+		if("kick")
+			A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+		else
+			A.do_attack_animation(D, attack.animation_type)
+
 	if(!damage)
 		playsound(D.loc, attack.miss_sound, 25, 1, -1)
 		D.visible_message("<span class='warning'>[A] has attempted to [atk_verb] [D]!</span>")
@@ -55,7 +60,7 @@
 
 	D.apply_damage(damage, BRUTE, affecting, armor_block)
 
-	add_attack_logs(A, D, "Melee attacked with martial-art [src]", admin_notify = (damage > 0) ? TRUE : FALSE)
+	add_attack_logs(A, D, "Melee attacked with martial-art [src]", (damage > 0) ? null : ATKLOG_ALL)
 
 	if((D.stat != DEAD) && damage >= A.species.punchstunthreshold)
 		D.visible_message("<span class='danger'>[A] has weakened [D]!!</span>", \
@@ -205,7 +210,7 @@
 		return ..()
 	var/mob/living/carbon/C = target
 	if(C.stat)
-		to_chat(user, "<span class='warning'>It would be dishonorable to attack a foe while they cannot retaliate.</span>")
+		to_chat(user, "<span class='warning'>It would be dishonorable to attack a foe while [C.p_they()] cannot retaliate.</span>")
 		return
 	switch(user.a_intent)
 		if(INTENT_DISARM)
@@ -231,7 +236,7 @@
 			if(H.staminaloss && !H.sleeping)
 				var/total_health = (H.health - H.staminaloss)
 				if(total_health <= config.health_threshold_crit && !H.stat)
-					H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking them out cold!</span>", \
+					H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!</span>", \
 										   "<span class='userdanger'>[user] knocks you unconscious!</span>")
 					H.SetSleeping(30)
 					H.adjustBrainLoss(25)

code/modules/martial_arts/mimejutsu.dm

@@ -55,8 +55,8 @@
 
 /datum/martial_art/mimejutsu/proc/mimePalm(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(!D.stat && !D.stunned && !D.weakened)
-		D.visible_message("<span class='danger'>[A] has barely touched [D] with their palm!</span>", \
-						"<span class='userdanger'>[A] hovers their palm over your face!</span>")
+		D.visible_message("<span class='danger'>[A] has barely touched [D] with [A.p_their()] palm!</span>", \
+						"<span class='userdanger'>[A] hovers [A.p_their()] palm over your face!</span>")
 
 		var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A)))
 		D.throw_at(throw_target, 200, 4,A)

code/modules/martial_arts/plasma_fist.dm

@@ -46,7 +46,7 @@
 	return
 
 /datum/martial_art/plasma_fist/proc/Plasma(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
-	A.do_attack_animation(D)
+	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 	playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
 	A.say("PLASMA FIST!")
 	D.visible_message("<span class='danger'>[A] has hit [D] with THE PLASMA FIST TECHNIQUE!</span>", \

code/modules/martial_arts/sleeping_carp.dm

@@ -36,7 +36,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/wristWrench(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(!D.stat && !D.stunned && !D.weakened)
-		A.do_attack_animation(D)
+		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] grabs [D]'s wrist and wrenches it sideways!</span>", \
 						  "<span class='userdanger'>[A] grabs your wrist and violently wrenches it to the side!</span>")
 		playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
@@ -51,7 +51,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/backKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(A.dir == D.dir && !D.stat && !D.weakened)
-		A.do_attack_animation(D)
+		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] kicks [D] in the back!</span>", \
 						  "<span class='userdanger'>[A] kicks you in the back, making you stumble and fall!</span>")
 		step_to(D,get_step(D,D.dir),1)
@@ -64,7 +64,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/kneeStomach(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(!D.stat && !D.weakened)
-		A.do_attack_animation(D)
+		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] knees [D] in the stomach!</span>", \
 						  "<span class='userdanger'>[A] winds you with a knee in the stomach!</span>")
 		D.audible_message("<b>[D]</b> gags!")
@@ -78,7 +78,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/headKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(!D.stat && !D.weakened)
-		A.do_attack_animation(D)
+		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] kicks [D] in the head!</span>", \
 						  "<span class='userdanger'>[A] kicks you in the jaw!</span>")
 		D.apply_damage(20, BRUTE, "head")
@@ -92,9 +92,9 @@
 
 /datum/martial_art/the_sleeping_carp/proc/elbowDrop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(D.weakened || D.resting || D.stat)
-		A.do_attack_animation(D)
+		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] elbow drops [D]!</span>", \
-						  "<span class='userdanger'>[A] piledrives you with their elbow!</span>")
+						  "<span class='userdanger'>[A] piledrives you with [A.p_their()] elbow!</span>")
 		if(D.stat)
 			D.death() //FINISH HIM!
 		D.apply_damage(50, BRUTE, "chest")
@@ -117,7 +117,7 @@
 	add_to_streak("H",D)
 	if(check_streak(A,D))
 		return 1
-	A.do_attack_animation(D)
+	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 	var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams")
 	D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \
 					  "<span class='userdanger'>[A] [atk_verb] you!</span>")

code/modules/mining/coins.dm

@@ -106,7 +106,7 @@
 			return
 
 		if(CC.use(1))
-			overlays += image('icons/obj/items.dmi',"coin_string_overlay")
+			overlays += image('icons/obj/economy.dmi',"coin_string_overlay")
 			string_attached = 1
 			to_chat(user, "<span class='notice'>You attach a string to the coin.</span>")
 		else

code/modules/mining/lavaland/loot/ashdragon_loot.dm

@@ -52,7 +52,7 @@
 		return
 	to_chat(user, "You call out for aid, attempting to summon spirits to your side.")
 
-	notify_ghosts("[user] is raising their [src], calling for your help!", enter_link="<a href=?src=[UID()];follow=1>(Click to help)</a>", source = user, action = NOTIFY_FOLLOW)
+	notify_ghosts("[user] is raising [user.p_their()] [src], calling for your help!", enter_link="<a href=?src=[UID()];follow=1>(Click to help)</a>", source = user, action = NOTIFY_FOLLOW)
 
 	summon_cooldown = world.time + 600
 

code/modules/mining/lavaland/loot/bubblegum_loot.dm

@@ -75,7 +75,7 @@
 		for(var/mob/living/carbon/human/H in player_list)
 			if(H == L)
 				continue
-			to_chat(H, "<span class='userdanger'>You have an overwhelming desire to kill [L]. They have been marked red! Go kill them!</span>")
+			to_chat(H, "<span class='userdanger'>You have an overwhelming desire to kill [L]. [L.p_they(TRUE)] [L.p_have()] been marked red! Go kill [L.p_them()]!</span>")
 			H.put_in_hands(new /obj/item/kitchen/knife/butcher(H))
 
 	qdel(src)

code/modules/mining/lavaland/loot/hierophant_loot.dm

@@ -57,7 +57,7 @@
 		return
 	if(!rune)
 		if(isturf(user.loc))
-			user.visible_message("<span class='hierophant_warning'>[user] holds [src] carefully in front of them, moving it in a strange pattern...</span>", \
+			user.visible_message("<span class='hierophant_warning'>[user] holds [src] carefully in front of [user.p_them()], moving it in a strange pattern...</span>", \
 			"<span class='notice'>You start creating a hierophant rune to teleport to...</span>")
 			timer = world.time + 51
 			if(do_after(user, 50, target = user))
@@ -67,7 +67,7 @@
 				var/obj/effect/hierophant/H = new/obj/effect/hierophant(T)
 				rune = H
 				user.update_action_buttons_icon()
-				user.visible_message("<span class='hierophant_warning'>[user] creates a strange rune beneath them!</span>", \
+				user.visible_message("<span class='hierophant_warning'>[user] creates a strange rune beneath [user.p_them()]!</span>", \
 				"<span class='hierophant'>You create a hierophant rune, which you can teleport yourself and any allies to at any time!</span>\n\
 				<span class='notice'>You can remove the rune to place a new one by striking it with the staff.</span>")
 			else