Merge branch 'master' into ganguns

code/modules/admin/admin.dm

@@ -421,13 +421,18 @@
 	set desc="Restarts the world immediately"
 	if (!usr.client.holder)
 		return
-	var/confirm = alert("Restart the game world?", "Restart", "Yes", "Cancel")
-	if(confirm == "Cancel")
-		return
-	if(confirm == "Yes")
-		SSticker.delay_end = 0
+
+	var/list/options = list("Regular Restart", "Hard Restart (No Delay/Feeback Reason)", "Hardest Restart (No actions, just reboot)")
+	var result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options
+	if(result)
 		SSblackbox.add_details("admin_verb","Reboot World") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-		world.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "end_error", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
+		switch(result)
+			if("Regular Restart")
+				SSticker.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "end_error", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
+			if("Hard Restart (No Delay, No Feeback Reason)")
+				world.Reboot()
+			if("Hardest Restart (No actions, just reboot)")
+				world.Reboot(fast_track = TRUE)		
 
 /datum/admins/proc/end_round()
 	set category = "Server"

code/modules/admin/admin_verbs.dm

@@ -78,7 +78,6 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
 	/client/proc/drop_dynex_bomb,
 	/client/proc/cinematic,
 	/client/proc/one_click_antag,
-	/client/proc/send_space_ninja,
 	/client/proc/cmd_admin_add_freeform_ai_law,
 	/client/proc/object_say,
 	/client/proc/toggle_random_events,
@@ -193,7 +192,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/client/proc/get_dynex_power,
 	/client/proc/set_dynex_scale,
 	/client/proc/cinematic,
-	/client/proc/send_space_ninja,
 	/client/proc/cmd_admin_add_freeform_ai_law,
 	/client/proc/cmd_admin_create_centcom_report,
 	/client/proc/cmd_change_command_name,

code/modules/admin/fun_balloon.dm

@@ -60,7 +60,7 @@
 		message_admins("[key_name_admin(ghost)] has taken control of ([key_name_admin(body)])")
 		body.ghostize(0)
 		body.key = ghost.key
-		new /obj/effect/overlay/temp/gravpush(get_turf(body))
+		new /obj/effect/temp_visual/gravpush(get_turf(body))
 
 /obj/effect/fun_balloon/sentience/emergency_shuttle
 	name = "shuttle sentience fun balloon"
@@ -79,7 +79,7 @@
 /obj/effect/fun_balloon/scatter/effect()
 	for(var/mob/living/M in range(effect_range, get_turf(src)))
 		var/turf/T = find_safe_turf()
-		new /obj/effect/overlay/temp/gravpush(get_turf(M))
+		new /obj/effect/temp_visual/gravpush(get_turf(M))
 		M.forceMove(T)
 		to_chat(M, "<span class='notice'>Pop!</span>")
 

code/modules/admin/player_panel.dm

@@ -442,7 +442,7 @@
 			dat += "</table>"
 
 		for(var/datum/gang/G in SSticker.mode.gangs)
-			dat += "<br><table cellspacing=5><tr><td><B>[G.name] Gang: <a href='?_src_=holder;gangpoints=\ref[G]'>[G.points] Influence</a> | [round((G.territory.len/GLOB.start_state.num_territories)*100, 1)]% Control</B></td><td></td></tr>"
+			dat += "<br><table cellspacing=5><tr><td><B>[G.name] Gang: [round((G.territory.len/GLOB.start_state.num_territories)*100, 1)]% Control</B></td><td></td></tr>"
 			for(var/datum/mind/N in G.bosses)
 				var/mob/M = N.current
 				if(!M)

code/modules/admin/topic.dm

@@ -281,6 +281,11 @@
 		minor_announce("The emergency shuttle will reach its destination in [round(SSshuttle.emergency.timeLeft(600))] minutes.")
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds.</span>")
 		href_list["secrets"] = "check_antagonist"
+	else if(href_list["trigger_centcom_recall"])
+		if(!check_rights(R_ADMIN))
+			return
+
+		trigger_centcom_recall()
 
 	else if(href_list["toggle_continuous"])
 		if(!check_rights(R_ADMIN))
@@ -1206,7 +1211,7 @@
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] set the mode as [GLOB.master_mode].</span>")
 		to_chat(world, "<span class='adminnotice'><b>The mode is now: [GLOB.master_mode]</b></span>")
 		Game() // updates the main game menu
-		world.save_mode(GLOB.master_mode)
+		SSticker.save_mode(GLOB.master_mode)
 		.(href, list("c_mode"=1))
 
 	else if(href_list["f_secret2"])
@@ -1511,17 +1516,6 @@
 
 		usr.client.cmd_admin_animalize(M)
 
-	else if(href_list["gangpoints"])
-		var/datum/gang/G = locate(href_list["gangpoints"]) in SSticker.mode.gangs
-		if(G)
-			var/newpoints = input("Set [G.name ] Gang's influence.","Set Influence",G.points) as null|num
-			if(!newpoints)
-				return
-			message_admins("[key_name_admin(usr)] changed the [G.name] Gang's influence from [G.points] to [newpoints].</span>")
-			log_admin("[key_name(usr)] changed the [G.name] Gang's influence from [G.points] to [newpoints].</span>")
-			G.points = newpoints
-			G.message_gangtools("Your gang now has [G.points] influence.")
-
 	else if(href_list["adminplayeropts"])
 		var/mob/M = locate(href_list["adminplayeropts"])
 		show_player_panel(M)

code/modules/admin/verbs/debug.dm

@@ -109,7 +109,11 @@ GLOBAL_PROTECT(AdminProcCallCount)
 		return call(target, procname)(arglist(arguments))
 
 /proc/IsAdminAdvancedProcCall()
+#ifdef TESTING
+	return FALSE
+#else
 	return usr && usr.client && GLOB.AdminProcCaller == usr.client.ckey
+#endif
 
 /client/proc/callproc_datum(datum/A as null|area|mob|obj|turf)
 	set category = "Debug"

code/modules/admin/verbs/playsound.dm

@@ -52,10 +52,7 @@
 	if(!check_rights(R_SOUNDS))
 		return
 
-	if(SSticker)
-		SSticker.round_end_sound = fcopy_rsc(S)
-	else
-		return
+	SSticker.SetRoundEndSound(S)
 
 	log_admin("[key_name(src)] set the round end sound to [S]")
 	message_admins("[key_name_admin(src)] set the round end sound to [S]")

code/modules/admin/verbs/randomverbs.dm

@@ -386,9 +386,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 				if(L.name=="carpspawn")
 					ninja_spawn += L
-			new_character.equip_space_ninja()
-			new_character.internal = new_character.s_store
-			new_character.update_internals_hud_icon(1)
+			var/datum/antagonist/ninja/ninjadatum = new_character.mind.has_antag_datum(ANTAG_DATUM_NINJA)
+			ninjadatum.equip_space_ninja()
 			if(ninja_spawn.len)
 				var/obj/effect/landmark/ninja_spawn_here = pick(ninja_spawn)
 				new_character.loc = ninja_spawn_here.loc
@@ -586,7 +585,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 		empulse(O, heavy, light)
 		log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
-		message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
+		message_admins("[key_name_admin(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
 		SSblackbox.add_details("admin_verb","EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 		return

code/modules/assembly/flash.dm

@@ -172,11 +172,11 @@
 
 /obj/item/device/assembly/flash/cyborg/attack(mob/living/M, mob/user)
 	..()
-	new /obj/effect/overlay/temp/borgflash(get_turf(src))
+	new /obj/effect/temp_visual/borgflash(get_turf(src))
 
 /obj/item/device/assembly/flash/cyborg/attack_self(mob/user)
 	..()
-	new /obj/effect/overlay/temp/borgflash(get_turf(src))
+	new /obj/effect/temp_visual/borgflash(get_turf(src))
 
 /obj/item/device/assembly/flash/cyborg/attackby(obj/item/weapon/W, mob/user, params)
 	return

code/modules/awaymissions/capture_the_flag.dm

@@ -433,7 +433,7 @@
 
 /obj/item/projectile/beam/ctf/red
 	icon_state = "laser"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/red_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
 
 // BLUE TEAM GUNS
 
@@ -448,7 +448,7 @@
 
 /obj/item/projectile/beam/ctf/blue
 	icon_state = "bluelaser"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
 
 /datum/outfit/ctf
 	name = "CTF"

code/modules/client/client_procs.dm

@@ -636,3 +636,7 @@ GLOBAL_LIST(external_rsc_urls)
 		CRASH("change_view called without argument.")
 
 	view = new_size
+
+/client/proc/AnnouncePR(announcement)
+	if(prefs && prefs.chat_toggles & CHAT_PULLR)
+		to_chat(src, announcement)

code/modules/clothing/outfits/ert.dm

@@ -65,9 +65,8 @@
 	backpack_contents = list(/obj/item/weapon/storage/box/engineer=1,\
 		/obj/item/weapon/storage/box/handcuffs=1,\
 		/obj/item/clothing/mask/gas/sechailer=1,\
-		/obj/item/weapon/gun/energy/e_gun=1,\
-		/obj/item/weapon/melee/baton/loaded=1,\
-		/obj/item/weapon/gun/energy/e_gun/advtaser=1)
+		/obj/item/weapon/gun/energy/e_gun/stun=1,\
+		/obj/item/weapon/melee/baton/loaded=1)
 
 /datum/outfit/ert/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()

code/modules/clothing/under/miscellaneous.dm

@@ -211,6 +211,14 @@
 	item_state = "black_suit_fem"
 	item_color = "black_suit_fem"
 
+/obj/item/clothing/under/suit_jacket/green
+	name = "green suit"
+	desc = "A green suit and yellow necktie. Baller."
+	icon_state = "green_suit"
+	item_state = "dg_suit"
+	item_color = "green_suit"
+	can_adjust = 0
+
 /obj/item/clothing/under/suit_jacket/red
 	name = "red suit"
 	desc = "A red suit and blue tie. Somewhat formal."

code/modules/events/spacevine.dm

@@ -444,7 +444,7 @@
 /datum/spacevine_controller/Topic(href, href_list)
 	if(..() || !check_rights(R_ADMIN, FALSE))
 		return
-	
+
 	if(href_list["purge_vines"])
 		if(alert(usr, "Are you sure you want to delete this spacevine cluster?", "Delete Vines", "Yes", "No") != "Yes")
 			return
@@ -476,6 +476,7 @@
 
 	for(var/datum/spacevine_mutation/SM in SV.mutations)
 		SM.on_birth(SV)
+	location.Entered(SV)
 
 /datum/spacevine_controller/proc/VineDestroyed(obj/structure/spacevine/S)
 	S.master = null

code/modules/fields/fields.dm

@@ -0,0 +1,309 @@
+
+//Movable and easily code-modified fields! Allows for custom AOE effects that affect movement and anything inside of them, and can do custom turf effects!
+//Supports automatic recalculation/reset on movement.
+//If there's any way to make this less CPU intensive than I've managed, gimme a call or do it yourself! - kevinz000
+
+//Field shapes
+#define FIELD_NO_SHAPE 0		//Does not update turfs automatically
+#define FIELD_SHAPE_RADIUS_SQUARE 1	//Uses current_range and square_depth_up/down
+#define FIELD_SHAPE_CUSTOM_SQUARE 2	//Uses square_height and square_width and square_depth_up/down
+
+//Proc to make fields. make_field(field_type, field_params_in_associative_list)
+/proc/make_field(field_type, list/field_params, override_checks = FALSE, start_field = TRUE)
+	var/datum/proximity_monitor/advanced/F = new field_type()
+	if(!F.assume_params(field_params) && !override_checks)
+		QDEL_NULL(F)
+	if(!F.check_variables() && !override_checks)
+		QDEL_NULL(F)
+	if(start_field && (F || override_checks))
+		F.Initialize()
+	return F
+
+/datum/proximity_monitor/advanced
+	var/name = "\improper Energy Field"
+	//Field setup specifications
+	var/field_shape = FIELD_NO_SHAPE
+	var/square_height = 0
+	var/square_width = 0
+	var/square_depth_up = 0
+	var/square_depth_down = 0
+	//Processing
+	var/requires_processing = FALSE
+	var/process_inner_turfs = FALSE	//Don't do this unless it's absolutely necessary
+	var/process_edge_turfs = FALSE	//Don't do this either unless it's absolutely necessary, you can just track what things are inside manually or on the initial setup.
+	var/setup_edge_turfs = FALSE	//Setup edge turfs/all field turfs. Set either or both to ON when you need it, it's defaulting to off unless you do to save CPU.
+	var/setup_field_turfs = FALSE
+
+	var/list/turf/field_turfs = list()
+	var/list/turf/edge_turfs = list()
+	var/list/turf/field_turfs_new = list()
+	var/list/turf/edge_turfs_new = list()
+
+/datum/proximity_monitor/advanced/New()
+	SSfields.register_new_field(src)
+
+/datum/proximity_monitor/advanced/Destroy()
+	SSfields.unregister_field(src)
+	full_cleanup()
+	return ..()
+
+/datum/proximity_monitor/advanced/proc/assume_params(list/field_params)
+	var/pass_check = TRUE
+	for(var/param in field_params)
+		if(vars[param] || isnull(vars[param]) || (param in vars))
+			vars[param] = field_params[param]
+		else
+			pass_check = FALSE
+	return pass_check
+
+/datum/proximity_monitor/advanced/proc/check_variables()
+	var/pass = TRUE
+	if(field_shape == FIELD_NO_SHAPE)	//If you're going to make a manually updated field you shouldn't be using automatic checks so don't.
+		pass = FALSE
+	if(current_range < 0 || square_height < 0 || square_width < 0 || square_depth_up < 0 || square_depth_down < 0)
+		pass = FALSE
+	if(!istype(host))
+		pass = FALSE
+	return pass
+
+/datum/proximity_monitor/advanced/process()
+	if(process_inner_turfs)
+		for(var/turf/T in field_turfs)
+			process_inner_turf(T)
+			CHECK_TICK		//Really crappy lagchecks, needs improvement once someone starts using processed fields.
+	if(process_edge_turfs)
+		for(var/turf/T in edge_turfs)
+			process_edge_turf(T)
+			CHECK_TICK	//Same here.
+
+/datum/proximity_monitor/advanced/proc/process_inner_turf(turf/T)
+
+/datum/proximity_monitor/advanced/proc/process_edge_turf(turf/T)
+
+/datum/proximity_monitor/advanced/proc/Initialize()
+	setup_field()
+	post_setup_field()
+
+/datum/proximity_monitor/advanced/proc/full_cleanup()	 //Full cleanup for when you change something that would require complete resetting.
+	for(var/turf/T in edge_turfs)
+		cleanup_edge_turf(T)
+	for(var/turf/T in field_turfs)
+		cleanup_field_turf(T)
+
+/datum/proximity_monitor/advanced/proc/recalculate_field(ignore_movement_check = FALSE)	//Call every time the field moves (done automatically if you use update_center) or a setup specification is changed.
+	if(!(ignore_movement_check || ((host.loc != last_host_loc) && (field_shape != FIELD_NO_SHAPE))))
+		return
+	update_new_turfs()
+	var/list/turf/needs_setup = field_turfs_new.Copy()
+	if(setup_field_turfs)
+		for(var/turf/T in field_turfs)
+			if(!(T in needs_setup))
+				cleanup_field_turf(T)
+			else
+				needs_setup -= T
+			CHECK_TICK
+		for(var/turf/T in needs_setup)
+			setup_field_turf(T)
+			CHECK_TICK
+	if(setup_edge_turfs)
+		for(var/turf/T in edge_turfs)
+			cleanup_edge_turf(T)
+			CHECK_TICK
+		for(var/turf/T in edge_turfs_new)
+			setup_edge_turf(T)
+			CHECK_TICK
+
+/datum/proximity_monitor/advanced/proc/field_turf_canpass(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_turf/F, turf/entering)
+	return TRUE
+
+/datum/proximity_monitor/advanced/proc/field_turf_uncross(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_turf/F)
+	return TRUE
+
+/datum/proximity_monitor/advanced/proc/field_turf_crossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_turf/F)
+	return TRUE
+
+/datum/proximity_monitor/advanced/proc/field_turf_uncrossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_turf/F)
+	return TRUE
+
+/datum/proximity_monitor/advanced/proc/field_edge_canpass(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F, turf/entering)
+	return TRUE
+
+/datum/proximity_monitor/advanced/proc/field_edge_uncross(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F)
+	return TRUE
+
+/datum/proximity_monitor/advanced/proc/field_edge_crossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F)
+	return TRUE
+
+/datum/proximity_monitor/advanced/proc/field_edge_uncrossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F)
+	return TRUE
+
+/datum/proximity_monitor/advanced/HandleMove()
+	var/atom/_host = host
+	var/atom/new_host_loc = _host.loc
+	if(last_host_loc != new_host_loc)
+		recalculate_field()
+
+/datum/proximity_monitor/advanced/proc/post_setup_field()
+
+/datum/proximity_monitor/advanced/proc/setup_field()
+	update_new_turfs()
+	if(setup_field_turfs)
+		for(var/turf/T in field_turfs_new)
+			setup_field_turf(T)
+			CHECK_TICK
+	if(setup_edge_turfs)
+		for(var/turf/T in edge_turfs_new)
+			setup_edge_turf(T)
+			CHECK_TICK
+
+/datum/proximity_monitor/advanced/proc/cleanup_field_turf(turf/T)
+	qdel(field_turfs[T])
+	field_turfs -= T
+
+/datum/proximity_monitor/advanced/proc/cleanup_edge_turf(turf/T)
+	qdel(edge_turfs[T])
+	edge_turfs -= T
+
+/datum/proximity_monitor/advanced/proc/setup_field_turf(turf/T)
+	field_turfs[T] = new /obj/effect/abstract/proximity_checker/advanced/field_turf(T, src)
+
+/datum/proximity_monitor/advanced/proc/setup_edge_turf(turf/T)
+	edge_turfs[T] = new /obj/effect/abstract/proximity_checker/advanced/field_edge(T, src)
+
+/datum/proximity_monitor/advanced/proc/update_new_turfs()
+	if(!istype(host))
+		return FALSE
+	last_host_loc = host.loc
+	var/turf/center = get_turf(host)
+	field_turfs_new = list()
+	edge_turfs_new = list()
+	switch(field_shape)
+		if(FIELD_NO_SHAPE)
+			return FALSE
+		if(FIELD_SHAPE_RADIUS_SQUARE)
+			for(var/turf/T in block(locate(center.x-current_range,center.y-current_range,center.z-square_depth_down),locate(center.x+current_range, center.y+current_range,center.z+square_depth_up)))
+				field_turfs_new += T
+			edge_turfs_new = field_turfs_new.Copy()
+			if(current_range >= 1)
+				var/list/turf/center_turfs = list()
+				for(var/turf/T in block(locate(center.x-current_range+1,center.y-current_range+1,center.z-square_depth_down),locate(center.x+current_range-1, center.y+current_range-1,center.z+square_depth_up)))
+					center_turfs += T
+				for(var/turf/T in center_turfs)
+					edge_turfs_new -= T
+		if(FIELD_SHAPE_CUSTOM_SQUARE)
+			for(var/turf/T in block(locate(center.x-square_width,center.y-square_height,center.z-square_depth_down),locate(center.x+square_width, center.y+square_height,center.z+square_depth_up)))
+				field_turfs_new += T
+			edge_turfs_new = field_turfs_new.Copy()
+			if(square_height >= 1 && square_width >= 1)
+				var/list/turf/center_turfs = list()
+				for(var/turf/T in block(locate(center.x-square_width+1,center.y-square_height+1,center.z-square_depth_down),locate(center.x+square_width-1, center.y+square_height-1,center.z+square_depth_up)))
+					center_turfs += T
+				for(var/turf/T in center_turfs)
+					edge_turfs_new -= T
+
+//Gets edge direction/corner, only works with square radius/WDH fields!
+/datum/proximity_monitor/advanced/proc/get_edgeturf_direction(turf/T, turf/center_override = null)
+	var/turf/checking_from = get_turf(host)
+	if(istype(center_override))
+		checking_from = center_override
+	if(field_shape != FIELD_SHAPE_RADIUS_SQUARE && field_shape != FIELD_SHAPE_CUSTOM_SQUARE)
+		return
+	if(!(T in edge_turfs))
+		return
+	switch(field_shape)
+		if(FIELD_SHAPE_RADIUS_SQUARE)
+			if(((T.x == (checking_from.x + current_range)) || (T.x == (checking_from.x - current_range))) && ((T.y == (checking_from.y + current_range)) || (T.y == (checking_from.y - current_range))))
+				return get_dir(checking_from, T)
+			if(T.x == (checking_from.x + current_range))
+				return EAST
+			if(T.x == (checking_from.x - current_range))
+				return WEST
+			if(T.y == (checking_from.y - current_range))
+				return SOUTH
+			if(T.y == (checking_from.y + current_range))
+				return NORTH
+		if(FIELD_SHAPE_CUSTOM_SQUARE)
+			if(((T.x == (checking_from.x + square_width)) || (T.x == (checking_from.x - square_width))) && ((T.y == (checking_from.y + square_height)) || (T.y == (checking_from.y - square_height))))
+				return get_dir(checking_from, T)
+			if(T.x == (checking_from.x + square_width))
+				return EAST
+			if(T.x == (checking_from.x - square_width))
+				return WEST
+			if(T.y == (checking_from.y - square_height))
+				return SOUTH
+			if(T.y == (checking_from.y + square_height))
+				return NORTH
+
+//DEBUG FIELDS
+/datum/proximity_monitor/advanced/debug
+	name = "\improper Color Matrix Field"
+	field_shape = FIELD_SHAPE_RADIUS_SQUARE
+	current_range = 5
+	var/set_fieldturf_color = "#aaffff"
+	var/set_edgeturf_color = "#ffaaff"
+	setup_field_turfs = TRUE
+	setup_edge_turfs = TRUE
+
+/datum/proximity_monitor/advanced/debug/recalculate_field()
+	..()
+
+/datum/proximity_monitor/advanced/debug/post_setup_field()
+	..()
+
+/datum/proximity_monitor/advanced/debug/setup_edge_turf(turf/T)
+	T.color = set_edgeturf_color
+	..()
+
+/datum/proximity_monitor/advanced/debug/cleanup_edge_turf(turf/T)
+	T.color = initial(T.color)
+	..()
+	if(T in field_turfs)
+		T.color = set_fieldturf_color
+
+/datum/proximity_monitor/advanced/debug/setup_field_turf(turf/T)
+	T.color = set_fieldturf_color
+	..()
+
+/datum/proximity_monitor/advanced/debug/cleanup_field_turf(turf/T)
+	T.color = initial(T.color)
+	..()
+
+//DEBUG FIELD ITEM
+/obj/item/device/multitool/field_debug
+	name = "strange multitool"
+	desc = "Seems to project a colored field!"
+	var/list/field_params = list("field_shape" = FIELD_SHAPE_RADIUS_SQUARE, "current_range" = 5, "set_fieldturf_color" = "#aaffff", "set_edgeturf_color" = "#ffaaff")
+	var/field_type = /datum/proximity_monitor/advanced/debug
+	var/operating = FALSE
+	var/datum/proximity_monitor/advanced/current = null
+
+/obj/item/device/multitool/field_debug/New()
+	START_PROCESSING(SSobj, src)
+	..()
+
+/obj/item/device/multitool/field_debug/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	QDEL_NULL(current)
+	..()
+
+/obj/item/device/multitool/field_debug/proc/setup_debug_field()
+	var/list/new_params = field_params.Copy()
+	new_params["host"] = src
+	current = make_field(field_type, new_params)
+
+/obj/item/device/multitool/field_debug/attack_self(mob/user)
+	operating = !operating
+	to_chat(user, "You turn the [src] [operating? "on":"off"].")
+	if(!istype(current) && operating)
+		setup_debug_field()
+	else if(!operating)
+		QDEL_NULL(current)
+
+/obj/item/device/multitool/field_debug/on_mob_move()
+	check_turf(get_turf(src))
+
+/obj/item/device/multitool/field_debug/process()
+	check_turf(get_turf(src))
+
+/obj/item/device/multitool/field_debug/proc/check_turf(turf/T)
+	current.HandleMove()

code/modules/fields/peaceborg_dampener.dm

@@ -0,0 +1,106 @@
+
+//Projectile dampening field that slows projectiles and lowers their damage for an energy cost deducted every 1/5 second.
+//Only use square radius for this!
+/datum/proximity_monitor/advanced/peaceborg_dampener
+	name = "\improper Hyperkinetic Dampener Field"
+	requires_processing = TRUE
+	setup_edge_turfs = TRUE
+	setup_field_turfs = TRUE
+	field_shape = FIELD_SHAPE_RADIUS_SQUARE
+	var/static/image/edgeturf_south = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_south")
+	var/static/image/edgeturf_north = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_north")
+	var/static/image/edgeturf_west = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_west")
+	var/static/image/edgeturf_east = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_east")
+	var/static/image/northwest_corner = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_northwest")
+	var/static/image/southwest_corner = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_southwest")
+	var/static/image/northeast_corner = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_northeast")
+	var/static/image/southeast_corner = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_southeast")
+	var/obj/item/borg/projectile_dampen/projector = null
+	var/list/obj/item/projectile/tracked
+	var/list/obj/item/projectile/staging
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/New()
+	tracked = list()
+	staging = list()
+	..()
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/process()
+	if(!istype(projector))
+		qdel(src)
+	var/list/ranged = list()
+	for(var/obj/item/projectile/P in range(current_range, get_turf(host)))
+		ranged += P
+	for(var/obj/item/projectile/P in tracked)
+		if(!(P in ranged) || !P.loc)
+			release_projectile(P)
+	for(var/mob/living/silicon/robot/R in range(current_range, get_turf(host)))
+		if(R.has_buckled_mobs())
+			for(var/mob/living/L in R.buckled_mobs)
+				L.visible_message("<span class='warning'>[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!</span>")	//I know it's bad.
+				L.Weaken(3)
+				R.unbuckle_mob(L)
+				do_sparks(5, 0, L)
+	..()
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/setup_edge_turf(turf/T)
+	..()
+	var/image/I = get_edgeturf_overlay(get_edgeturf_direction(T))
+	var/obj/effect/abstract/proximity_checker/advanced/F = edge_turfs[T]
+	F.appearance = I.appearance
+	F.invisibility = 0
+	F.layer = 5
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/cleanup_edge_turf(turf/T)
+	..()
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/proc/get_edgeturf_overlay(direction)
+	switch(direction)
+		if(NORTH)
+			return edgeturf_north
+		if(SOUTH)
+			return edgeturf_south
+		if(EAST)
+			return edgeturf_east
+		if(WEST)
+			return edgeturf_west
+		if(NORTHEAST)
+			return northeast_corner
+		if(NORTHWEST)
+			return northwest_corner
+		if(SOUTHEAST)
+			return southeast_corner
+		if(SOUTHWEST)
+			return southwest_corner
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/proc/capture_projectile(obj/item/projectile/P, track_projectile = TRUE)
+	if(P in tracked)
+		return
+	projector.dampen_projectile(P, track_projectile)
+	if(track_projectile)
+		tracked += P
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/proc/release_projectile(obj/item/projectile/P)
+	projector.restore_projectile(P)
+	tracked -= P
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/field_edge_uncrossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F)
+	if(!is_turf_in_field(get_turf(AM), src))
+		if(istype(AM, /obj/item/projectile))
+			if(AM in tracked)
+				release_projectile(AM)
+			else
+				capture_projectile(AM, FALSE)
+	return ..()
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/field_edge_crossed(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F)
+	if(istype(AM, /obj/item/projectile) && !(AM in tracked) && staging[AM] && !is_turf_in_field(staging[AM], src))
+		capture_projectile(AM)
+	staging -= AM
+	return ..()
+
+/datum/proximity_monitor/advanced/peaceborg_dampener/field_edge_canpass(atom/movable/AM, obj/effect/abstract/proximity_checker/advanced/field_edge/F, turf/entering)
+	if(istype(AM, /obj/item/projectile))
+		staging[AM] = get_turf(AM)
+	. = ..()
+	if(!.)
+		staging -= AM	//This one ain't goin' through.

code/modules/fields/turf_objects.dm

@@ -0,0 +1,76 @@
+
+/obj/effect/abstract/proximity_checker/advanced
+	name = "field"
+	desc = "Why can you see energy fields?!"
+	icon = null
+	icon_state = null
+	alpha = 0
+	invisibility = INVISIBILITY_ABSTRACT
+	flags = ABSTRACT|ON_BORDER
+	var/datum/proximity_monitor/advanced/parent = null
+
+/obj/effect/abstract/proximity_checker/advanced/Initialize(mapload, _monitor)
+	if(_monitor)
+		parent = _monitor
+	return ..()
+
+/obj/effect/abstract/proximity_checker/advanced/center
+	name = "field anchor"
+	desc = "No."
+
+/obj/effect/abstract/proximity_checker/advanced/field_turf
+	name = "energy field"
+	desc = "Get off my turf!"
+
+/obj/effect/abstract/proximity_checker/advanced/field_turf/CanPass(atom/movable/AM, turf/target, height)
+	if(parent)
+		return parent.field_turf_canpass(AM, src, target)
+	return TRUE
+
+/obj/effect/abstract/proximity_checker/advanced/field_turf/Crossed(atom/movable/AM)
+	if(parent)
+		return parent.field_turf_crossed(AM, src)
+	return TRUE
+
+/obj/effect/abstract/proximity_checker/advanced/field_turf/Uncross(atom/movable/AM)
+	if(parent)
+		return parent.field_turf_uncross(AM, src)
+	return TRUE
+
+/obj/effect/abstract/proximity_checker/advanced/field_turf/Uncrossed(atom/movable/AM)
+	if(parent)
+		return parent.field_turf_uncrossed(AM, src)
+	return TRUE
+
+/obj/effect/abstract/proximity_checker/advanced/field_edge
+	name = "energy field edge"
+	desc = "Edgy description here."
+
+/obj/effect/abstract/proximity_checker/advanced/field_edge/CanPass(atom/movable/AM, turf/target, height)
+	if(parent)
+		return parent.field_edge_canpass(AM, src, target)
+	return TRUE
+
+/obj/effect/abstract/proximity_checker/advanced/field_edge/Crossed(atom/movable/AM)
+	if(parent)
+		return parent.field_edge_crossed(AM, src)
+	return TRUE
+
+/obj/effect/abstract/proximity_checker/advanced/field_edge/Uncross(atom/movable/AM)
+	if(parent)
+		return parent.field_edge_uncross(AM, src)
+	return TRUE
+
+/obj/effect/abstract/proximity_checker/advanced/field_edge/Uncrossed(atom/movable/AM)
+	if(parent)
+		return parent.field_edge_uncrossed(AM, src)
+	return TRUE
+
+/proc/is_turf_in_field(turf/T, datum/proximity_monitor/advanced/F)	//Looking for ways to optimize this!
+	for(var/obj/effect/abstract/proximity_checker/advanced/O in T)
+		if(istype(O, /obj/effect/abstract/proximity_checker/advanced/field_edge))
+			if(O.parent == F)
+				return FIELD_EDGE
+		if(O.parent == F)
+			return FIELD_TURF
+	return NO_FIELD

code/modules/food_and_drinks/food/customizables.dm

@@ -135,7 +135,6 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/slice, reagents_per_slice)
 	..()
-	slice.name = "[customname] [initial(slice.name)]"
 	slice.filling_color = filling_color
 	slice.update_overlays(src)
 

code/modules/food_and_drinks/food/snacks.dm

@@ -215,8 +215,9 @@
 /obj/item/weapon/reagent_containers/food/snacks/proc/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/slice, reagents_per_slice)
 	slice.create_reagents(slice.volume)
 	reagents.trans_to(slice,reagents_per_slice)
-	if( name != initial(name) || desc != initial(desc) )
-		slice.name = "slice of [src]"
+	if(name != initial(name))
+		slice.name = "slice of [name]"
+	if(desc != initial(desc))
 		slice.desc = "[desc]"
 
 /obj/item/weapon/reagent_containers/food/snacks/proc/generate_trash(atom/location)

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -174,7 +174,6 @@
 		var/mob/living/carbon/human/gibee = occupant
 		sourcejob = gibee.job
 	var/sourcenutriment = mob_occupant.nutrition / 15
-	var/sourcetotalreagents = mob_occupant.reagents.total_volume
 	var/gibtype = /obj/effect/decal/cleanable/blood/gibs
 	var/typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
 	var/typeofskin = /obj/item/stack/sheet/animalhide/human
@@ -207,7 +206,6 @@
 			newmeat.reagents.add_reagent ("nutriment", sourcenutriment / meat_produced) // Thehehe. Fat guys go first
 			if(sourcejob)
 				newmeat.subjectjob = sourcejob
-		src.occupant.reagents.trans_to (newmeat, round (sourcetotalreagents / meat_produced, 1)) // Transfer all the reagents from the
 		allmeat[i] = newmeat
 		allskin = newskin
 

code/modules/language/codespeak.dm

@@ -0,0 +1,83 @@
+/datum/language/codespeak
+	name = "Codespeak"
+	desc = "Syndicate operatives can use a series of codewords to convey complex information, while sounding like random concepts and drinks to anyone listening in."
+	key = "t"
+	default_priority = 0
+	flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD
+	icon_state = "codespeak"
+
+/datum/language/codespeak/scramble(input)
+	var/lookup = check_cache(input)
+	if(lookup)
+		return lookup
+
+	. = ""
+	var/list/words = list()
+	while(length(.) < length(input))
+		words += generate_code_phrase(return_list=TRUE)
+		. = jointext(words, ", ")
+
+	. = capitalize(.)
+
+	var/input_ending = copytext(input, length(input))
+
+	var/static/list/endings
+	if(!endings)
+		endings = list("!", "?", ".")
+
+	if(input_ending in endings)
+		. += input_ending
+
+	add_to_cache(input, .)
+
+/obj/item/weapon/codespeak_manual
+	name = "codespeak manual"
+	desc = "The book's cover reads: \"Codespeak(tm) - Secure your communication with metaphors so elaborate, they seem randomly generated!\""
+	icon = 'icons/obj/library.dmi'
+	icon_state = "book2"
+	var/charges = 1
+
+/obj/item/weapon/codespeak_manual/attack_self(mob/living/user)
+	if(!isliving(user))
+		return
+
+	if(user.has_language(/datum/language/codespeak))
+		to_chat(user, "<span class='boldannounce'>You start skimming through [src], but you already know Codespeak.</span>")
+		return
+
+	to_chat(user, "<span class='boldannounce'>You start skimming through [src], and suddenly your mind is filled with codewords and responses.</span>")
+	user.grant_language(/datum/language/codespeak)
+
+	use_charge(user)
+
+/obj/item/weapon/codespeak_manual/attack(mob/living/M, mob/living/user)
+	if(!istype(M) || !istype(user))
+		return
+	if(M == user)
+		attack_self(user)
+		return
+
+	playsound(loc, "punch", 25, 1, -1)
+
+	if(M.stat == DEAD)
+		M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>", "<span class='userdanger'>[user] smacks your lifeless corpse with [src].</span>", "<span class='italics'>You hear smacking.</span>")
+	else if(M.has_language(/datum/language/codespeak))
+		M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", "<span class='userdanger'>[user] beats you over the head with [src]!</span>", "<span class='italics'>You hear smacking.</span>")
+	else
+		M.visible_message("<span class='notice'>[user] teaches [M] by beating them over the head with [src]!</span>", "<span class='boldnotice'>As [user] hits you with [src], codewords and responses flow through your mind.</span>", "<span class='italics'>You hear smacking.</span>")
+		M.grant_language(/datum/language/codespeak)
+		use_charge(user)
+
+/obj/item/weapon/codespeak_manual/proc/use_charge(mob/user)
+	charges--
+	if(!charges)
+		var/turf/T = get_turf(src)
+		T.visible_message("<span class='warning'>The cover and contents of [src] start shifting and changing!</span>")
+
+		qdel(src)
+		var/obj/item/weapon/book/manual/random/book = new(T)
+		user.put_in_active_hand(book)
+
+/obj/item/weapon/codespeak_manual/unlimited
+	name = "deluxe codespeak manual"
+	charges = INFINITY

code/modules/language/language.dm

@@ -56,16 +56,27 @@
 
 	return "[trim(full_name)]"
 
+/datum/language/proc/check_cache(input)
+	var/lookup = scramble_cache[input]
+	if(lookup)
+		scramble_cache -= input
+		scramble_cache[input] = lookup
+	. = lookup
+
+/datum/language/proc/add_to_cache(input, scrambled_text)
+	// Add it to cache, cutting old entries if the list is too long
+	scramble_cache[input] = scrambled_text
+	if(scramble_cache.len > SCRAMBLE_CACHE_LEN)
+		scramble_cache.Cut(1, scramble_cache.len-SCRAMBLE_CACHE_LEN-1)
+
 /datum/language/proc/scramble(input)
 
 	if(!syllables || !syllables.len)
 		return stars(input)
 
 	// If the input is cached already, move it to the end of the cache and return it
-	var/lookup = scramble_cache[input]
+	var/lookup = check_cache(input)
 	if(lookup)
-		scramble_cache -= input
-		scramble_cache[input] = lookup
 		return lookup
 
 	var/input_size = length(input)
@@ -93,10 +104,7 @@
 	if(input_ending in list("!","?","."))
 		scrambled_text += input_ending
 
-	// Add it to cache, cutting old entries if the list is too long
-	scramble_cache[input] = scrambled_text
-	if(scramble_cache.len > SCRAMBLE_CACHE_LEN)
-		scramble_cache.Cut(1, scramble_cache.len-SCRAMBLE_CACHE_LEN-1)
+	add_to_cache(input, scrambled_text)
 
 	return scrambled_text
 

code/modules/language/language_holder.dm

@@ -64,6 +64,24 @@
 				return LANGUAGE_SHADOWED
 	return FALSE
 
+/datum/language_holder/proc/copy_known_languages_from(thing, replace=FALSE)
+	var/datum/language_holder/other
+	if(istype(thing, /datum/language_holder))
+		other = thing
+	else if(istype(thing, /atom/movable))
+		var/atom/movable/AM = thing
+		other = AM.get_language_holder()
+	else if(istype(thing, /datum/mind))
+		var/datum/mind/M = thing
+		other = M.get_language_holder()
+
+	if(replace)
+		src.remove_all_languages()
+
+	for(var/l in other.languages)
+		src.grant_language(l)
+
+
 /datum/language_holder/proc/open_language_menu(mob/user)
 	if(!language_menu)
 		language_menu = new(src)

code/modules/mining/aux_base.dm

@@ -2,7 +2,8 @@
 
 #define BAD_ZLEVEL	1
 #define BAD_AREA	2
-#define ZONE_SET	3
+#define BAD_COORDS	3
+#define ZONE_SET	4
 
 /area/shuttle/auxillary_base
 	name = "Auxillary Base"
@@ -149,6 +150,9 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
 		if(T.z != ZLEVEL_MINING)
 			return BAD_ZLEVEL
 		var/colony_radius = max(base_dock.width, base_dock.height)*0.5
+		if(T.x - colony_radius < 1 || T.x + colony_radius >= world.maxx || T.y - colony_radius < 1 || T.y + colony_radius >= world.maxx)
+			return BAD_COORDS //Avoid dropping the base too close to map boundaries, as it results in parts of it being left in space
+
 		var/list/area_counter = get_areas_in_range(colony_radius, T)
 		if(area_counter.len > 1) //Avoid smashing ruins unless you are inside a really big one
 			return BAD_AREA
@@ -195,6 +199,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
 	if(!do_after(user, 50, target = user)) //You get a few seconds to cancel if you do not want to drop there.
 		setting = FALSE
 		return
+	setting = FALSE
 
 	var/turf/T = get_turf(user)
 	var/obj/machinery/computer/auxillary_base/AB
@@ -212,6 +217,8 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
 			to_chat(user, "<span class='warning'>This uplink can only be used in a designed mining zone.</span>")
 		if(BAD_AREA)
 			to_chat(user, "<span class='warning'>Unable to acquire a targeting lock. Find an area clear of stuctures or entirely within one.</span>")
+		if(BAD_COORDS)
+			to_chat(user, "<span class='warning'>Location is too close to the edge of the station's scanning range. Move several paces away and try again.</span>")
 		if(ZONE_SET)
 			qdel(src)
 
@@ -347,4 +354,5 @@ obj/docking_port/stationary/public_mining_dock/onShuttleMove()
 
 #undef BAD_ZLEVEL
 #undef BAD_AREA
+#undef BAD_COORDS
 #undef ZONE_SET

code/modules/mining/equipment.dm

@@ -447,10 +447,10 @@
 			minerals += M
 	if(minerals.len)
 		for(var/turf/closed/mineral/M in minerals)
-			var/obj/effect/overlay/temp/mining_overlay/C = new /obj/effect/overlay/temp/mining_overlay(M)
+			var/obj/effect/temp_visual/mining_overlay/C = new /obj/effect/temp_visual/mining_overlay(M)
 			C.icon_state = M.scan_state
 
-/obj/effect/overlay/temp/mining_overlay
+/obj/effect/temp_visual/mining_overlay
 	layer = FLASH_LAYER
 	icon = 'icons/turf/smoothrocks.dmi'
 	anchored = 1
@@ -510,79 +510,66 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped")
 	sharpness = IS_SHARP
-	var/charged = 1
-	var/charge_time = 16
-	var/atom/mark = null
-	var/mutable_appearance/marked_underlay
+	var/charged = TRUE
+	var/charge_time = 14
 
 /obj/item/projectile/destabilizer
 	name = "destabilizing force"
 	icon_state = "pulse1"
+	nodamage = TRUE
 	damage = 0 //We're just here to mark people. This is still a melee weapon.
 	damage_type = BRUTE
 	flag = "bomb"
 	range = 6
-	var/obj/item/weapon/twohanded/required/mining_hammer/hammer_synced =  null
 	log_override = TRUE
+	var/obj/item/weapon/twohanded/required/mining_hammer/hammer_synced
+
+/obj/item/projectile/destabilizer/Destroy()
+	hammer_synced = null
+	return ..()
 
 /obj/item/projectile/destabilizer/on_hit(atom/target, blocked = 0)
-	if(hammer_synced)
-		if(hammer_synced.mark == target)
-			return ..()
-		if(isliving(target))
-			if(hammer_synced.mark && hammer_synced.marked_underlay)
-				hammer_synced.mark.underlays -= hammer_synced.marked_underlay
-				hammer_synced.marked_underlay = null
-			var/mob/living/L = target
-			if(L.mob_size >= MOB_SIZE_LARGE)
-				hammer_synced.mark = L
-				hammer_synced.marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2")
-				hammer_synced.marked_underlay.pixel_x = -L.pixel_x
-				hammer_synced.marked_underlay.pixel_y = -L.pixel_y
-				L.underlays += hammer_synced.marked_underlay
-		var/target_turf = get_turf(target)
-		if(ismineralturf(target_turf))
-			var/turf/closed/mineral/M = target_turf
-			new /obj/effect/overlay/temp/kinetic_blast(M)
-			M.gets_drilled(firer)
+	if(isliving(target))
+		var/mob/living/L = target
+		var/datum/status_effect/crusher_mark/CM = L.apply_status_effect(STATUS_EFFECT_CRUSHERMARK)
+		CM.hammer_synced = hammer_synced
+	var/target_turf = get_turf(target)
+	if(ismineralturf(target_turf))
+		var/turf/closed/mineral/M = target_turf
+		new /obj/effect/temp_visual/kinetic_blast(M)
+		M.gets_drilled(firer)
 	..()
 
 /obj/item/weapon/twohanded/required/mining_hammer/afterattack(atom/target, mob/user, proximity_flag)
 	if(!proximity_flag && charged)//Mark a target, or mine a tile.
-		var/turf/proj_turf = get_turf(src)
+		var/turf/proj_turf = user.loc
 		if(!isturf(proj_turf))
 			return
-		var/datum/gas_mixture/environment = proj_turf.return_air()
-		var/pressure = environment.return_pressure()
-		if(pressure > 50)
-			playsound(user, 'sound/weapons/empty.ogg', 100, 1)
-			return
-		var/obj/item/projectile/destabilizer/D = new /obj/item/projectile/destabilizer(user.loc)
-		D.preparePixelProjectile(target,get_turf(target), user)
+		var/obj/item/projectile/destabilizer/D = new /obj/item/projectile/destabilizer(proj_turf)
+		D.preparePixelProjectile(target, get_turf(target), user)
 		D.hammer_synced = src
 		playsound(user, 'sound/weapons/plasma_cutter.ogg', 100, 1)
 		D.fire()
-		charged = 0
+		charged = FALSE
 		icon_state = "mining_hammer1_uncharged"
 		addtimer(CALLBACK(src, .proc/Recharge), charge_time)
 		return
-	if(proximity_flag && target == mark && isliving(target))
+	if(proximity_flag && isliving(target))
 		var/mob/living/L = target
-		new /obj/effect/overlay/temp/kinetic_blast(get_turf(L))
-		mark = 0
-		if(L.mob_size >= MOB_SIZE_LARGE)
-			L.underlays -= marked_underlay
-			QDEL_NULL(marked_underlay)
-			var/backstab_dir = get_dir(user, L)
-			var/def_check = L.getarmor(type = "bomb")
-			if((user.dir & backstab_dir) && (L.dir & backstab_dir))
-				L.apply_damage(80, BRUTE, blocked = def_check)
-				playsound(user, 'sound/weapons/Kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong
-			else
-				L.apply_damage(50, BRUTE, blocked = def_check)
+		var/datum/status_effect/crusher_mark/CM = L.has_status_effect(STATUS_EFFECT_CRUSHERMARK)
+		if(!CM || CM.hammer_synced != src || !L.remove_status_effect(STATUS_EFFECT_CRUSHERMARK))
+			return
+		new /obj/effect/temp_visual/kinetic_blast(get_turf(L))
+		var/backstab_dir = get_dir(user, L)
+		var/def_check = L.getarmor(type = "bomb")
+		if((user.dir & backstab_dir) && (L.dir & backstab_dir))
+			L.apply_damage(80, BRUTE, blocked = def_check)
+			playsound(user, 'sound/weapons/Kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong
+		else
+			L.apply_damage(50, BRUTE, blocked = def_check)
 
 /obj/item/weapon/twohanded/required/mining_hammer/proc/Recharge()
 	if(!charged)
-		charged = 1
+		charged = TRUE
 		icon_state = "mining_hammer1"
 		playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)

code/modules/mining/lavaland/necropolis_chests.dm

@@ -1,5 +1,6 @@
 //The chests dropped by mob spawner tendrils. Also contains associated loot.
 
+
 /obj/structure/closet/crate/necropolis
 	name = "necropolis chest"
 	desc = "It's watching you closely."
@@ -672,7 +673,7 @@
 		if(!istype(T))
 			return
 		if(!istype(T, turf_type))
-			var/obj/effect/overlay/temp/lavastaff/L = new /obj/effect/overlay/temp/lavastaff(T)
+			var/obj/effect/temp_visual/lavastaff/L = new /obj/effect/temp_visual/lavastaff(T)
 			L.alpha = 0
 			animate(L, alpha = 255, time = create_delay)
 			user.visible_message("<span class='danger'>[user] points [src] at [T]!</span>")
@@ -695,7 +696,7 @@
 				timer = world.time + reset_cooldown
 				playsound(T,'sound/magic/Fireball.ogg', 200, 1)
 
-/obj/effect/overlay/temp/lavastaff
+/obj/effect/temp_visual/lavastaff
 	icon_state = "lavastaff_warn"
 	duration = 50
 
@@ -820,7 +821,9 @@
 			timer = world.time + cooldown_time
 			if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one!
 				chaser_timer = world.time + chaser_cooldown
-				new /obj/effect/overlay/temp/hierophant/chaser(get_turf(user), user, target, chaser_speed, friendly_fire_check)
+				var/obj/effect/temp_visual/hierophant/chaser/C = new(get_turf(user), user, target, chaser_speed, friendly_fire_check)
+				C.damage = 30
+				C.monster_damage_boost = FALSE
 				add_logs(user, target, "fired a chaser at", src)
 			else
 				INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast
@@ -875,7 +878,7 @@
 			if(do_after(user, 50, target = user) && !beacon)
 				var/turf/T = get_turf(user)
 				playsound(T,'sound/magic/Blind.ogg', 200, 1, -4)
-				new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user)
+				new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user)
 				beacon = new/obj/effect/hierophant(T)
 				user.update_action_buttons_icon()
 				user.visible_message("<span class='hierophant_warning'>[user] places a strange machine beneath [user.p_their()] feet!</span>", \
@@ -902,8 +905,8 @@
 	timer = world.time + 50
 	INVOKE_ASYNC(src, .proc/prepare_icon_update)
 	beacon.icon_state = "hierophant_tele_on"
-	var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE1 = new /obj/effect/overlay/temp/hierophant/telegraph/edge(user.loc)
-	var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE2 = new /obj/effect/overlay/temp/hierophant/telegraph/edge(beacon.loc)
+	var/obj/effect/temp_visual/hierophant/telegraph/edge/TE1 = new /obj/effect/temp_visual/hierophant/telegraph/edge(user.loc)
+	var/obj/effect/temp_visual/hierophant/telegraph/edge/TE2 = new /obj/effect/temp_visual/hierophant/telegraph/edge(beacon.loc)
 	if(do_after(user, 40, target = user) && user && beacon)
 		var/turf/T = get_turf(beacon)
 		var/turf/source = get_turf(user)
@@ -915,8 +918,8 @@
 			INVOKE_ASYNC(src, .proc/prepare_icon_update)
 			beacon.icon_state = "hierophant_tele_off"
 			return
-		new /obj/effect/overlay/temp/hierophant/telegraph(T, user)
-		new /obj/effect/overlay/temp/hierophant/telegraph(source, user)
+		new /obj/effect/temp_visual/hierophant/telegraph(T, user)
+		new /obj/effect/temp_visual/hierophant/telegraph(source, user)
 		playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
 		playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
 		if(!do_after(user, 3, target = user) || !user || !beacon || QDELETED(beacon)) //no walking away shitlord
@@ -937,13 +940,13 @@
 			beacon.icon_state = "hierophant_tele_off"
 			return
 		add_logs(user, beacon, "teleported self from ([source.x],[source.y],[source.z]) to")
-		new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user)
-		new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, user)
+		new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user)
+		new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user)
 		for(var/t in RANGE_TURFS(1, T))
-			var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies
+			var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies
 			B.damage = 30
 		for(var/t in RANGE_TURFS(1, source))
-			var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
+			var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
 			B.damage = 30
 		for(var/mob/living/L in range(1, source))
 			INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along
@@ -988,10 +991,10 @@
 /obj/item/weapon/hierophant_club/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
 	if(!T)
 		return
-	new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, user)
+	new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, user)
 	playsound(T,'sound/effects/bin_close.ogg', 200, 1)
 	sleep(2)
-	new /obj/effect/overlay/temp/hierophant/blast(T, user, friendly_fire_check)
+	new /obj/effect/temp_visual/hierophant/blast(T, user, friendly_fire_check)
 	for(var/d in GLOB.cardinal)
 		INVOKE_ASYNC(src, .proc/blast_wall, T, d, user)
 
@@ -1004,15 +1007,18 @@
 	for(var/i in 1 to range)
 		if(!J)
 			return
-		new /obj/effect/overlay/temp/hierophant/blast(J, user, friendly_fire_check)
+		var/obj/effect/temp_visual/hierophant/blast/B = new(J, user, friendly_fire_check)
+		B.damage = 30
+		B.monster_damage_boost = FALSE
 		previousturf = J
 		J = get_step(previousturf, dir)
 
 /obj/item/weapon/hierophant_club/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target
 	if(!T)
 		return
-	new /obj/effect/overlay/temp/hierophant/telegraph(T, user)
+	new /obj/effect/temp_visual/hierophant/telegraph(T, user)
 	playsound(T,'sound/effects/bin_close.ogg', 200, 1)
 	sleep(2)
 	for(var/t in RANGE_TURFS(1, T))
-		new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check)
+		var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check)
+		B.damage = 15 //keeps monster damage boost due to lower damage

code/modules/mob/living/carbon/alien/death.dm

@@ -5,10 +5,10 @@
 		new /obj/effect/gibspawner/xenobodypartless(loc,viruses)
 
 /mob/living/carbon/alien/gib_animation()
-	new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-a")
+	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-a")
 
 /mob/living/carbon/alien/spawn_dust()
 	new /obj/effect/decal/remains/xeno(loc)
 
 /mob/living/carbon/alien/dust_animation()
-	new /obj/effect/overlay/temp/dust_animation(loc, "dust-a")
+	new /obj/effect/temp_visual/dust_animation(loc, "dust-a")

code/modules/mob/living/carbon/alien/larva/death.dm

@@ -13,10 +13,10 @@
 		new /obj/effect/gibspawner/larvabodypartless(loc,viruses)
 
 /mob/living/carbon/alien/larva/gib_animation()
-	new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-l")
+	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-l")
 
 /mob/living/carbon/alien/larva/spawn_dust()
 	new /obj/effect/decal/remains/xeno(loc)
 
 /mob/living/carbon/alien/larva/dust_animation()
-	new /obj/effect/overlay/temp/dust_animation(loc, "dust-l")
+	new /obj/effect/temp_visual/dust_animation(loc, "dust-l")

code/modules/mob/living/carbon/alien/status_procs.dm

@@ -17,4 +17,4 @@
 /mob/living/carbon/alien/AdjustStunned(amount, updating = 1, ignore_canstun = 0)
 	. = ..()
 	if(!.)
-		move_delay_add = min(move_delay_add + round(amount / 2), 10)
+		move_delay_add = Clamp(move_delay_add + round(amount/2), 0, 10)

code/modules/mob/living/carbon/human/death.dm

@@ -1,8 +1,8 @@
 /mob/living/carbon/human/gib_animation()
-	new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-h")
+	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-h")
 
 /mob/living/carbon/human/dust_animation()
-	new /obj/effect/overlay/temp/dust_animation(loc, "dust-h")
+	new /obj/effect/temp_visual/dust_animation(loc, "dust-h")
 
 /mob/living/carbon/human/spawn_gibs(with_bodyparts)
 	if(with_bodyparts)

code/modules/mob/living/carbon/human/species_types/golems.dm

@@ -664,7 +664,7 @@
 		return
 
 	invisibility = INVISIBILITY_MAXIMUM //disappear before the animation
-	new /obj/effect/overlay/temp/mummy_animation(get_turf(src))
+	new /obj/effect/temp_visual/mummy_animation(get_turf(src))
 	if(cloth_golem.revive(full_heal = TRUE, admin_revive = TRUE))
 		cloth_golem.grab_ghost() //won't pull if it's a suicide
 	sleep(20)

code/modules/mob/living/carbon/monkey/death.dm

@@ -1,5 +1,5 @@
 /mob/living/carbon/monkey/gib_animation()
-	new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-m")
+	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-m")
 
 /mob/living/carbon/monkey/dust_animation()
-	new /obj/effect/overlay/temp/dust_animation(loc, "dust-m")
+	new /obj/effect/temp_visual/dust_animation(loc, "dust-m")

code/modules/mob/living/living.dm

@@ -820,7 +820,7 @@
 
 /mob/living/proc/has_bane(banetype)
 	var/datum/antagonist/devil/devilInfo = is_devil(src)
-	return (banetype == devilInfo.bane)
+	return devilInfo && banetype == devilInfo.bane
 
 /mob/living/proc/check_weakness(obj/item/weapon, mob/living/attacker)
 	if(mind && mind.has_antag_datum(ANTAG_DATUM_DEVIL))

code/modules/mob/living/silicon/robot/death.dm

@@ -1,6 +1,6 @@
 
 /mob/living/silicon/robot/gib_animation()
-	new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-r")
+	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-r")
 
 /mob/living/silicon/robot/dust()
 	if(mmi)
@@ -11,7 +11,7 @@
 	new /obj/effect/decal/remains/robot(loc)
 
 /mob/living/silicon/robot/dust_animation()
-	new /obj/effect/overlay/temp/dust_animation(loc, "dust-r")
+	new /obj/effect/temp_visual/dust_animation(loc, "dust-r")
 
 /mob/living/silicon/robot/death(gibbed)
 	if(stat == DEAD)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -198,9 +198,9 @@
 /obj/item/weapon/robot_module/proc/do_transform_animation()
 	var/mob/living/silicon/robot/R = loc
 	R.notransform = TRUE
-	var/obj/effect/overlay/temp/decoy/fading/fivesecond/ANM = new /obj/effect/overlay/temp/decoy/fading/fivesecond(R.loc, R)
+	var/obj/effect/temp_visual/decoy/fading/fivesecond/ANM = new /obj/effect/temp_visual/decoy/fading/fivesecond(R.loc, R)
 	ANM.layer = R.layer - 0.01
-	new /obj/effect/overlay/temp/small_smoke(R.loc)
+	new /obj/effect/temp_visual/small_smoke(R.loc)
 	if(R.hat)
 		R.hat.forceMove(get_turf(R))
 		R.hat = null
@@ -359,7 +359,8 @@
 		/obj/item/weapon/reagent_containers/borghypo/peace,
 		/obj/item/weapon/holosign_creator/cyborg,
 		/obj/item/borg/cyborghug/peacekeeper,
-		/obj/item/weapon/extinguisher)
+		/obj/item/weapon/extinguisher,
+		/obj/item/borg/projectile_dampen)
 	emag_modules = list(/obj/item/weapon/reagent_containers/borghypo/peace/hacked)
 	ratvar_modules = list(
 		/obj/item/clockwork/slab/cyborg/peacekeeper,

code/modules/mob/living/simple_animal/bot/bot.dm

@@ -299,7 +299,7 @@
 /mob/living/simple_animal/bot/emp_act(severity)
 	var/was_on = on
 	stat |= EMPED
-	new /obj/effect/overlay/temp/emp(loc)
+	new /obj/effect/temp_visual/emp(loc)
 	if(paicard)
 		paicard.emp_act(severity)
 		src.visible_message("[paicard] is flies out of [bot_name]!","<span class='warning'>You are forcefully ejected from [bot_name]!</span>")

code/modules/mob/living/simple_animal/bot/ed209bot.dm

@@ -444,7 +444,7 @@ Auto Patrol[]"},
 	if(severity==2 && prob(70))
 		..(severity-1)
 	else
-		new /obj/effect/overlay/temp/emp(loc)
+		new /obj/effect/temp_visual/emp(loc)
 		var/list/mob/living/carbon/targets = new
 		for(var/mob/living/carbon/C in view(12,src))
 			if(C.stat==2)

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -215,7 +215,7 @@
 	if(change)
 		if(change > 0)
 			if(M && stat != DEAD)
-				new /obj/effect/overlay/temp/heart(loc)
+				new /obj/effect/temp_visual/heart(loc)
 				emote("me", 1, "purrs!")
 		else
 			if(M && stat != DEAD)

code/modules/mob/living/simple_animal/friendly/dog.dm

@@ -552,7 +552,7 @@
 	if(change)
 		if(change > 0)
 			if(M && stat != DEAD) // Added check to see if this mob (the dog) is dead to fix issue 2454
-				new /obj/effect/overlay/temp/heart(loc)
+				new /obj/effect/temp_visual/heart(loc)
 				emote("me", 1, "yaps happily!")
 		else
 			if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)

code/modules/mob/living/simple_animal/guardian/guardian.dm

@@ -175,9 +175,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 			if(istype(summoner.loc, /obj/effect))
 				Recall(TRUE)
 			else
-				new /obj/effect/overlay/temp/guardian/phase/out(loc)
+				new /obj/effect/temp_visual/guardian/phase/out(loc)
 				forceMove(summoner.loc)
-				new /obj/effect/overlay/temp/guardian/phase(loc)
+				new /obj/effect/temp_visual/guardian/phase(loc)
 
 /mob/living/simple_animal/hostile/guardian/canSuicide()
 	return 0
@@ -315,7 +315,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 		return FALSE
 	if(loc == summoner)
 		forceMove(summoner.loc)
-		new /obj/effect/overlay/temp/guardian/phase(loc)
+		new /obj/effect/temp_visual/guardian/phase(loc)
 		cooldown = world.time + 10
 		return TRUE
 	return FALSE
@@ -323,7 +323,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 /mob/living/simple_animal/hostile/guardian/proc/Recall(forced)
 	if(!summoner || loc == summoner || (cooldown > world.time && !forced))
 		return FALSE
-	new /obj/effect/overlay/temp/guardian/phase/out(loc)
+	new /obj/effect/temp_visual/guardian/phase/out(loc)
 
 	forceMove(summoner)
 	cooldown = world.time + 10

code/modules/mob/living/simple_animal/guardian/types/assassin.dm

@@ -72,7 +72,7 @@
 		armour_penetration = 100
 		obj_damage = 0
 		environment_smash = 0
-		new /obj/effect/overlay/temp/guardian/phase/out(get_turf(src))
+		new /obj/effect/temp_visual/guardian/phase/out(get_turf(src))
 		alpha = 15
 		if(!forced)
 			to_chat(src, "<span class='danger'><B>You enter stealth, empowering your next attack.</span></B>")

code/modules/mob/living/simple_animal/guardian/types/charger.dm

@@ -40,7 +40,7 @@
 
 /mob/living/simple_animal/hostile/guardian/charger/Move()
 	if(charging)
-		new /obj/effect/overlay/temp/decoy/fading(loc,src)
+		new /obj/effect/temp_visual/decoy/fading(loc,src)
 	. = ..()
 
 /mob/living/simple_animal/hostile/guardian/charger/snapback()

code/modules/mob/living/simple_animal/guardian/types/explosive.dm

@@ -21,14 +21,14 @@
 	if(. && prob(40) && isliving(target))
 		var/mob/living/M = target
 		if(!M.anchored && M != summoner && !hasmatchingsummoner(M))
-			new /obj/effect/overlay/temp/guardian/phase/out(get_turf(M))
+			new /obj/effect/temp_visual/guardian/phase/out(get_turf(M))
 			do_teleport(M, M, 10)
 			for(var/mob/living/L in range(1, M))
 				if(hasmatchingsummoner(L)) //if the summoner matches don't hurt them
 					continue
 				if(L != src && L != summoner)
 					L.apply_damage(15, BRUTE)
-			new /obj/effect/overlay/temp/explosion(get_turf(M))
+			new /obj/effect/temp_visual/explosion(get_turf(M))
 
 /mob/living/simple_animal/hostile/guardian/bomb/AltClickOn(atom/movable/A)
 	if(!istype(A))
@@ -75,7 +75,7 @@
 			var/turf/T = get_turf(src)
 			stored_obj.forceMove(T)
 			playsound(T,'sound/effects/Explosion2.ogg', 200, 1)
-			new /obj/effect/overlay/temp/explosion(T)
+			new /obj/effect/temp_visual/explosion(T)
 			user.ex_act(2)
 			qdel(src)
 		else

code/modules/mob/living/simple_animal/guardian/types/protector.dm

@@ -63,6 +63,6 @@
 			else
 				to_chat(summoner, "<span class='holoparasite'>You moved out of range, and were pulled back! You can only move [range] meters from <font color=\"[namedatum.colour]\"><b>[real_name]</b></font>!</span>")
 				summoner.visible_message("<span class='danger'>\The [summoner] jumps back to [summoner.p_their()] protector.</span>")
-				new /obj/effect/overlay/temp/guardian/phase/out(get_turf(summoner))
+				new /obj/effect/temp_visual/guardian/phase/out(get_turf(summoner))
 				summoner.forceMove(get_turf(src))
-				new /obj/effect/overlay/temp/guardian/phase(get_turf(summoner))
+				new /obj/effect/temp_visual/guardian/phase(get_turf(summoner))

code/modules/mob/living/simple_animal/guardian/types/support.dm

@@ -34,7 +34,7 @@
 		C.adjustFireLoss(-5)
 		C.adjustOxyLoss(-5)
 		C.adjustToxLoss(-5)
-		var/obj/effect/overlay/temp/heal/H = new /obj/effect/overlay/temp/heal(get_turf(C))
+		var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(C))
 		if(namedatum)
 			H.color = namedatum.colour
 		if(C == summoner)
@@ -136,11 +136,11 @@
 		to_chat(src, "<span class='danger'><B>You need to hold still!</span></B>")
 		return
 
-	new /obj/effect/overlay/temp/guardian/phase/out(T)
+	new /obj/effect/temp_visual/guardian/phase/out(T)
 	if(isliving(A))
 		var/mob/living/L = A
 		L.flash_act()
 	A.visible_message("<span class='danger'>[A] disappears in a flash of light!</span>", \
 	"<span class='userdanger'>Your vision is obscured by a flash of light!</span>")
 	do_teleport(A, beacon, 0)
-	new /obj/effect/overlay/temp/guardian/phase(get_turf(A))
+	new /obj/effect/temp_visual/guardian/phase(get_turf(A))

code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm

@@ -16,7 +16,7 @@
 	melee_damage_upper = 20
 	health = 1000
 	maxHealth = 1000
-	loot = list(/obj/effect/overlay/temp/paperwiz_dying)
+	loot = list(/obj/effect/temp_visual/paperwiz_dying)
 	projectiletype = /obj/item/projectile/temp
 	projectilesound = 'sound/weapons/emitter.ogg'
 	attack_sound = 'sound/hallucinations/growl1.ogg'
@@ -129,7 +129,7 @@
 	qdel(src) //I see through your ruse!
 
 //fancy effects
-/obj/effect/overlay/temp/paper_scatter
+/obj/effect/temp_visual/paper_scatter
 	name = "scattering paper"
 	desc = "Pieces of paper scattering to the wind."
 	layer = ABOVE_OPEN_TURF_LAYER
@@ -139,7 +139,7 @@
 	duration = 5
 	randomdir = FALSE
 
-/obj/effect/overlay/temp/paperwiz_dying
+/obj/effect/temp_visual/paperwiz_dying
 	name = "craft portal"
 	desc = "A wormhole sucking the wizard into the void. Neat."
 	layer = ABOVE_OPEN_TURF_LAYER
@@ -149,18 +149,18 @@
 	duration = 18
 	randomdir = FALSE
 
-/obj/effect/overlay/temp/paperwiz_dying/Initialize()
+/obj/effect/temp_visual/paperwiz_dying/Initialize()
 	. = ..()
 	visible_message("<span class='boldannounce'>The wizard cries out in pain as a gate appears behind him, sucking him in!</span>")
 	playsound(get_turf(src),'sound/magic/MandSwap.ogg', 50, 1, 1)
 	playsound(get_turf(src),'sound/hallucinations/wail.ogg', 50, 1, 1)
 
-/obj/effect/overlay/temp/paperwiz_dying/Destroy()
+/obj/effect/temp_visual/paperwiz_dying/Destroy()
 	for(var/mob/M in range(7,src))
 		shake_camera(M, 7, 1)
 	var/turf/T = get_turf(src)
 	playsound(T,'sound/magic/Summon_Magic.ogg', 50, 1, 1)
-	new /obj/effect/overlay/temp/paper_scatter(T)
+	new /obj/effect/temp_visual/paper_scatter(T)
 	new /obj/item/clothing/suit/wizrobe/paper(T)
 	new /obj/item/clothing/head/collectable/paper(T)
 	return ..()

code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm

@@ -134,7 +134,7 @@ Difficulty: Hard
 
 /mob/living/simple_animal/hostile/megafauna/bubblegum/Move()
 	if(charging)
-		new /obj/effect/overlay/temp/decoy/fading(loc,src)
+		new /obj/effect/temp_visual/decoy/fading(loc,src)
 		DestroySurroundings()
 	. = ..()
 	if(!stat && .)
@@ -150,12 +150,12 @@ Difficulty: Hard
 	var/turf/T = get_turf(target)
 	if(!T || T == loc)
 		return
-	new /obj/effect/overlay/temp/dragon_swoop/bubblegum(T)
+	new /obj/effect/temp_visual/dragon_swoop/bubblegum(T)
 	charging = TRUE
 	DestroySurroundings()
 	walk(src, 0)
 	setDir(get_dir(src, T))
-	var/obj/effect/overlay/temp/decoy/D = new /obj/effect/overlay/temp/decoy(loc,src)
+	var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
 	animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 3)
 	sleep(3)
 	throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, .charge_end, bonus_charges))
@@ -245,9 +245,9 @@ Difficulty: Hard
 
 /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T, handedness)
 	if(handedness)
-		new /obj/effect/overlay/temp/bubblegum_hands/rightsmack(T)
+		new /obj/effect/temp_visual/bubblegum_hands/rightsmack(T)
 	else
-		new /obj/effect/overlay/temp/bubblegum_hands/leftsmack(T)
+		new /obj/effect/temp_visual/bubblegum_hands/leftsmack(T)
 	sleep(2.5)
 	for(var/mob/living/L in T)
 		if(!faction_check_mob(L))
@@ -259,11 +259,11 @@ Difficulty: Hard
 
 /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodgrab(turf/T, handedness)
 	if(handedness)
-		new /obj/effect/overlay/temp/bubblegum_hands/rightpaw(T)
-		new /obj/effect/overlay/temp/bubblegum_hands/rightthumb(T)
+		new /obj/effect/temp_visual/bubblegum_hands/rightpaw(T)
+		new /obj/effect/temp_visual/bubblegum_hands/rightthumb(T)
 	else
-		new /obj/effect/overlay/temp/bubblegum_hands/leftpaw(T)
-		new /obj/effect/overlay/temp/bubblegum_hands/leftthumb(T)
+		new /obj/effect/temp_visual/bubblegum_hands/leftpaw(T)
+		new /obj/effect/temp_visual/bubblegum_hands/leftthumb(T)
 	sleep(6)
 	for(var/mob/living/L in T)
 		if(!faction_check_mob(L))
@@ -276,31 +276,31 @@ Difficulty: Hard
 				addtimer(CALLBACK(src, .proc/devour, L), 2)
 	sleep(1)
 
-/obj/effect/overlay/temp/dragon_swoop/bubblegum
+/obj/effect/temp_visual/dragon_swoop/bubblegum
 	duration = 10
 
-/obj/effect/overlay/temp/bubblegum_hands
+/obj/effect/temp_visual/bubblegum_hands
 	icon = 'icons/effects/bubblegum.dmi'
 	duration = 9
 
-/obj/effect/overlay/temp/bubblegum_hands/rightthumb
+/obj/effect/temp_visual/bubblegum_hands/rightthumb
 	icon_state = "rightthumbgrab"
 
-/obj/effect/overlay/temp/bubblegum_hands/leftthumb
+/obj/effect/temp_visual/bubblegum_hands/leftthumb
 	icon_state = "leftthumbgrab"
 
-/obj/effect/overlay/temp/bubblegum_hands/rightpaw
+/obj/effect/temp_visual/bubblegum_hands/rightpaw
 	icon_state = "rightpawgrab"
 	layer = BELOW_MOB_LAYER
 
-/obj/effect/overlay/temp/bubblegum_hands/leftpaw
+/obj/effect/temp_visual/bubblegum_hands/leftpaw
 	icon_state = "leftpawgrab"
 	layer = BELOW_MOB_LAYER
 
-/obj/effect/overlay/temp/bubblegum_hands/rightsmack
+/obj/effect/temp_visual/bubblegum_hands/rightsmack
 	icon_state = "rightsmack"
 
-/obj/effect/overlay/temp/bubblegum_hands/leftsmack
+/obj/effect/temp_visual/bubblegum_hands/leftsmack
 	icon_state = "leftsmack"
 
 /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/blood_warp()
@@ -316,7 +316,7 @@ Difficulty: Hard
 	if(!pools.len)
 		return FALSE
 
-	var/obj/effect/overlay/temp/decoy/DA = new /obj/effect/overlay/temp/decoy(loc,src)
+	var/obj/effect/temp_visual/decoy/DA = new /obj/effect/temp_visual/decoy(loc,src)
 	DA.color = "#FF0000"
 	var/oldtransform = DA.transform
 	DA.transform = matrix()*2
@@ -358,7 +358,7 @@ Difficulty: Hard
 	new /obj/effect/decal/cleanable/blood/bubblegum(J)
 	for(var/i in 1 to range)
 		J = get_step(previousturf, targetdir)
-		new /obj/effect/overlay/temp/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J))
+		new /obj/effect/temp_visual/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J))
 		playsound(previousturf,'sound/effects/splat.ogg', 100, 1, -1)
 		if(!J || !previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])
 			break

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -95,7 +95,7 @@ Difficulty: Very Hard
 	..()
 	internal = new/obj/item/device/gps/internal/colossus(src)
 
-/obj/effect/overlay/temp/at_shield
+/obj/effect/temp_visual/at_shield
 	name = "anti-toolbox field"
 	desc = "A shimmering forcefield protecting the colossus."
 	icon = 'icons/effects/effects.dmi'
@@ -105,14 +105,14 @@ Difficulty: Very Hard
 	duration = 8
 	var/target
 
-/obj/effect/overlay/temp/at_shield/Initialize(mapload, new_target)
+/obj/effect/temp_visual/at_shield/Initialize(mapload, new_target)
 	. = ..()
 	target = new_target
 	INVOKE_ASYNC(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE)
 
 /mob/living/simple_animal/hostile/megafauna/colossus/bullet_act(obj/item/projectile/P)
 	if(!stat)
-		var/obj/effect/overlay/temp/at_shield/AT = new /obj/effect/overlay/temp/at_shield(src.loc, src)
+		var/obj/effect/temp_visual/at_shield/AT = new /obj/effect/temp_visual/at_shield(src.loc, src)
 		var/random_x = rand(-32, 32)
 		AT.pixel_x += random_x
 
@@ -581,7 +581,7 @@ Difficulty: Very Hard
 	if(..())
 		for(var/i in range(1, src))
 			if(isturf(i))
-				new /obj/effect/overlay/temp/cult/sparks(i)
+				new /obj/effect/temp_visual/cult/sparks(i)
 				continue
 			if(ishuman(i))
 				var/mob/living/carbon/human/H = i
@@ -675,7 +675,7 @@ Difficulty: Very Hard
 		var/mob/living/L = target
 		if(L.stat != DEAD)
 			L.heal_overall_damage(heal_power, heal_power)
-			new /obj/effect/overlay/temp/heal(get_turf(target), "#80F5FF")
+			new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF")
 
 /mob/living/simple_animal/hostile/lightgeist/ghostize()
 	. = ..()
@@ -699,7 +699,7 @@ Difficulty: Very Hard
 	if(..())
 		var/list/L = list()
 		var/turf/T = get_step(src, dir)
-		new /obj/effect/overlay/temp/emp/pulse(T)
+		new /obj/effect/temp_visual/emp/pulse(T)
 		for(var/i in T)
 			if(istype(i, /obj/item) && !is_type_in_typecache(i, banned_items_typecache))
 				var/obj/item/W = i

code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm

@@ -124,7 +124,7 @@ Difficulty: Medium
 	target.visible_message("<span class='boldwarning'>Fire rains from the sky!</span>")
 	for(var/turf/turf in range(9,get_turf(target)))
 		if(prob(11))
-			new /obj/effect/overlay/temp/target(turf)
+			new /obj/effect/temp_visual/target(turf)
 
 /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_walls()
 	playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1)
@@ -179,7 +179,7 @@ Difficulty: Medium
 		negative = FALSE
 	else if(target.x == initial_x) //if their x is the same, pick a direction
 		negative = prob(50)
-	var/obj/effect/overlay/temp/dragon_flight/F = new /obj/effect/overlay/temp/dragon_flight(loc, negative)
+	var/obj/effect/temp_visual/dragon_flight/F = new /obj/effect/temp_visual/dragon_flight(loc, negative)
 
 	negative = !negative //invert it for the swoop down later
 
@@ -208,7 +208,7 @@ Difficulty: Medium
 				if(L.stat == DEAD)
 					break //target is dead and we're on em, slam they
 		if(fire_rain)
-			new /obj/effect/overlay/temp/target(loc, flame_hit)
+			new /obj/effect/temp_visual/target(loc, flame_hit)
 		forceMove(get_step(src, get_dir(src, target)))
 		if(loc == get_turf(target))
 			if(!fire_rain)
@@ -228,8 +228,8 @@ Difficulty: Medium
 	else
 		if(IsInRange(x, initial_x - DRAKE_SWOOP_DIRECTION_CHANGE_RANGE, initial_x - 1))
 			negative = TRUE
-	new /obj/effect/overlay/temp/dragon_flight/end(loc, negative)
-	new /obj/effect/overlay/temp/dragon_swoop(loc)
+	new /obj/effect/temp_visual/dragon_flight/end(loc, negative)
+	new /obj/effect/temp_visual/dragon_swoop(loc)
 	animate(src, transform = oldtransform, time = 5)
 	sleep(5)
 	swooping &= ~SWOOP_INVULNERABLE
@@ -271,7 +271,7 @@ Difficulty: Medium
 	invisibility = 100
 
 
-/obj/effect/overlay/temp/fireball
+/obj/effect/temp_visual/fireball
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "fireball"
 	name = "fireball"
@@ -281,28 +281,28 @@ Difficulty: Medium
 	duration = 9
 	pixel_z = DRAKE_SWOOP_HEIGHT
 
-/obj/effect/overlay/temp/fireball/Initialize()
+/obj/effect/temp_visual/fireball/Initialize()
 	. = ..()
 	animate(src, pixel_z = 0, time = duration)
 
-/obj/effect/overlay/temp/target
+/obj/effect/temp_visual/target
 	icon = 'icons/mob/actions.dmi'
 	icon_state = "sniper_zoom"
 	layer = BELOW_MOB_LAYER
 	light_range = 2
 	duration = 9
 
-/obj/effect/overlay/temp/target/ex_act()
+/obj/effect/temp_visual/target/ex_act()
 	return
 
-/obj/effect/overlay/temp/target/Initialize(mapload, list/flame_hit)
+/obj/effect/temp_visual/target/Initialize(mapload, list/flame_hit)
 	. = ..()
 	INVOKE_ASYNC(src, .proc/fall, flame_hit)
 
-/obj/effect/overlay/temp/target/proc/fall(list/flame_hit)
+/obj/effect/temp_visual/target/proc/fall(list/flame_hit)
 	var/turf/T = get_turf(src)
 	playsound(T,'sound/magic/Fireball.ogg', 80, 1)
-	new /obj/effect/overlay/temp/fireball(T)
+	new /obj/effect/temp_visual/fireball(T)
 	sleep(duration)
 	if(ismineralturf(T))
 		var/turf/closed/mineral/M = T
@@ -320,7 +320,7 @@ Difficulty: Medium
 		else
 			L.adjustFireLoss(10) //if we've already hit them, do way less damage
 
-/obj/effect/overlay/temp/dragon_swoop
+/obj/effect/temp_visual/dragon_swoop
 	name = "certain death"
 	desc = "Don't just stand there, move!"
 	icon = 'icons/effects/96x96.dmi'
@@ -331,7 +331,7 @@ Difficulty: Medium
 	color = "#FF0000"
 	duration = 5
 
-/obj/effect/overlay/temp/dragon_flight
+/obj/effect/temp_visual/dragon_flight
 	icon = 'icons/mob/lavaland/dragon.dmi'
 	icon_state = "dragon"
 	layer = ABOVE_ALL_MOB_LAYER
@@ -339,11 +339,11 @@ Difficulty: Medium
 	duration = 10
 	randomdir = FALSE
 
-/obj/effect/overlay/temp/dragon_flight/Initialize(mapload, negative)
+/obj/effect/temp_visual/dragon_flight/Initialize(mapload, negative)
 	. = ..()
 	INVOKE_ASYNC(src, .proc/flight, negative)
 
-/obj/effect/overlay/temp/dragon_flight/proc/flight(negative)
+/obj/effect/temp_visual/dragon_flight/proc/flight(negative)
 	if(negative)
 		animate(src, pixel_x = -DRAKE_SWOOP_HEIGHT*0.10, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING)
 	else
@@ -355,12 +355,12 @@ Difficulty: Medium
 	else
 		animate(src, pixel_x = DRAKE_SWOOP_HEIGHT, pixel_z = DRAKE_SWOOP_HEIGHT, time = 7)
 
-/obj/effect/overlay/temp/dragon_flight/end
+/obj/effect/temp_visual/dragon_flight/end
 	pixel_x = DRAKE_SWOOP_HEIGHT
 	pixel_z = DRAKE_SWOOP_HEIGHT
 	duration = 5
 
-/obj/effect/overlay/temp/dragon_flight/end/flight(negative)
+/obj/effect/temp_visual/dragon_flight/end/flight(negative)
 	if(negative)
 		pixel_x = -DRAKE_SWOOP_HEIGHT
 		animate(src, pixel_x = -16, pixel_z = 0, time = 5)

code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

@@ -150,7 +150,7 @@ Difficulty: Hard
 		var/prevloc = loc
 		. = ..()
 		if(!stat && .)
-			var/obj/effect/overlay/temp/hierophant/squares/HS = new /obj/effect/overlay/temp/hierophant/squares(prevloc)
+			var/obj/effect/temp_visual/hierophant/squares/HS = new /obj/effect/temp_visual/hierophant/squares(prevloc)
 			HS.dir = dir
 			playsound(loc, 'sound/mecha/mechmove04.ogg', 150, 1, -4)
 			if(target)
@@ -250,7 +250,7 @@ Difficulty: Hard
 							pickedtarget = pick_n_take(targets)
 						if(!istype(pickedtarget) || pickedtarget.stat == DEAD)
 							pickedtarget = target
-						var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE)
+						var/obj/effect/temp_visual/hierophant/chaser/C = new /obj/effect/temp_visual/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE)
 						C.moving = 3
 						C.moving_dir = pick_n_take(cardinal_copy)
 						sleep(10)
@@ -280,10 +280,10 @@ Difficulty: Hard
 			else
 				INVOKE_ASYNC(src, .proc/diagonal_blasts, target)
 	else if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some!
-		var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, chaser_speed, FALSE)
+		var/obj/effect/temp_visual/hierophant/chaser/C = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, chaser_speed, FALSE)
 		chaser_cooldown = world.time + initial(chaser_cooldown)
 		if((prob(anger_modifier) || target.Adjacent(src)) && target != src)
-			var/obj/effect/overlay/temp/hierophant/chaser/OC = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE)
+			var/obj/effect/temp_visual/hierophant/chaser/OC = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE)
 			OC.moving = 4
 			OC.moving_dir = pick(GLOB.cardinal - C.moving_dir)
 	else //just release a burst of power
@@ -293,10 +293,10 @@ Difficulty: Hard
 	var/turf/T = get_turf(victim)
 	if(!T)
 		return
-	new /obj/effect/overlay/temp/hierophant/telegraph/diagonal(T, src)
+	new /obj/effect/temp_visual/hierophant/telegraph/diagonal(T, src)
 	playsound(T,'sound/effects/bin_close.ogg', 200, 1)
 	sleep(2)
-	new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
+	new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
 	for(var/d in GLOB.diagonals)
 		INVOKE_ASYNC(src, .proc/blast_wall, T, d)
 
@@ -304,10 +304,10 @@ Difficulty: Hard
 	var/turf/T = get_turf(victim)
 	if(!T)
 		return
-	new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, src)
+	new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, src)
 	playsound(T,'sound/effects/bin_close.ogg', 200, 1)
 	sleep(2)
-	new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
+	new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
 	for(var/d in GLOB.cardinal)
 		INVOKE_ASYNC(src, .proc/blast_wall, T, d)
 
@@ -315,10 +315,10 @@ Difficulty: Hard
 	var/turf/T = get_turf(victim)
 	if(!T)
 		return
-	new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
+	new /obj/effect/temp_visual/hierophant/telegraph(T, src)
 	playsound(T,'sound/effects/bin_close.ogg', 200, 1)
 	sleep(2)
-	new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
+	new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
 	for(var/d in GLOB.alldirs)
 		INVOKE_ASYNC(src, .proc/blast_wall, T, d)
 
@@ -327,7 +327,7 @@ Difficulty: Hard
 	var/turf/previousturf = T
 	var/turf/J = get_step(previousturf, set_dir)
 	for(var/i in 1 to range)
-		new /obj/effect/overlay/temp/hierophant/blast(J, src, FALSE)
+		new /obj/effect/temp_visual/hierophant/blast(J, src, FALSE)
 		previousturf = J
 		J = get_step(previousturf, set_dir)
 
@@ -342,8 +342,8 @@ Difficulty: Hard
 		INVOKE_ASYNC(src, .proc/arena_squares, T, d)
 	for(var/t in RANGE_TURFS(11, T))
 		if(t && get_dist(t, T) == 11)
-			new /obj/effect/overlay/temp/hierophant/wall(t)
-			new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
+			new /obj/effect/temp_visual/hierophant/wall(t)
+			new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE)
 	if(get_dist(src, T) >= 11) //hey you're out of range I need to get closer to you!
 		INVOKE_ASYNC(src, .proc/blink, T)
 
@@ -351,7 +351,7 @@ Difficulty: Hard
 	var/turf/previousturf = T
 	var/turf/J = get_step(previousturf, set_dir)
 	for(var/i in 1 to 10)
-		var/obj/effect/overlay/temp/hierophant/squares/HS = new /obj/effect/overlay/temp/hierophant/squares(J)
+		var/obj/effect/temp_visual/hierophant/squares/HS = new /obj/effect/temp_visual/hierophant/squares(J)
 		HS.dir = set_dir
 		previousturf = J
 		J = get_step(previousturf, set_dir)
@@ -362,19 +362,19 @@ Difficulty: Hard
 		return
 	var/turf/T = get_turf(victim)
 	var/turf/source = get_turf(src)
-	new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
-	new /obj/effect/overlay/temp/hierophant/telegraph(source, src)
+	new /obj/effect/temp_visual/hierophant/telegraph(T, src)
+	new /obj/effect/temp_visual/hierophant/telegraph(source, src)
 	playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
 	playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
 	blinking = TRUE
 	sleep(2) //short delay before we start...
-	new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, src)
-	new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, src)
+	new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src)
+	new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, src)
 	for(var/t in RANGE_TURFS(1, T))
-		var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
+		var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE)
 		B.damage = 30
 	for(var/t in RANGE_TURFS(1, source))
-		var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
+		var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE)
 		B.damage = 30
 	animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
 	sleep(1)
@@ -396,11 +396,11 @@ Difficulty: Hard
 	var/turf/T = get_turf(victim)
 	if(!T)
 		return
-	new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
+	new /obj/effect/temp_visual/hierophant/telegraph(T, src)
 	playsound(T,'sound/effects/bin_close.ogg', 200, 1)
 	sleep(2)
 	for(var/t in RANGE_TURFS(1, T))
-		new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
+		new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE)
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/proc/burst(turf/original) //release a wave of blasts
 	playsound(original,'sound/machines/AirlockOpen.ogg', 200, 1)
@@ -413,7 +413,7 @@ Difficulty: Hard
 		if(dist > last_dist)
 			last_dist = dist
 			sleep(1 + min(burst_range - last_dist, 12) * 0.5) //gets faster as it gets further out
-		new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
+		new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/AltClickOn(atom/A) //player control handler(don't give this to a player holy fuck)
 	if(!istype(A) || get_dist(A, src) <= 2)
@@ -421,29 +421,29 @@ Difficulty: Hard
 	blink(A)
 
 //Hierophant overlays
-/obj/effect/overlay/temp/hierophant
+/obj/effect/temp_visual/hierophant
 	name = "vortex energy"
 	layer = BELOW_MOB_LAYER
 	var/mob/living/caster //who made this, anyway
 
-/obj/effect/overlay/temp/hierophant/Initialize(mapload, new_caster)
+/obj/effect/temp_visual/hierophant/Initialize(mapload, new_caster)
 	. = ..()
 	if(new_caster)
 		caster = new_caster
 
-/obj/effect/overlay/temp/hierophant/squares
+/obj/effect/temp_visual/hierophant/squares
 	icon_state = "hierophant_squares"
 	duration = 3
 	light_range = 1
 	randomdir = FALSE
 
-/obj/effect/overlay/temp/hierophant/squares/Initialize(mapload, new_caster)
+/obj/effect/temp_visual/hierophant/squares/Initialize(mapload, new_caster)
 	. = ..()
 	if(ismineralturf(loc))
 		var/turf/closed/mineral/M = loc
 		M.gets_drilled(caster)
 
-/obj/effect/overlay/temp/hierophant/wall //smoothing and pooling were not friends, but pooling is dead.
+/obj/effect/temp_visual/hierophant/wall //smoothing and pooling were not friends, but pooling is dead.
 	name = "vortex wall"
 	icon = 'icons/turf/walls/hierophant_wall_temp.dmi'
 	icon_state = "wall"
@@ -451,21 +451,21 @@ Difficulty: Hard
 	duration = 100
 	smooth = SMOOTH_TRUE
 
-/obj/effect/overlay/temp/hierophant/wall/Initialize(mapload, new_caster)
+/obj/effect/temp_visual/hierophant/wall/Initialize(mapload, new_caster)
 	. = ..()
 	queue_smooth_neighbors(src)
 	queue_smooth(src)
 
-/obj/effect/overlay/temp/hierophant/wall/Destroy()
+/obj/effect/temp_visual/hierophant/wall/Destroy()
 	queue_smooth_neighbors(src)
 	return ..()
 
-/obj/effect/overlay/temp/hierophant/wall/CanPass(atom/movable/mover, turf/target, height = 0)
+/obj/effect/temp_visual/hierophant/wall/CanPass(atom/movable/mover, turf/target, height = 0)
 	if(mover == caster)
 		return TRUE
 	return FALSE
 
-/obj/effect/overlay/temp/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds.
+/obj/effect/temp_visual/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds.
 	duration = 98
 	var/mob/living/target //what it's following
 	var/turf/targetturf //what turf the target is actually on
@@ -478,8 +478,10 @@ Difficulty: Hard
 	var/speed = 3 //how many deciseconds between each step
 	var/currently_seeking = FALSE
 	var/friendly_fire_check = FALSE //if blasts produced apply friendly fire
+	var/monster_damage_boost = TRUE
+	var/damage = 10 
 
-/obj/effect/overlay/temp/hierophant/chaser/Initialize(mapload, new_caster, new_target, new_speed, is_friendly_fire)
+/obj/effect/temp_visual/hierophant/chaser/Initialize(mapload, new_caster, new_target, new_speed, is_friendly_fire)
 	. = ..()
 	target = new_target
 	friendly_fire_check = is_friendly_fire
@@ -487,14 +489,14 @@ Difficulty: Hard
 		speed = new_speed
 	addtimer(CALLBACK(src, .proc/seek_target), 1)
 
-/obj/effect/overlay/temp/hierophant/chaser/proc/get_target_dir()
+/obj/effect/temp_visual/hierophant/chaser/proc/get_target_dir()
 	. = get_cardinal_dir(src, targetturf)
 	if((. != previous_moving_dir && . == more_previouser_moving_dir) || . == 0) //we're alternating, recalculate
 		var/list/cardinal_copy = GLOB.cardinal.Copy()
 		cardinal_copy -= more_previouser_moving_dir
 		. = pick(cardinal_copy)
 
-/obj/effect/overlay/temp/hierophant/chaser/proc/seek_target()
+/obj/effect/temp_visual/hierophant/chaser/proc/seek_target()
 	if(!currently_seeking)
 		currently_seeking = TRUE
 		targetturf = get_turf(target)
@@ -521,43 +523,45 @@ Difficulty: Hard
 				moving--
 				sleep(speed)
 			targetturf = get_turf(target)
+/obj/effect/temp_visual/hierophant/chaser/proc/make_blast()
+	var/obj/effect/temp_visual/hierophant/blast/B = new(loc, caster, friendly_fire_check)
+	B.damage = damage
+	B.monster_damage_boost = monster_damage_boost
 
-/obj/effect/overlay/temp/hierophant/chaser/proc/make_blast()
-	new /obj/effect/overlay/temp/hierophant/blast(loc, caster, friendly_fire_check)
-
-/obj/effect/overlay/temp/hierophant/telegraph
+/obj/effect/temp_visual/hierophant/telegraph
 	icon = 'icons/effects/96x96.dmi'
 	icon_state = "hierophant_telegraph"
 	pixel_x = -32
 	pixel_y = -32
 	duration = 3
 
-/obj/effect/overlay/temp/hierophant/telegraph/diagonal
+/obj/effect/temp_visual/hierophant/telegraph/diagonal
 	icon_state = "hierophant_telegraph_diagonal"
 
-/obj/effect/overlay/temp/hierophant/telegraph/cardinal
+/obj/effect/temp_visual/hierophant/telegraph/cardinal
 	icon_state = "hierophant_telegraph_cardinal"
 
-/obj/effect/overlay/temp/hierophant/telegraph/teleport
+/obj/effect/temp_visual/hierophant/telegraph/teleport
 	icon_state = "hierophant_telegraph_teleport"
 	duration = 9
 
-/obj/effect/overlay/temp/hierophant/telegraph/edge
+/obj/effect/temp_visual/hierophant/telegraph/edge
 	icon_state = "hierophant_telegraph_edge"
 	duration = 40
 
-/obj/effect/overlay/temp/hierophant/blast
+/obj/effect/temp_visual/hierophant/blast
 	icon_state = "hierophant_blast"
 	name = "vortex blast"
 	light_range = 1
 	desc = "Get out of the way!"
 	duration = 9
 	var/damage = 10 //how much damage do we do?
+	var/monster_damage_boost = TRUE //do we deal extra damage to monsters? Used by the boss
 	var/list/hit_things = list() //we hit these already, ignore them
 	var/friendly_fire_check = FALSE
 	var/bursting = FALSE //if we're bursting and need to hit anyone crossing us
 
-/obj/effect/overlay/temp/hierophant/blast/Initialize(mapload, new_caster, friendly_fire)
+/obj/effect/temp_visual/hierophant/blast/Initialize(mapload, new_caster, friendly_fire)
 	. = ..()
 	friendly_fire_check = friendly_fire
 	if(new_caster)
@@ -567,7 +571,7 @@ Difficulty: Hard
 		M.gets_drilled(caster)
 	INVOKE_ASYNC(src, .proc/blast)
 
-/obj/effect/overlay/temp/hierophant/blast/proc/blast()
+/obj/effect/temp_visual/hierophant/blast/proc/blast()
 	var/turf/T = get_turf(src)
 	if(!T)
 		return
@@ -578,12 +582,12 @@ Difficulty: Hard
 	sleep(1.3) //slightly forgiving; the burst animation is 1.5 deciseconds
 	bursting = FALSE //we no longer damage crossers
 
-/obj/effect/overlay/temp/hierophant/blast/Crossed(atom/movable/AM)
+/obj/effect/temp_visual/hierophant/blast/Crossed(atom/movable/AM)
 	..()
 	if(bursting)
 		do_damage(get_turf(src))
 
-/obj/effect/overlay/temp/hierophant/blast/proc/do_damage(turf/T)
+/obj/effect/temp_visual/hierophant/blast/proc/do_damage(turf/T)
 	for(var/mob/living/L in T.contents - hit_things) //find and damage mobs...
 		hit_things += L
 		if((friendly_fire_check && caster && caster.faction_check_mob(L)) || L.stat == DEAD)
@@ -595,7 +599,7 @@ Difficulty: Hard
 		var/limb_to_hit = L.get_bodypart(pick("head", "chest", "r_arm", "l_arm", "r_leg", "l_leg"))
 		var/armor = L.run_armor_check(limb_to_hit, "melee", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 50, "Your armor was penetrated by [src]!")
 		L.apply_damage(damage, BURN, limb_to_hit, armor)
-		if(ismegafauna(L) || istype(L, /mob/living/simple_animal/hostile/asteroid))
+		if(monster_damage_boost && (ismegafauna(L) || istype(L, /mob/living/simple_animal/hostile/asteroid)))
 			L.adjustBruteLoss(damage)
 		add_logs(caster, L, "struck with a [name]")
 	for(var/obj/mecha/M in T.contents - hit_things) //and mechs.
@@ -630,7 +634,7 @@ Difficulty: Hard
 			INVOKE_ASYNC(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update)
 			if(do_after(user, 50, target = src))
 				playsound(src,'sound/magic/Blind.ogg', 200, 1, -4)
-				new /obj/effect/overlay/temp/hierophant/telegraph/teleport(get_turf(src), user)
+				new /obj/effect/temp_visual/hierophant/telegraph/teleport(get_turf(src), user)
 				to_chat(user, "<span class='hierophant_warning'>You collect [src], reattaching it to the club!</span>")
 				H.beacon = null
 				user.update_action_buttons_icon()

code/modules/mob/living/simple_animal/hostile/stickman.dm

@@ -52,7 +52,7 @@
 
 /mob/living/simple_animal/hostile/stickman/Initialize(mapload, var/wizard_summoned)
 	..()
-	new /obj/effect/overlay/temp/paper_scatter(src)
+	new /obj/effect/temp_visual/paper_scatter(src)
 	summoned_by_wizard = wizard_summoned
 
 /mob/living/simple_animal/hostile/stickman/death()

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -249,7 +249,7 @@
 
 /mob/living/simple_animal/gib_animation()
 	if(icon_gib)
-		new /obj/effect/overlay/temp/gib_animation/animal(loc, icon_gib)
+		new /obj/effect/temp_visual/gib_animation/animal(loc, icon_gib)
 
 /mob/living/simple_animal/say_mod(input, message_mode)
 	if(speak_emote && speak_emote.len)

code/modules/mob/mob.dm

@@ -292,14 +292,14 @@
 
 	if(!src || !isturf(src.loc) || !(A in view(src.loc)))
 		return 0
-	if(istype(A, /obj/effect/overlay/temp/point))
+	if(istype(A, /obj/effect/temp_visual/point))
 		return 0
 
 	var/tile = get_turf(A)
 	if (!tile)
 		return 0
 
-	new /obj/effect/overlay/temp/point(A,invisibility)
+	new /obj/effect/temp_visual/point(A,invisibility)
 
 	return 1
 

code/modules/mob/mob_movement.dm

@@ -242,12 +242,12 @@
 				L.loc = locate(locx,locy,mobloc.z)
 				var/limit = 2//For only two trailing shadows.
 				for(var/turf/T in getline(mobloc, L.loc))
-					new /obj/effect/overlay/temp/dir_setting/ninja/shadow(T, L.dir)
+					new /obj/effect/temp_visual/dir_setting/ninja/shadow(T, L.dir)
 					limit--
 					if(limit<=0)
 						break
 			else
-				new /obj/effect/overlay/temp/dir_setting/ninja/shadow(mobloc, L.dir)
+				new /obj/effect/temp_visual/dir_setting/ninja/shadow(mobloc, L.dir)
 				L.loc = get_step(L, direct)
 			L.setDir(direct)
 		if(3) //Incorporeal move, but blocked by holy-watered tiles and salt piles.

code/modules/mob/transform_procs.dm

@@ -36,7 +36,7 @@
 	cut_overlays()
 	invisibility = INVISIBILITY_MAXIMUM
 
-	new /obj/effect/overlay/temp/monkeyify(loc)
+	new /obj/effect/temp_visual/monkeyify(loc)
 	sleep(22)
 	var/mob/living/carbon/monkey/O = new /mob/living/carbon/monkey( loc )
 
@@ -186,7 +186,7 @@
 	icon = null
 	cut_overlays()
 	invisibility = INVISIBILITY_MAXIMUM
-	new /obj/effect/overlay/temp/monkeyify/humanify(loc)
+	new /obj/effect/temp_visual/monkeyify/humanify(loc)
 	sleep(22)
 	var/mob/living/carbon/human/O = new( loc )
 	for(var/obj/item/C in O.loc)

code/modules/ninja/admin_ninja_verbs.dm

@@ -1,64 +0,0 @@
-
-/*
-
-Contents:
-- Admin procs that make ninjas
-
-*/
-
-
-//ADMIN CREATE NINJA (From Player)
-/client/proc/cmd_admin_ninjafy(mob/living/carbon/human/H in GLOB.player_list)
-	set category = null
-	set name = "Make Space Ninja"
-
-	if (!SSticker.mode)
-		alert("Wait until the game starts")
-		return
-
-	if(!istype(H))
-		return
-
-	if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes")
-		return
-
-	log_admin("[key_name(src)] turned [H.key] into a Space Ninja.")
-	H.mind = create_ninja_mind(H.key)
-	H.mind_initialize()
-	H.equip_space_ninja(1)
-	if(istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja))
-		H.wear_suit:randomize_param()
-		spawn(0)
-			H.wear_suit:ninitialize(10,H)
-	SSticker.mode.update_ninja_icons_added(H)
-
-
-//ADMIN CREATE NINJA (From Ghost)
-/client/proc/send_space_ninja()
-	set category = "Fun"
-	set name = "Spawn Space Ninja"
-	set desc = "Spawns a space ninja for when you need a teenager with attitude."
-	set popup_menu = 0
-
-	if(!holder)
-		to_chat(src, "Only administrators may use this command.")
-		return
-	if(!SSticker.mode)
-		alert("The game hasn't started yet!")
-		return
-	if(alert("Are you sure you want to send in a space ninja?",,"Yes","No")=="No")
-		return
-
-	var/client/C = input("Pick character to spawn as the Space Ninja", "Key", "") as null|anything in GLOB.clients
-	if(!C)
-		return
-
-	// passing FALSE means the event doesn't start immediately
-	var/datum/round_event/ghost_role/ninja/E = new(FALSE)
-	E.priority_candidates += C
-	E.processing = TRUE
-
-	message_admins("<span class='notice'>[key_name_admin(key)] has spawned [key_name_admin(C.key)] as a Space Ninja.</span>")
-	log_admin("[key] used Spawn Space Ninja.")
-
-	return

code/modules/ninja/ninja_event.dm

@@ -63,98 +63,21 @@ Contents:
 	Mind.active = 1
 
 	//generate objectives - You'll generally get 6 objectives (Ninja is meant to be hardmode!)
-	var/list/possible_targets = list()
-	for(var/datum/mind/M in SSticker.minds)
-		if(M.current && M.current.stat != DEAD)
-			if(ishuman(M.current))
-				if(M.special_role)
-					possible_targets[M] = 0						//bad-guy
-				else if(M.assigned_role in GLOB.command_positions)
-					possible_targets[M] = 1						//good-guy
 
-	var/list/objectives = list(1,2,3,4)
-	while(give_objectives && Mind.objectives.len < 6)
-		switch(pick_n_take(objectives))
-			if(1)	//research
-				var/datum/objective/download/O = new /datum/objective/download()
-				O.owner = Mind
-				O.gen_amount_goal()
-				Mind.objectives += O
-
-			if(2)	//steal
-				var/datum/objective/steal/special/O = new /datum/objective/steal/special()
-				O.owner = Mind
-				Mind.objectives += O
-
-			if(3)	//protect/kill
-				if(!possible_targets.len)	continue
-				var/index = rand(1,possible_targets.len)
-				var/datum/mind/M = possible_targets[index]
-				var/is_bad_guy = possible_targets[M]
-				possible_targets.Cut(index,index+1)
-
-				if(is_bad_guy ^ helping_station)			//kill (good-ninja + bad-guy or bad-ninja + good-guy)
-					var/datum/objective/assassinate/O = new /datum/objective/assassinate()
-					O.owner = Mind
-					O.target = M
-					O.explanation_text = "Slay \the [M.current.real_name], the [M.assigned_role]."
-					Mind.objectives += O
-				else										//protect
-					var/datum/objective/protect/O = new /datum/objective/protect()
-					O.owner = Mind
-					O.target = M
-					O.explanation_text = "Protect \the [M.current.real_name], the [M.assigned_role], from harm."
-					Mind.objectives += O
-			if(4)	//debrain/capture
-				if(!possible_targets.len)	continue
-				var/selected = rand(1,possible_targets.len)
-				var/datum/mind/M = possible_targets[selected]
-				var/is_bad_guy = possible_targets[M]
-				possible_targets.Cut(selected,selected+1)
-
-				if(is_bad_guy ^ helping_station)			//debrain (good-ninja + bad-guy or bad-ninja + good-guy)
-					var/datum/objective/debrain/O = new /datum/objective/debrain()
-					O.owner = Mind
-					O.target = M
-					O.explanation_text = "Steal the brain of [M.current.real_name]."
-					Mind.objectives += O
-				else										//capture
-					var/datum/objective/capture/O = new /datum/objective/capture()
-					O.owner = Mind
-					O.gen_amount_goal()
-					Mind.objectives += O
-			else
-				break
-
-	//Add a survival objective since it's usually broad enough for any round type.
-	if(give_objectives)
-		var/datum/objective/O = new /datum/objective/survive()
-		O.owner = Mind
-		Mind.objectives += O
-
-	//add some RP-fluff
-	Mind.store_memory("I am an elite mercenary assassin of the mighty Spider Clan. A <font color='red'><B>SPACE NINJA</B></font>!")
-	Mind.store_memory("Surprise is my weapon. Shadows are my armor. Without them, I am nothing. (//initialize your suit by right clicking on it, to use abilities like stealth)!")
-	Mind.store_memory("Officially, [helping_station?"Nanotrasen":"The Syndicate"] are my employer.")
 
 	//spawn the ninja and assign the candidate
 	var/mob/living/carbon/human/Ninja = create_space_ninja(spawn_loc)
 	Mind.transfer_to(Ninja)
-
-	//initialise equipment
-	if(istype(Ninja.wear_suit,/obj/item/clothing/suit/space/space_ninja))
-		//Should be true but we have to check these things.
-		var/obj/item/clothing/suit/space/space_ninja/N = Ninja.wear_suit
-		N.randomize_param()
+	var/datum/antagonist/ninja/ninjadatum = add_ninja(Ninja)
+	ninjadatum.equip_space_ninja()
 
 	Ninja.internal = Ninja.s_store
 	Ninja.update_internals_hud_icon(1)
 
 	if(Ninja.mind != Mind)			//something has gone wrong!
 		throw EXCEPTION("Ninja created with incorrect mind")
-		return
 
-	Ninja << sound('sound/effects/ninja_greeting.ogg') //so ninja you probably wouldn't even know if you were made one
+
 	SSticker.mode.update_ninja_icons_added(Ninja)
 	spawned_mobs += Ninja
 	message_admins("[key_name_admin(Ninja)] has been made into a ninja by an event.")
@@ -171,7 +94,6 @@ Contents:
 	A.real_name = "[pick(GLOB.ninja_titles)] [pick(GLOB.ninja_names)]"
 	A.copy_to(new_ninja)
 	new_ninja.dna.update_dna_identity()
-	new_ninja.equip_space_ninja()
 	return new_ninja
 
 
@@ -183,38 +105,6 @@ Contents:
 	return Mind
 
 
-/mob/living/carbon/human/proc/equip_space_ninja(safety=0)//Safety in case you need to unequip stuff for existing characters.
-	if(safety)
-		qdel(w_uniform)
-		qdel(wear_suit)
-		qdel(wear_mask)
-		qdel(head)
-		qdel(shoes)
-		qdel(gloves)
-
-	var/obj/item/device/radio/R = new /obj/item/device/radio/headset(src)
-	var/obj/item/clothing/suit/space/space_ninja/theSuit = new(src)
-	var/obj/item/weapon/katana/energy/EK = new(src)
-	theSuit.energyKatana = EK
-
-	equip_to_slot_or_del(R, slot_ears)
-	equip_to_slot_or_del(new /obj/item/clothing/under/color/black(src), slot_w_uniform)
-	equip_to_slot_or_del(new /obj/item/clothing/shoes/space_ninja(src), slot_shoes)
-	equip_to_slot_or_del(theSuit, slot_wear_suit)
-	equip_to_slot_or_del(new /obj/item/clothing/gloves/space_ninja(src), slot_gloves)
-	equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/space_ninja(src), slot_head)
-	equip_to_slot_or_del(new /obj/item/clothing/mask/gas/space_ninja(src), slot_wear_mask)
-	equip_to_slot_or_del(new /obj/item/clothing/glasses/night(src), slot_glasses)
-	equip_to_slot_or_del(EK, slot_belt)
-	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_r_store)
-	equip_to_slot_or_del(new /obj/item/weapon/grenade/plastic/x4(src), slot_l_store)
-	equip_to_slot_or_del(new /obj/item/weapon/tank/internals/emergency_oxygen(src), slot_s_store)
-	equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack/carbondioxide(src), slot_back)
-
-	var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(src)
-	E.implant(src)
-	return 1
-
 /datum/game_mode/proc/update_ninja_icons_added(var/mob/living/carbon/human/ninja)
 	var/datum/atom_hud/antag/ninjahud = GLOB.huds[ANTAG_HUD_NINJA]
 	ninjahud.join_hud(ninja)

code/modules/ninja/suit/gloves.dm

@@ -58,30 +58,23 @@
 	A.add_fingerprint(H)
 
 	draining = 1
-	var/drained = A.ninjadrain_act(suit,H,src)
+	. = A.ninjadrain_act(suit,H,src)
 	draining = 0
 
-	if(isnum(drained)) //Numerical values of drained handle their feedback here, Alpha values handle it themselves (Research hacking)
-		if(drained)
-			to_chat(H, "<span class='notice'>Gained <B>[drained]</B> energy from \the [A].</span>")
+	if(isnum(.)) //Numerical values of drained handle their feedback here, Alpha values handle it themselves (Research hacking)
+		if(.)
+			to_chat(H, "<span class='notice'>Gained <B>[.]</B> energy from \the [A].</span>")
 		else
 			to_chat(H, "<span class='danger'>\The [A] has run dry of power, you must find another source!</span>")
 	else
-		drained = 0 //as to not cancel attack_hand()
-
-	return drained
+		. = 0 //as to not cancel attack_hand()
 
 
-/obj/item/clothing/gloves/space_ninja/proc/toggled()
-	set name = "Toggle Interaction"
-	set desc = "Toggles special interaction on or off."
-	set category = "Ninja Equip"
-
+/obj/item/clothing/gloves/space_ninja/proc/toggledrain()
 	var/mob/living/carbon/human/U = loc
 	to_chat(U, "You <b>[candrain?"disable":"enable"]</b> special interaction.")
 	candrain=!candrain
 
-
 /obj/item/clothing/gloves/space_ninja/examine(mob/user)
 	..()
 	if(flags & NODROP)

code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm

@@ -72,7 +72,7 @@ It is possible to destroy the net by the occupant or someone else.
 			M.dropItemToGround(W)
 
 		playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1)
-		new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(M), M.dir)
+		new /obj/effect/temp_visual/dir_setting/ninja/phase/out(get_turf(M), M.dir)
 
 		visible_message("[M] suddenly vanishes!")
 		M.forceMove(pick(GLOB.holdingfacility)) //Throw mob in to the holding facility.
@@ -86,7 +86,7 @@ It is possible to destroy the net by the occupant or someone else.
 		spark_system.start()
 		playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1)
 		playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1)
-		new /obj/effect/overlay/temp/dir_setting/ninja/phase(get_turf(M), M.dir)
+		new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(M), M.dir)
 		qdel(src)
 
 	else//And they are free.

code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm

@@ -1,12 +1,6 @@
-
-
 //Wakes the user so they are able to do their thing. Also injects a decent dose of radium.
 //Movement impairing would indicate drugs and the like.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost()
-	set name = "Adrenaline Boost"
-	set desc = "Inject a secret chemical that will counteract all movement-impairing effect."
-	set category = "Ninja Ability"
-	set popup_menu = 0
 
 	if(!ninjacost(0,N_ADRENALINE))//Have to make sure stat is not counted for this ability.
 		var/mob/living/carbon/human/H = affecting
@@ -25,4 +19,3 @@
 		a_boost--
 		to_chat(H, "<span class='notice'>There are <B>[a_boost]</B> adrenaline boosts remaining.</span>")
 		s_coold = 3
-	return

code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm

@@ -26,4 +26,4 @@
 			if(!a_boost)
 				to_chat(H, "<span class='danger'>You do not have any more adrenaline boosters.</span>")
 				return 1
-	return (s_coold)//Returns the value of the variable which counts down to zero.
+	return (s_coold)//Returns the value of the variable which counts down to zero.

code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm

@@ -2,14 +2,9 @@
 
 //Disables nearby tech equipment.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse()
-	set name = "EM Burst (25E)"
-	set desc = "Disable any nearby technology with a electro-magnetic pulse."
-	set category = "Ninja Ability"
-	set popup_menu = 0
 
 	if(!ninjacost(250,N_STEALTH_CANCEL))
 		var/mob/living/carbon/human/H = affecting
 		playsound(H.loc, 'sound/effects/EMPulse.ogg', 60, 2)
 		empulse(H, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
 		s_coold = 2
-	return

code/modules/ninja/suit/n_suit_verbs/ninja_net.dm

@@ -1,10 +1,6 @@
 
 //Allows the ninja to kidnap people
 /obj/item/clothing/suit/space/space_ninja/proc/ninjanet(mob/living/carbon/C in oview())//Only living carbon mobs.
-	set name = "Energy Net (20E)"
-	set desc = "Captures a fallen opponent in a net of energy. Will teleport them to a holding facility after 30 seconds."
-	set category = null
-	set src = usr.contents
 
 	if(!ninjacost(200,N_STEALTH_CANCEL) && iscarbon(C))
 		var/mob/living/carbon/human/H = affecting
@@ -26,4 +22,3 @@
 				to_chat(H, "<span class='warning'>[C.p_they(TRUE)] are already trapped inside an energy net!</span>")
 		else
 			to_chat(H, "<span class='warning'>[C.p_they(TRUE)] will bring no honor to your Clan!</span>")
-	return

code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm

@@ -2,10 +2,6 @@
 
 //Smoke bomb
 /obj/item/clothing/suit/space/space_ninja/proc/ninjasmoke()
-	set name = "Smoke Bomb"
-	set desc = "Blind your enemies momentarily with a well-placed smoke bomb."
-	set category = "Ninja Ability"
-	set popup_menu = 0//Will not see it when right clicking.
 
 	if(!ninjacost(0,N_SMOKE_BOMB))
 		var/mob/living/carbon/human/H = affecting
@@ -16,4 +12,3 @@
 		s_bombs--
 		to_chat(H, "<span class='notice'>There are <B>[s_bombs]</B> smoke bombs remaining.</span>")
 		s_coold = 1
-	return

code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm

@@ -2,11 +2,6 @@
 
 //Creates a throwing star
 /obj/item/clothing/suit/space/space_ninja/proc/ninjastar()
-	set name = "Create Throwing Stars (1E)"
-	set desc = "Creates some throwing stars"
-	set category = "Ninja Ability"
-	set popup_menu = 0
-
 	if(!ninjacost(10))
 		var/mob/living/carbon/human/H = affecting
 		var/obj/item/weapon/throwing_star/ninja/N = new(H)

code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm

@@ -21,7 +21,6 @@ Contents:
 		animate(U, alpha = 50,time = 15)
 		U.visible_message("<span class='warning'>[U.name] vanishes into thin air!</span>", \
 						"<span class='notice'>You are now mostly invisible to normal detection.</span>")
-	return
 
 
 /obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth()
@@ -38,12 +37,7 @@ Contents:
 
 
 /obj/item/clothing/suit/space/space_ninja/proc/stealth()
-	set name = "Toggle Stealth"
-	set desc = "Utilize the internal CLOAK-tech device to activate or deactivate stealth-camo."
-	set category = "Ninja Equip"
-
 	if(!s_busy)
 		toggle_stealth()
 	else
 		to_chat(affecting, "<span class='danger'>Stealth does not appear to work!</span>")
-

code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm

@@ -1,10 +1,5 @@
 
 /obj/item/clothing/suit/space/space_ninja/proc/ninja_sword_recall()
-	set name = "Recall Energy Katana (Variable Cost)"
-	set desc = "Teleports the Energy Katana linked to this suit to its wearer, cost based on distance."
-	set category = "Ninja Ability"
-	set popup_menu = 0
-
 	var/mob/living/carbon/human/H = affecting
 
 	var/cost = 0
@@ -42,4 +37,3 @@
 
 		else //Else just TP it to us.
 			energyKatana.returnToOwner(H,1)
-

code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm

@@ -16,16 +16,10 @@ Contents:
 		var/mob/living/victim =	H.pulling
 		if(!victim.anchored)
 			victim.forceMove(locate(T.x+rand(-1,1),T.y+rand(-1,1),T.z))
-	return
 
 
 //Jaunt
 /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt()
-	set name = "Phase Jaunt (10E)"
-	set desc = "Utilizes the internal VOID-shift device to rapidly transit in direction facing."
-	set category = "Ninja Ability"
-	set popup_menu = 0
-
 	if(!ninjacost(100,N_STEALTH_CANCEL))
 		var/mob/living/carbon/human/H = affecting
 		var/turf/destination = get_teleport_loc(H.loc,H,9,1,3,1,0,1)
@@ -33,7 +27,7 @@ Contents:
 
 		if(destination && isturf(mobloc))//So we don't teleport out of containers
 			playsound(H.loc, "sparks", 50, 1)
-			new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(H), H.dir)
+			new /obj/effect/temp_visual/dir_setting/ninja/phase/out(get_turf(H), H.dir)
 
 			handle_teleport_grab(destination, H)
 			H.loc = destination
@@ -41,13 +35,12 @@ Contents:
 			spark_system.start()
 			playsound(H.loc, 'sound/effects/phasein.ogg', 25, 1)
 			playsound(H.loc, "sparks", 50, 1)
-			new /obj/effect/overlay/temp/dir_setting/ninja/phase(get_turf(H), H.dir)
+			new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(H), H.dir)
 
 			destination.phase_damage_creatures(20,H)//Paralyse and damage mobs and mechas on the turf
 			s_coold = 1
 		else
 			to_chat(H, "<span class='danger'>The VOID-shift device is malfunctioning, <B>teleportation failed</B>.</span>")
-	return
 
 
 //Right-Click teleport: It's basically admin "jump to turf"
@@ -62,7 +55,7 @@ Contents:
 		var/turf/mobloc = get_turf(H.loc)//To make sure that certain things work properly below.
 		if(!T.density && isturf(mobloc))
 			playsound(H.loc, "sparks", 50, 1)
-			new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(H), H.dir)
+			new /obj/effect/temp_visual/dir_setting/ninja/phase/out(get_turf(H), H.dir)
 
 			handle_teleport_grab(T, H)
 			H.forceMove(T)
@@ -70,12 +63,9 @@ Contents:
 			spark_system.start()
 			playsound(H.loc, 'sound/effects/phasein.ogg', 25, 1)
 			playsound(H.loc, "sparks", 50, 1)
-			new /obj/effect/overlay/temp/dir_setting/ninja/phase(get_turf(H), H.dir)
+			new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(H), H.dir)
 
 			T.phase_damage_creatures(20,H)//Paralyse and damage mobs and mechas on the turf
 			s_coold = 1
 		else
 			to_chat(H, "<span class='danger'>You cannot teleport into solid walls or from solid matter</span>")
-	return
-
-

code/modules/ninja/suit/suit.dm

@@ -22,6 +22,8 @@ Contents:
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 100, acid = 100)
 	strip_delay = 12
 
+	actions_types = list(/datum/action/item_action/initialize_ninja_suit, /datum/action/item_action/ninjajaunt, /datum/action/item_action/ninjasmoke, /datum/action/item_action/ninjaboost, /datum/action/item_action/ninjapulse, /datum/action/item_action/ninjastar, /datum/action/item_action/ninjanet, /datum/action/item_action/ninja_sword_recall, /datum/action/item_action/ninja_stealth, /datum/action/item_action/toggle_glove)
+
 		//Important parts of the suit.
 	var/mob/living/carbon/human/affecting = null
 	var/obj/item/weapon/stock_parts/cell/cell
@@ -57,7 +59,6 @@ Contents:
 
 /obj/item/clothing/suit/space/space_ninja/New()
 	..()
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/init//suit initialize verb
 
 	//Spark Init
 	spark_system = new()
@@ -109,40 +110,38 @@ Contents:
 
 
 //This proc prevents the suit from being taken off.
-/obj/item/clothing/suit/space/space_ninja/proc/lock_suit(mob/living/carbon/human/H, checkIcons = 0)
+/obj/item/clothing/suit/space/space_ninja/proc/lock_suit(mob/living/carbon/human/H)
 	if(!istype(H))
 		return 0
-	if(checkIcons)
-		icon_state = H.gender==FEMALE ? "s-ninjanf" : "s-ninjan"
-		H.gloves.icon_state = "s-ninjan"
-		H.gloves.item_state = "s-ninjan"
-	else
-		if(H.mind.special_role!="Space Ninja")
-			to_chat(H, "\red <B>fÄTaL ÈÈRRoR</B>: 382200-*#00CÖDE <B>RED</B>\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR...")
-			H.gib()
-			return 0
-		if(!istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja))
-			to_chat(H, "<span class='userdanger'>ERROR</span>: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING...")
-			return 0
-		if(!istype(H.shoes, /obj/item/clothing/shoes/space_ninja))
-			to_chat(H, "<span class='userdanger'>ERROR</span>: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING...")
-			return 0
-		if(!istype(H.gloves, /obj/item/clothing/gloves/space_ninja))
-			to_chat(H, "<span class='userdanger'>ERROR</span>: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING...")
-			return 0
+	if(!is_ninja(H))
+		to_chat(H, "\red <B>fÄTaL ÈÈRRoR</B>: 382200-*#00CÖDE <B>RED</B>\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR...")
+		H.gib()
+		return FALSE
+	if(!istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja))
+		to_chat(H, "<span class='userdanger'>ERROR</span>: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING...")
+		return FALSE
+	if(!istype(H.shoes, /obj/item/clothing/shoes/space_ninja))
+		to_chat(H, "<span class='userdanger'>ERROR</span>: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING...")
+		return FALSE
+	if(!istype(H.gloves, /obj/item/clothing/gloves/space_ninja))
+		to_chat(H, "<span class='userdanger'>ERROR</span>: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING...")
+		return FALSE
+	affecting = H
+	flags |= NODROP //colons make me go all |=
+	slowdown = FALSE
+	n_hood = H.head
+	n_hood.flags |= NODROP
+	n_shoes = H.shoes
+	n_shoes.flags |= NODROP
+	n_shoes.slowdown--
+	n_gloves = H.gloves
+	n_gloves.flags |= NODROP
+	return TRUE
 
-		affecting = H
-		flags |= NODROP //colons make me go all |=
-		slowdown = 0
-		n_hood = H.head
-		n_hood.flags |= NODROP
-		n_shoes = H.shoes
-		n_shoes.flags |= NODROP
-		n_shoes.slowdown--
-		n_gloves = H.gloves
-		n_gloves.flags |= NODROP
-
-	return 1
+/obj/item/clothing/suit/space/space_ninja/proc/lockIcons(mob/living/carbon/human/H)
+	icon_state = H.gender==FEMALE ? "s-ninjanf" : "s-ninjan"
+	H.gloves.icon_state = "s-ninjan"
+	H.gloves.item_state = "s-ninjan"
 
 
 //This proc allows the suit to be taken off.
@@ -172,3 +171,39 @@ Contents:
 			to_chat(user, "The CLOAK-tech device is <B>[s_active?"active":"inactive"]</B>.")
 			to_chat(user, "There are <B>[s_bombs]</B> smoke bomb\s remaining.")
 			to_chat(user, "There are <B>[a_boost]</B> adrenaline booster\s remaining.")
+
+/obj/item/clothing/suit/space/space_ninja/ui_action_click(mob/user, action)
+	if(istype(action, /datum/action/item_action/initialize_ninja_suit))
+		toggle_on_off()
+		return TRUE
+	if(!s_initialized)
+		to_chat(user, "<span class='warning'><b>ERROR</b>: suit offline.  Please activate suit.</span>")
+		return FALSE
+	if(istype(action, /datum/action/item_action/ninjajaunt))
+		ninjajaunt()
+		return TRUE
+	if(istype(action, /datum/action/item_action/ninjasmoke))
+		ninjasmoke()
+		return TRUE
+	if(istype(action, /datum/action/item_action/ninjaboost))
+		ninjaboost()
+		return TRUE
+	if(istype(action, /datum/action/item_action/ninjapulse))
+		ninjapulse()
+		return TRUE
+	if(istype(action, /datum/action/item_action/ninjastar))
+		ninjastar()
+		return TRUE
+	if(istype(action, /datum/action/item_action/ninjanet))
+		ninjanet()
+		return TRUE
+	if(istype(action, /datum/action/item_action/ninja_sword_recall))
+		ninja_sword_recall()
+		return TRUE
+	if(istype(action, /datum/action/item_action/ninja_stealth))
+		stealth()
+		return TRUE
+	if(istype(action, /datum/action/item_action/toggle_glove))
+		n_gloves.toggledrain()
+		return TRUE
+	return FALSE

code/modules/ninja/suit/suit_initialisation.dm

@@ -1,102 +1,98 @@
-
-//Verbs link to procs because verb-like procs have a bug which prevents their use if the arguments are not readily referenced.
-//^ Old coder words may be false these days, Not taking the risk for now.
-
-/obj/item/clothing/suit/space/space_ninja/proc/init()
-	set name = "Initialize Suit"
-	set desc = "Initializes the suit for field operation."
-	set category = "Ninja Equip"
-
-	ninitialize()
-
-/obj/item/clothing/suit/space/space_ninja/proc/deinit()
-	set name = "De-Initialize Suit"
-	set desc = "Begins procedure to remove the suit."
-	set category = "Ninja Equip"
-
-	if(!s_busy)
+/obj/item/clothing/suit/space/space_ninja/proc/toggle_on_off()
+	if(s_busy)
+		to_chat(loc, "<span class='userdanger'>ERROR</span>: You cannot use this function at this time.")
+		return FALSE
+	if(s_initialized)
 		deinitialize()
 	else
-		to_chat(affecting, "<span class='danger'>The function did not trigger!</span>")
-
+		ninitialize()
+	. = TRUE
 
 /obj/item/clothing/suit/space/space_ninja/proc/ninitialize(delay = s_delay, mob/living/carbon/human/U = loc)
-	if(U.mind && U.mind.assigned_role==U.mind.special_role && !s_initialized && !s_busy)//Shouldn't be busy... but anything is possible I guess.
-		s_busy = 1
-		for(var/i,i<7,i++)
-			switch(i)
-				if(0)
-					to_chat(U, "<span class='notice'>Now initializing...</span>")
-				if(1)
-					if(!lock_suit(U))//To lock the suit onto wearer.
-						break
-					to_chat(U, "<span class='notice'>Securing external locking mechanism...\nNeural-net established.</span>")
-				if(2)
-					to_chat(U, "<span class='notice'>Extending neural-net interface...\nNow monitoring brain wave pattern...</span>")
-				if(3)
-					if(U.stat==2||U.health<=0)
-						to_chat(U, "<span class='danger'><B>FĆAL �Rr�R</B>: 344--93#�&&21 BR��N |/|/aV� PATT$RN <B>RED</B>\nA-A-aB�rT�NG...</span>")
-						unlock_suit()
-						break
-					lock_suit(U,1)//Check for icons.
-					U.regenerate_icons()
-					to_chat(U, "<span class='notice'>Linking neural-net interface...\nPattern</span>\green <B>GREEN</B><span class='notice'>, continuing operation.</span>")
-				if(4)
-					to_chat(U, "<span class='notice'>VOID-shift device status: <B>ONLINE</B>.\nCLOAK-tech device status: <B>ONLINE</B>.</span>")
-				if(5)
-					to_chat(U, "<span class='notice'>Primary system status: <B>ONLINE</B>.\nBackup system status: <B>ONLINE</B>.\nCurrent energy capacity: <B>[cell.charge]</B>.</span>")
-				if(6)
-					to_chat(U, "<span class='notice'>All systems operational. Welcome to <B>SpiderOS</B>, [U.real_name].</span>")
-					grant_ninja_verbs()
-					grant_equip_verbs()
-					ntick()
-			sleep(delay)
-		s_busy = 0
-	else
-		if(!U.mind||U.mind.assigned_role!=U.mind.special_role)//Your run of the mill persons shouldn't know what it is. Or how to turn it on.
-			to_chat(U, "You do not understand how this suit functions. Where the heck did it even come from?")
-		else if(s_initialized)
-			to_chat(U, "<span class='danger'>The suit is already functioning.</span> Please report this bug.")
-		else
-			to_chat(U, "<span class='userdanger'>ERROR</span>: You cannot use this function at this time.")
-	return
+	if(!U.mind)
+		return //Not sure how this could happen.
+	if(!is_ninja(U))
+		to_chat(U, "You do not understand how this suit functions. Where the heck did it even come from?")
+		return
+	s_busy = TRUE
+	to_chat(U, "<span class='notice'>Now initializing...</span>")
+	addtimer(CALLBACK(src, .proc/ninitialize_two, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/ninitialize_two(delay, mob/living/carbon/human/U)
+	if(!lock_suit(U))//To lock the suit onto wearer.
+		s_busy = FALSE
+		return
+	to_chat(U, "<span class='notice'>Securing external locking mechanism...\nNeural-net established.</span>")
+	addtimer(CALLBACK(src, .proc/ninitialize_three, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/ninitialize_three(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>Extending neural-net interface...\nNow monitoring brain wave pattern...</span>")
+	addtimer(CALLBACK(src, .proc/ninitialize_four, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/ninitialize_four(delay, mob/living/carbon/human/U)
+	if(U.stat==2||U.health<=0)
+		to_chat(U, "<span class='danger'><B>FĆAL �Rr�R</B>: 344--93#�&&21 BR��N |/|/aV� PATT$RN <B>RED</B>\nA-A-aB�rT�NG...</span>")
+		unlock_suit()
+		return
+	lockIcons(U)//Check for icons.
+	U.regenerate_icons()
+	to_chat(U, "<span class='notice'>Linking neural-net interface...\nPattern</span>\green <B>GREEN</B><span class='notice'>, continuing operation.</span>")
+	addtimer(CALLBACK(src, .proc/ninitialize_five, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/ninitialize_five(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>VOID-shift device status: <B>ONLINE</B>.\nCLOAK-tech device status: <B>ONLINE</B>.</span>")
+	addtimer(CALLBACK(src, .proc/ninitialize_six, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/ninitialize_six(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>Primary system status: <B>ONLINE</B>.\nBackup system status: <B>ONLINE</B>.\nCurrent energy capacity: <B>[cell.charge]</B>.</span>")
+	addtimer(CALLBACK(src, .proc/ninitialize_seven, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/ninitialize_seven(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>All systems operational. Welcome to <B>SpiderOS</B>, [U.real_name].</span>")
+	grant_ninja_verbs()
+	grant_equip_verbs()
+	ntick()
+	s_busy = FALSE
 
 
 
 /obj/item/clothing/suit/space/space_ninja/proc/deinitialize(delay = s_delay)
-	if(affecting==loc&&!s_busy)
+	if(affecting==loc)
 		var/mob/living/carbon/human/U = affecting
-		if(!s_initialized)
-			to_chat(U, "<span class='danger'>The suit is not initialized.</span> Please report this bug.")
-			return
 		if(alert("Are you certain you wish to remove the suit? This will take time and remove all abilities.",,"Yes","No")=="No")
 			return
-		if(s_busy)
-			to_chat(U, "<span class='userdanger'>ERROR</span>: You cannot use this function at this time.")
-			return
-		s_busy = 1
-		for(var/i = 0,i<7,i++)
-			switch(i)
-				if(0)
-					to_chat(U, "<span class='notice'>Now de-initializing...</span>")
-					spideros = 0//Spideros resets.
-				if(1)
-					to_chat(U, "<span class='notice'>Logging off, [U:real_name]. Shutting down <B>SpiderOS</B>.</span>")
-					remove_ninja_verbs()
-				if(2)
-					to_chat(U, "<span class='notice'>Primary system status: <B>OFFLINE</B>.\nBackup system status: <B>OFFLINE</B>.</span>")
-				if(3)
-					to_chat(U, "<span class='notice'>VOID-shift device status: <B>OFFLINE</B>.\nCLOAK-tech device status: <B>OFFLINE</B>.</span>")
-					cancel_stealth()//Shutdowns stealth.
-				if(4)
-					to_chat(U, "<span class='notice'>Disconnecting neural-net interface...</span>\green<B>Success</B><span class='notice'>.</span>")
-				if(5)
-					to_chat(U, "<span class='notice'>Disengaging neural-net interface...</span>\green<B>Success</B><span class='notice'>.</span>")
-				if(6)
-					to_chat(U, "<span class='notice'>Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: <B>FINISHED</B>.</span>")
-					remove_equip_verbs()
-					unlock_suit()
-					U.regenerate_icons()
-			sleep(delay)
-		s_busy = 0
-	return
+		s_busy = TRUE
+		addtimer(CALLBACK(src, .proc/deinitialize_two, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/deinitialize_two(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>Now de-initializing...</span>")
+	spideros = 0//Spideros resets.
+	addtimer(CALLBACK(src, .proc/deinitialize_three, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/deinitialize_three(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>Logging off, [U:real_name]. Shutting down <B>SpiderOS</B>.</span>")
+	remove_ninja_verbs()
+	addtimer(CALLBACK(src, .proc/deinitialize_four, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/deinitialize_four(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>Primary system status: <B>OFFLINE</B>.\nBackup system status: <B>OFFLINE</B>.</span>")
+	addtimer(CALLBACK(src, .proc/deinitialize_five, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/deinitialize_five(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>VOID-shift device status: <B>OFFLINE</B>.\nCLOAK-tech device status: <B>OFFLINE</B>.</span>")
+	cancel_stealth()//Shutdowns stealth.
+	addtimer(CALLBACK(src, .proc/deinitialize_six, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/deinitialize_six(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>Disconnecting neural-net interface...</span>\green<B>Success</B><span class='notice'>.</span>")
+	addtimer(CALLBACK(src, .proc/deinitialize_seven, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/deinitialize_seven(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>Disengaging neural-net interface...</span>\green<B>Success</B><span class='notice'>.</span>")
+	addtimer(CALLBACK(src, .proc/deinitialize_eight, delay, U), delay)
+
+/obj/item/clothing/suit/space/space_ninja/proc/deinitialize_eight(delay, mob/living/carbon/human/U)
+	to_chat(U, "<span class='notice'>Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: <B>FINISHED</B>.</span>")
+	remove_equip_verbs()
+	U.regenerate_icons()
+	s_busy = FALSE

code/modules/ninja/suit/suit_process.dm

@@ -20,5 +20,3 @@
 			cancel_stealth()
 
 		sleep(10)//Checks every second.
-
-

code/modules/ninja/suit/suit_verbs_handlers.dm

@@ -9,33 +9,20 @@ Contents:
 */
 
 /obj/item/clothing/suit/space/space_ninja/proc/grant_equip_verbs()
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/init
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/deinit
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/stealth
-	n_gloves.verbs += /obj/item/clothing/gloves/space_ninja/proc/toggled
+	n_gloves.verbs += /obj/item/clothing/gloves/space_ninja/proc/toggledrain
 
 	s_initialized = 1
 
 
 /obj/item/clothing/suit/space/space_ninja/proc/remove_equip_verbs()
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/init
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/deinit
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/stealth
 	if(n_gloves)
-		n_gloves.verbs -= /obj/item/clothing/gloves/space_ninja/proc/toggled
+		n_gloves.verbs -= /obj/item/clothing/gloves/space_ninja/proc/toggledrain
 
 	s_initialized = 0
 
 
 /obj/item/clothing/suit/space/space_ninja/proc/grant_ninja_verbs()
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjasmoke
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjastar
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninja_sword_recall
 
 	s_initialized=1
 	slowdown=0
@@ -43,10 +30,3 @@ Contents:
 
 /obj/item/clothing/suit/space/space_ninja/proc/remove_ninja_verbs()
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjasmoke
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjastar
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjanet
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninja_sword_recall

code/modules/paperwork/folders.dm

@@ -78,8 +78,8 @@
 	name = "folder- 'TOP SECRET'"
 	desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\""
 
-/obj/item/weapon/folder/documents/New()
-	..()
+/obj/item/weapon/folder/documents/Initialize()
+	. = ..()
 	new /obj/item/documents/nanotrasen(src)
 	update_icon()
 
@@ -91,20 +91,20 @@
 /obj/item/weapon/folder/syndicate/red
 	icon_state = "folder_sred"
 
-/obj/item/weapon/folder/syndicate/red/New()
-	..()
+/obj/item/weapon/folder/syndicate/red/Initialize()
+	. = ..()
 	new /obj/item/documents/syndicate/red(src)
 	update_icon()
 
 /obj/item/weapon/folder/syndicate/blue
 	icon_state = "folder_sblue"
 
-/obj/item/weapon/folder/syndicate/blue/New()
-	..()
+/obj/item/weapon/folder/syndicate/blue/Initialize()
+	. = ..()
 	new /obj/item/documents/syndicate/blue(src)
 	update_icon()
 
-/obj/item/weapon/folder/syndicate/mining/New()
-	..()
+/obj/item/weapon/folder/syndicate/mining/Initialize()
+	. = ..()
 	new /obj/item/documents/syndicate/mining(src)
-	update_icon()
+	update_icon()

code/modules/paperwork/paper.dm

@@ -170,8 +170,7 @@
 
 /obj/item/weapon/paper/proc/updateinfolinks()
 	info_links = info
-	var/i = 0
-	for(i=1,i<=fields,i++)
+	for(var/i in 1 to min(fields, 15))
 		addtofield(i, "<font face=\"[PEN_FONT]\"><A href='?src=\ref[src];write=[i]'>write</A></font>", 1)
 	info_links = info_links + "<font face=\"[PEN_FONT]\"><A href='?src=\ref[src];write=end'>write</A></font>"
 

code/modules/power/gravitygenerator.dm

@@ -304,16 +304,17 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	// Sound the alert if gravity was just enabled or disabled.
 	var/alert = 0
 	var/area/A = get_area(src)
-	if(on && SSticker.IsRoundInProgress()) // If we turned on and the game is live.
-		if(gravity_in_level() == 0)
-			alert = 1
-			investigate_log("was brought online and is now producing gravity for this level.", "gravity")
-			message_admins("The gravity generator was brought online [A][ADMIN_COORDJMP(src)]")
-	else
-		if(gravity_in_level() == 1)
-			alert = 1
-			investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
-			message_admins("The gravity generator was brought offline with no backup generator. [A][ADMIN_COORDJMP(src)]")
+	if(SSticker.IsRoundInProgress())
+		if(on) // If we turned on and the game is live.
+			if(gravity_in_level() == 0)
+				alert = 1
+				investigate_log("was brought online and is now producing gravity for this level.", "gravity")
+				message_admins("The gravity generator was brought online [A][ADMIN_COORDJMP(src)]")
+		else
+			if(gravity_in_level() == 1)
+				alert = 1
+				investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
+				message_admins("The gravity generator was brought offline with no backup generator. [A][ADMIN_COORDJMP(src)]")
 
 	update_icon()
 	update_list()

code/modules/power/singularity/narsie.dm

@@ -34,7 +34,7 @@
 
 	var/area/A = get_area(src)
 	if(A)
-		var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/effects.dmi', "ghostalertsie")
+		var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult_effects.dmi', "ghostalertsie")
 		notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action=NOTIFY_ATTACK)
 	INVOKE_ASYNC(src, .proc/narsie_spawn_animation)
 
@@ -52,6 +52,7 @@
 /obj/singularity/narsie/large/cult/Initialize()
 	. = ..()
 	GLOB.cult_narsie = src
+	deltimer(GLOB.blood_target_reset_timer)
 	GLOB.blood_target = src
 	resize(0.6)
 	for(var/datum/mind/cult_mind in SSticker.mode.cult)
@@ -59,7 +60,7 @@
 			var/mob/living/L = cult_mind.current
 			L.narsie_act()
 	for(var/mob/living/player in GLOB.player_list)
-		if(player.stat != DEAD && player.loc.z == ZLEVEL_STATION && !iscultist(player) && isliving(player))
+		if(player.stat != DEAD && player.loc.z == ZLEVEL_STATION && !iscultist(player))
 			souls_needed[player] = TRUE
 	soul_goal = round(1 + LAZYLEN(souls_needed) * 0.6)
 	INVOKE_ASYNC(src, .proc/begin_the_end)

code/modules/projectiles/ammunition.dm

@@ -16,7 +16,7 @@
 	var/randomspread = 0						//Randomspread for automatics
 	var/delay = 0								//Delay for energy weapons
 	var/click_cooldown_override = 0				//Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown.
-	var/firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect	//the visual effect appearing when the ammo is fired.
+	var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect	//the visual effect appearing when the ammo is fired.
 
 
 /obj/item/ammo_casing/New()

code/modules/projectiles/ammunition/caseless.dm

@@ -45,7 +45,7 @@
  	icon_state = "s-casing-live"
  	projectile_type = /obj/item/projectile/beam
  	fire_sound = 'sound/weapons/Laser.ogg'
- 	firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect/energy
+ 	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
 
 /obj/item/ammo_casing/caseless/laser/gatling
 	projectile_type = /obj/item/projectile/beam/weak

code/modules/projectiles/ammunition/energy.dm

@@ -6,7 +6,7 @@
 	var/e_cost = 100 //The amount of energy a cell needs to expend to create this shot.
 	var/select_name = "energy"
 	fire_sound = 'sound/weapons/Laser.ogg'
-	firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect/energy
+	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
 
 /obj/item/ammo_casing/energy/chameleon
 	e_cost = 0
@@ -77,6 +77,9 @@
 	fire_sound = 'sound/weapons/taser.ogg'
 	e_cost = 200
 
+/obj/item/ammo_casing/energy/electrode/spec
+	e_cost = 100
+
 /obj/item/ammo_casing/energy/electrode/gun
 	fire_sound = 'sound/weapons/gunshot.ogg'
 	e_cost = 100

code/modules/projectiles/ammunition/special.dm

@@ -2,7 +2,7 @@
 	name = "magic casing"
 	desc = "I didn't even know magic needed ammo..."
 	projectile_type = /obj/item/projectile/magic
-	firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect/magic
+	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/magic
 
 /obj/item/ammo_casing/magic/change
 	projectile_type = /obj/item/projectile/magic/change
@@ -64,10 +64,29 @@
 		qdel(S)
 	..()
 
+/obj/item/ammo_casing/dnainjector
+	name = "rigged syringe gun spring"
+	desc = "A high-power spring that throws DNA injectors."
+	projectile_type = /obj/item/projectile/bullet/dnainjector
+	firing_effect_type = null
+
+/obj/item/ammo_casing/dnainjector/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
+	if(!BB)
+		return
+	if(istype(loc, /obj/item/weapon/gun/syringe/dna))
+		var/obj/item/weapon/gun/syringe/dna/SG = loc
+		if(!SG.syringes.len)
+			return
+
+		var/obj/item/weapon/dnainjector/S = popleft(SG.syringes)
+		var/obj/item/projectile/bullet/dnainjector/D = BB
+		S.forceMove(D)
+		D.injector = S
+	..()
 
 /obj/item/ammo_casing/energy/c3dbullet
 	projectile_type = /obj/item/projectile/bullet/midbullet3
 	select_name = "spraydown"
 	fire_sound = 'sound/weapons/gunshot_smg.ogg'
 	e_cost = 20
-	firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect
+	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect

code/modules/projectiles/guns/energy/energy_gun.dm

@@ -31,6 +31,11 @@
 	if(gun_light && gun_light.on)
 		add_overlay("mini-light")
 
+/obj/item/weapon/gun/energy/e_gun/stun
+	name = "tactical energy gun"
+	desc = "Military issue energy gun, is able to fire stun rounds."
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode/spec, /obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
+
 /obj/item/weapon/gun/energy/e_gun/mini/practice_phaser
 	name = "practice phaser"
 	desc = "A modified version of the basic phaser gun, this one fires less concentrated energy bolts designed for target practice."

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

@@ -195,7 +195,7 @@
 	if(ismineralturf(target_turf))
 		var/turf/closed/mineral/M = target_turf
 		M.gets_drilled(firer)
-	var/obj/effect/overlay/temp/kinetic_blast/K = new /obj/effect/overlay/temp/kinetic_blast(target_turf)
+	var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf)
 	K.color = color
 	for(var/type in hit_overlays)
 		new type(target_turf)
@@ -319,7 +319,7 @@
 /obj/item/borg/upgrade/modkit/aoe/modify_projectile(obj/item/projectile/kinetic/K)
 	K.name = "kinetic explosion"
 	if(!K.turf_aoe && !K.mob_aoe)
-		K.hit_overlays += /obj/effect/overlay/temp/explosion/fast
+		K.hit_overlays += /obj/effect/temp_visual/explosion/fast
 	K.mob_aoe += modifier
 
 /obj/item/borg/upgrade/modkit/aoe/turfs

code/modules/projectiles/guns/energy/pulse.dm

@@ -5,6 +5,7 @@
 	item_state = null
 	w_class = WEIGHT_CLASS_BULKY
 	force = 10
+	modifystate = TRUE
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
@@ -39,7 +40,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = SLOT_BELT
 	icon_state = "pulse_carbine"
-	item_state = "pulse"
+	item_state = null
 	cell_type = "/obj/item/weapon/stock_parts/cell/pulse/carbine"
 	can_flashlight = 1
 	flight_x_offset = 18
@@ -56,7 +57,6 @@
 	icon_state = "pulse_pistol"
 	item_state = "gun"
 	cell_type = "/obj/item/weapon/stock_parts/cell/pulse/pistol"
-	can_charge = 0
 
 /obj/item/weapon/gun/energy/pulse/pistol/loyalpin
 	pin = /obj/item/device/firing_pin/implant/mindshield

code/modules/projectiles/guns/medbeam.dm

@@ -113,7 +113,7 @@
 
 /obj/item/weapon/gun/medbeam/proc/on_beam_tick(var/mob/living/target)
 	if(target.health != target.maxHealth)
-		new /obj/effect/overlay/temp/heal(get_turf(target), "#80F5FF")
+		new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF")
 	target.adjustBruteLoss(-4)
 	target.adjustFireLoss(-4)
 	return

code/modules/projectiles/guns/syringe_gun.dm

@@ -49,18 +49,18 @@
 
 	return 1
 
-/obj/item/weapon/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = 1)
+/obj/item/weapon/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = TRUE)
 	if(istype(A, /obj/item/weapon/reagent_containers/syringe))
 		if(syringes.len < max_syringes)
 			if(!user.transferItemToLoc(A, src))
-				return
+				return FALSE
 			to_chat(user, "<span class='notice'>You load [A] into \the [src].</span>")
-			syringes.Add(A)
+			syringes += A
 			recharge_newshot()
-			return 1
+			return TRUE
 		else
-			to_chat(usr, "<span class='warning'>[src] cannot hold more syringes!</span>")
-	return 0
+			to_chat(user, "<span class='warning'>[src] cannot hold more syringes!</span>")
+	return FALSE
 
 /obj/item/weapon/gun/syringe/rapidsyringe
 	name = "rapid syringe gun"
@@ -78,3 +78,29 @@
 	force = 2 //Also very weak because it's smaller
 	suppressed = 1 //Softer fire sound
 	can_unsuppress = 0 //Permanently silenced
+	
+/obj/item/weapon/gun/syringe/dna
+	name = "modified syringe gun"
+	desc = "A syringe gun that has been modified to fit DNA injectors instead of normal syringes."
+	origin_tech = "combat=2;syndicate=2;biotech=3"
+	
+/obj/item/weapon/gun/syringe/dna/Initialize()
+	. = ..()
+	chambered = new /obj/item/ammo_casing/dnainjector(src)
+	
+/obj/item/weapon/gun/syringe/dna/attackby(obj/item/A, mob/user, params, show_msg = TRUE)
+	if(istype(A, /obj/item/weapon/dnainjector))
+		var/obj/item/weapon/dnainjector/D = A
+		if(D.used)
+			to_chat(user, "<span class='warning'>This injector is used up!</span>")
+			return
+		if(syringes.len < max_syringes)
+			if(!user.transferItemToLoc(D, src))
+				return FALSE
+			to_chat(user, "<span class='notice'>You load \the [D] into \the [src].</span>")
+			syringes += D
+			recharge_newshot()
+			return TRUE
+		else
+			to_chat(user, "<span class='warning'>[src] cannot hold more syringes!</span>")
+	return FALSE

code/modules/projectiles/projectile.dm

@@ -90,9 +90,9 @@
 			if(starting)
 				splatter_dir = get_dir(starting, target_loca)
 			if(isalien(L))
-				new /obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir)
+				new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir)
 			else
-				new /obj/effect/overlay/temp/dir_setting/bloodsplatter(target_loca, splatter_dir)
+				new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir)
 			if(prob(33))
 				L.add_splatter_floor(target_loca)
 		else if(impact_effect_type)
@@ -224,7 +224,7 @@
 				pixel_y_offset += 32
 				old_pixel_y += 32
 				new_y--
-				
+
 			pixel_x = old_pixel_x
 			pixel_y = old_pixel_y
 			step_towards(src, locate(new_x, new_y, z))
@@ -237,7 +237,7 @@
 				animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW)
 			old_pixel_x = pixel_x_offset
 			old_pixel_y = pixel_y_offset
-			
+
 			if(original && (original.layer>=2.75) || ismob(original))
 				if(loc == get_turf(original))
 					if(!(original in permutated))

code/modules/projectiles/projectile/beams.dm

@@ -9,7 +9,7 @@
 	hitsound_wall = 'sound/weapons/effects/searwall.ogg'
 	flag = "laser"
 	eyeblur = 2
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/red_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
 	light_color = LIGHT_COLOR_RED
 
 /obj/item/projectile/beam/laser
@@ -25,7 +25,7 @@
 		var/mob/living/carbon/M = target
 		M.IgniteMob()
 	else if(isturf(target))
-		impact_effect_type = /obj/effect/overlay/temp/impact_effect/red_laser/wall
+		impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser/wall
 
 /obj/item/projectile/beam/weak
 	damage = 15
@@ -48,7 +48,7 @@
 	irradiate = 30
 	range = 15
 	forcedodge = 1
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/green_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
 	light_color = LIGHT_COLOR_GREEN
 
 /obj/item/projectile/beam/disabler
@@ -59,14 +59,14 @@
 	flag = "energy"
 	hitsound = 'sound/weapons/tap.ogg'
 	eyeblur = 0
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/item/projectile/beam/pulse
 	name = "pulse"
 	icon_state = "u_laser"
 	damage = 50
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = 0)
@@ -94,7 +94,7 @@
 	damage = 30
 	legacy = 1
 	animate_movement = SLIDE_STEPS
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/green_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
 	light_color = LIGHT_COLOR_GREEN
 
 /obj/item/projectile/beam/emitter/singularity_pull()
@@ -108,7 +108,7 @@
 	damage_type = STAMINA
 	flag = "laser"
 	var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
@@ -122,7 +122,7 @@
 /obj/item/projectile/beam/lasertag/redtag
 	icon_state = "laser"
 	suit_types = list(/obj/item/clothing/suit/bluetag)
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/red_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
 	light_color = LIGHT_COLOR_RED
 
 /obj/item/projectile/beam/lasertag/bluetag
@@ -134,17 +134,17 @@
 	icon_state = "purple_laser"
 	damage = 200
 	damage_type = BURN
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/purple_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
 	light_color = LIGHT_COLOR_PURPLE
 
 /obj/item/projectile/beam/instakill/blue
 	icon_state = "blue_laser"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/item/projectile/beam/instakill/red
 	icon_state = "red_laser"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/red_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
 	light_color = LIGHT_COLOR_RED
 
 /obj/item/projectile/beam/instakill/on_hit(atom/target)

code/modules/projectiles/projectile/bullets.dm

@@ -6,7 +6,7 @@
 	nodamage = 0
 	flag = "bullet"
 	hitsound_wall = "ricochet"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect
+	impact_effect_type = /obj/effect/temp_visual/impact_effect
 
 /obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage
 	damage = 5
@@ -190,7 +190,7 @@
 	name = "dart"
 	icon_state = "cbbolt"
 	damage = 6
-	var/piercing = 0
+	var/piercing = FALSE
 
 /obj/item/projectile/bullet/dart/New()
 	..()
@@ -201,15 +201,15 @@
 	if(iscarbon(target))
 		var/mob/living/carbon/M = target
 		if(blocked != 100) // not completely blocked
-			if(M.can_inject(null, 0, def_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
+			if(M.can_inject(null, FALSE, def_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
 				..()
 				reagents.reaction(M, INJECT)
 				reagents.trans_to(M, reagents.total_volume)
-				return 1
+				return TRUE
 			else
 				blocked = 100
-				target.visible_message("<span class='danger'>The [name] was deflected!</span>", \
-									   "<span class='userdanger'>You were protected against the [name]!</span>")
+				target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \
+									   "<span class='userdanger'>You were protected against \the [src]!</span>")
 
 	..(target, blocked)
 	reagents.set_reacting(TRUE)
@@ -240,7 +240,28 @@
 		nodamage = 1
 	. = ..() // Execute the rest of the code.
 
+/obj/item/projectile/bullet/dnainjector
+	name = "\improper DNA injector"
+	icon_state = "syringeproj"
+	var/obj/item/weapon/dnainjector/injector
+	
+/obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0)
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		if(blocked != 100)
+			if(M.can_inject(null, FALSE, def_zone, FALSE))
+				if(injector.inject(M, firer))
+					QDEL_NULL(injector)
+					return TRUE
+			else
+				blocked = 100
+				target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \
+									   "<span class='userdanger'>You were protected against \the [src]!</span>")
+	return ..()
 
+/obj/item/projectile/bullet/dnainjector/Destroy()
+	QDEL_NULL(injector)
+	return ..()
 
 //// SNIPER BULLETS
 

code/modules/projectiles/projectile/energy.dm

@@ -133,7 +133,7 @@
 	damage = 20
 	damage_type = CLONE
 	irradiate = 10
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/green_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
 
 /obj/item/projectile/energy/dart //ninja throwing dart
 	name = "dart"
@@ -162,7 +162,7 @@
 /obj/item/projectile/energy/tesla
 	name = "tesla bolt"
 	icon_state = "tesla_projectile"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
 	var/chain
 
 /obj/item/projectile/energy/tesla/fire(setAngle)

code/modules/projectiles/projectile/special.dm

@@ -5,7 +5,7 @@
 	damage_type = BURN
 	nodamage = 1
 	flag = "energy"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/ion
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/ion
 
 
 /obj/item/projectile/ion/on_hit(atom/target, blocked = 0)
@@ -202,7 +202,7 @@
 	damage = 5
 	range = 3.5 //works as 4, but doubles to 7
 	dismemberment = 20
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/purple_laser
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
 
 /obj/item/projectile/plasma/Initialize()
 	. = ..()
@@ -270,7 +270,7 @@
 		A.throw_at(throwtarget,power+1,1)
 		thrown_items[A] = A
 	for(var/turf/F in range(T,power))
-		new /obj/effect/overlay/temp/gravpush(F)
+		new /obj/effect/temp_visual/gravpush(F)
 
 /obj/item/projectile/gravityattract
 	name = "attraction bolt"
@@ -300,7 +300,7 @@
 		A.throw_at(T, power+1, 1)
 		thrown_items[A] = A
 	for(var/turf/F in range(T,power))
-		new /obj/effect/overlay/temp/gravpush(F)
+		new /obj/effect/temp_visual/gravpush(F)
 
 /obj/item/projectile/gravitychaos
 	name = "gravitational blast"
@@ -330,5 +330,5 @@
 		A.throw_at(get_edge_target_turf(A, pick(GLOB.cardinal)), power+1, 1)
 		thrown_items[A] = A
 	for(var/turf/Z in range(T,power))
-		new /obj/effect/overlay/temp/gravpush(Z)
+		new /obj/effect/temp_visual/gravpush(Z)
 

code/modules/reagents/chemistry/reagents/blob_reagents.dm

@@ -298,7 +298,7 @@
 	var/initial_volume = reac_volume
 	reac_volume = ..()
 	if(reac_volume >= 10) //if it's not a spore cloud, bad time incoming
-		var/obj/effect/overlay/temp/explosion/fast/E = new /obj/effect/overlay/temp/explosion/fast(get_turf(M))
+		var/obj/effect/temp_visual/explosion/fast/E = new /obj/effect/temp_visual/explosion/fast(get_turf(M))
 		E.alpha = 150
 		for(var/mob/living/L in orange(get_turf(M), 1))
 			if("blob" in L.faction) //no friendly fire

code/modules/ruins/lavaland_ruin_code.dm

@@ -143,6 +143,7 @@
 	has_id = 1
 	flavour_text = "<font size=3>You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Continue your research as best you can, and try to keep a low profile. Do not abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!</b>"
 	id_access_list = list(GLOB.access_syndicate)
+	faction = list("syndicate")
 
 /obj/effect/mob_spawn/human/lavaland_syndicate/comms
 	name = "Syndicate Comms Agent"

code/modules/shuttle/ripple.dm

@@ -1,4 +1,4 @@
-/obj/effect/overlay/temp/ripple
+/obj/effect/temp_visual/ripple
 	name = "hyperspace ripple"
 	desc = "Something is coming through hyperspace, you can see the \
 		visual disturbances. It's probably best not to be on top of these \
@@ -13,10 +13,10 @@
 
 	duration = 3 * SHUTTLE_RIPPLE_TIME
 
-/obj/effect/overlay/temp/ripple/Initialize(mapload, time_left)
+/obj/effect/temp_visual/ripple/Initialize(mapload, time_left)
 	. = ..()
 	animate(src, alpha=255, time=time_left)
 	addtimer(CALLBACK(src, .proc/stop_animation), 8, TIMER_CLIENT_TIME)
 
-/obj/effect/overlay/temp/ripple/proc/stop_animation()
+/obj/effect/temp_visual/ripple/proc/stop_animation()
 	icon_state = "medi_holo_no_anim"

code/modules/shuttle/shuttle.dm

@@ -404,7 +404,7 @@
 /obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1, animate_time)
 	var/list/turfs = ripple_area(S1)
 	for(var/t in turfs)
-		ripples += new /obj/effect/overlay/temp/ripple(t, animate_time)
+		ripples += new /obj/effect/temp_visual/ripple(t, animate_time)
 
 /obj/docking_port/mobile/proc/remove_ripples()
 	for(var/R in ripples)
@@ -764,6 +764,6 @@
 	if(T in block(T0,T1))
 		return TRUE
 	return FALSE
-	
+
 
 #undef DOCKING_PORT_HIGHLIGHT

code/modules/spells/spell_types/aimed.dm

@@ -24,6 +24,7 @@
 		if(charge_type == "recharge")
 			var/refund_percent = current_amount/projectile_amount
 			charge_counter = charge_max * refund_percent
+			start_recharge()
 		remove_ranged_ability(msg)
 	else
 		msg = "<span class='notice'>[active_msg]<B>Left-click to shoot it at a target!</B></span>"

code/modules/spells/spell_types/construct_spells.dm

@@ -128,8 +128,8 @@
 	action_icon_state = "phaseshift"
 	action_background_icon_state = "bg_demon"
 	jaunt_in_time = 12
-	jaunt_in_type = /obj/effect/overlay/temp/dir_setting/wraith
-	jaunt_out_type = /obj/effect/overlay/temp/dir_setting/wraith/out
+	jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith
+	jaunt_out_type = /obj/effect/temp_visual/dir_setting/wraith/out
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc)
 	return
@@ -256,7 +256,7 @@
 	S.add_atom_colour("#990000", FIXED_COLOUR_PRIORITY)
 	S.faction = list("cult")
 	playsound(get_turf(S), 'sound/effects/ghost.ogg', 100, 1)
-	new /obj/effect/overlay/temp/cult/sac(get_turf(S))
+	new /obj/effect/temp_visual/cult/sac(get_turf(S))
 
 /obj/effect/proc_holder/spell/targeted/dominate/can_target(mob/living/target)
 	if(!isanimal(target) || target.stat)
@@ -267,5 +267,5 @@
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem
 	charge_max = 800
-	jaunt_in_type = /obj/effect/overlay/temp/dir_setting/cult/phase
-	jaunt_out_type = /obj/effect/overlay/temp/dir_setting/cult/phase/out
+	jaunt_in_type = /obj/effect/temp_visual/dir_setting/cult/phase
+	jaunt_out_type = /obj/effect/temp_visual/dir_setting/cult/phase/out

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -13,8 +13,8 @@
 	nonabstract_req = 1
 	var/jaunt_duration = 50 //in deciseconds
 	var/jaunt_in_time = 5
-	var/jaunt_in_type = /obj/effect/overlay/temp/wizard
-	var/jaunt_out_type = /obj/effect/overlay/temp/wizard/out
+	var/jaunt_in_type = /obj/effect/temp_visual/wizard
+	var/jaunt_out_type = /obj/effect/temp_visual/wizard/out
 	action_icon_state = "jaunt"
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets,mob/user = usr) //magnets, so mostly hardcoded

code/modules/spells/spell_types/wizard.dm

@@ -257,7 +257,7 @@
 	selection_type = "view"
 	sound = 'sound/magic/Repulse.ogg'
 	var/maxthrow = 5
-	var/sparkle_path = /obj/effect/overlay/temp/gravpush
+	var/sparkle_path = /obj/effect/temp_visual/gravpush
 
 	action_icon_state = "repulse"
 
@@ -300,7 +300,7 @@
 	range = 2
 	cooldown_min = 150
 	invocation_type = "none"
-	sparkle_path = /obj/effect/overlay/temp/dir_setting/tailsweep
+	sparkle_path = /obj/effect/temp_visual/dir_setting/tailsweep
 	action_icon_state = "tailsweep"
 	action_background_icon_state = "bg_alien"
 

code/modules/surgery/organs/tongue.dm

@@ -14,6 +14,7 @@
 	languages_possible = typecacheof(list(
 		/datum/language/common,
 		/datum/language/draconic,
+		/datum/language/codespeak,
 		/datum/language/monkey,
 		/datum/language/narsie,
 		/datum/language/ratvar

code/modules/uplink/uplink_item.dm

@@ -1136,6 +1136,19 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 	item = /obj/item/device/jammer
 	cost = 5
 
+/datum/uplink_item/device_tools/codespeak_manual
+	name = "Codespeak Manual"
+	desc = "Syndicate agents can be trained to use a series of codewords to comvey complex information, which sounds like random concepts and drinks to anyone listening. This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. One use."
+	item = /obj/item/weapon/codespeak_manual
+	cost = 2
+	exclude_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/device_tools/codespeak_manual_deluxe
+	name = "Deluxe Codespeak Manual"
+	desc = "Syndicate agents can be trained to use a series of codewords to comvey complex information, which sounds like random concepts and drinks to anyone listening. This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses."
+	cost = 8
+	include_modes = list(/datum/game_mode/nuclear)
+
 // Implants
 /datum/uplink_item/implants
 	category = "Implants"
@@ -1276,6 +1289,14 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 	restricted_roles = list("Chaplain")
 	surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain
 
+/datum/uplink_item/role_restricted/pie_cannon
+	name = "Banana Cream Pie Cannon"
+	desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
+	cost = 10
+	item = /obj/item/weapon/pneumatic_cannon/pie/selfcharge
+	restricted_roles = list("Clown")
+	surplus = 0	//No fun unless you're the clown!
+
 /datum/uplink_item/role_restricted/ancient_jumpsuit
 	name = "Ancient Jumpsuit"
 	desc = "A tattered old jumpsuit that will provide absolutely no benefit to you. It fills the wearer with a strange compulsion to blurt out 'glorf'."
@@ -1291,6 +1312,13 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 	cost = 2
 	restricted_roles = list("Curator")
 	limited_stock = 1 // please don't spam deadchat
+	
+/datum/uplink_item/role_restricted/modified_syringe_gun
+	name = "Modified Syringe Gun"
+	desc = "A syringe gun that fires DNA injectors instead of normal syringes."
+	item = /obj/item/weapon/gun/syringe/dna
+	cost = 14
+	restricted_roles = list("Geneticist", "Chief Medical Officer")
 
 // Pointless
 /datum/uplink_item/badass