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

code/ATMOSPHERICS/atmospherics.dm

@@ -187,7 +187,7 @@ Pipelines + Other Objects -> Pipe network
 			//You unwrenched a pipe full of pressure? let's splat you into the wall silly.
 			if(unsafe_wrenching)
 				unsafe_pressure_release(user,internal_pressure)
-			deconstruct()
+			deconstruct(TRUE)
 	else
 		return ..()
 
@@ -208,13 +208,16 @@ Pipelines + Other Objects -> Pipe network
 	//Values based on 2*ONE_ATMOS (the unsafe pressure), resulting in 20 range and 4 speed
 	user.throw_at(general_direction,pressures/10,pressures/50)
 
-/obj/machinery/atmospherics/deconstruct()
-	if(can_unwrench)
-		stored.loc = get_turf(src)
-		transfer_fingerprints_to(stored)
-		stored = null
-
-	qdel(src)
+/obj/machinery/atmospherics/deconstruct(disassembled = TRUE)
+	if(can_deconstruct)
+		if(can_unwrench)
+			if(stored)
+				stored.forceMove(get_turf(src))
+				if(!disassembled)
+					stored.obj_integrity = stored.max_integrity * 0.5
+				transfer_fingerprints_to(stored)
+				stored = null
+	..()
 
 /obj/machinery/atmospherics/on_construction(D, P, C)
 	if(C)
@@ -321,7 +324,7 @@ Pipelines + Other Objects -> Pipe network
 
 /obj/machinery/atmospherics/singularity_pull(S, current_size)
 	if(current_size >= STAGE_FIVE)
-		deconstruct()
+		deconstruct(FALSE)
 
 /obj/machinery/atmospherics/update_remote_sight(mob/user)
 	user.sight |= (SEE_TURFS|BLIND)

code/__HELPERS/unsorted.dm

@@ -515,23 +515,6 @@ proc/GaussRand(var/sigma)
 proc/GaussRandRound(var/sigma,var/roundto)
 	return round(GaussRand(sigma),roundto)
 
-proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,flick_anim as text,sleeptime = 0,direction as num)
-//This proc throws up either an icon or an animation for a specified amount of time.
-//The variables should be apparent enough.
-	var/atom/movable/overlay/animation = new(location)
-	if(direction)
-		animation.dir = direction
-	animation.icon = a_icon
-	animation.layer = target:layer+1
-	if(a_icon_state)
-		animation.icon_state = a_icon_state
-	else
-		animation.icon_state = "blank"
-		animation.master = target
-		flick(flick_anim, animation)
-	sleep(max(sleeptime, 15))
-	qdel(animation)
-
 //Will return the contents of an atom recursivly to a depth of 'searchDepth'
 /atom/proc/GetAllContents(searchDepth = 5)
 	var/list/toReturn = list()
@@ -1923,3 +1906,11 @@ var/mob/dview/dview_mob = new
 			shift = list("x" = -amount_x, "y" = -amount_y)
 
 	return shift
+
+//Return a list of atoms in a location of a given type. Can be refined to look for pixel-shift.
+/proc/get_atoms_of_type(var/atom/here, var/type, var/check_shift, var/shift_x = 0, var/shift_y = 0)
+	. = list()
+	if(here)
+		for(var/atom/thing in here)
+			if(istype(thing, type) && (check_shift && thing.pixel_x == shift_x && thing.pixel_y == shift_y))
+				. += thing

code/_onclick/telekinesis.dm

@@ -180,18 +180,7 @@ var/const/tk_maxrange = 15
 /obj/item/tk_grab/proc/apply_focus_overlay()
 	if(!focus)
 		return
-	// Oh jeez ow
-	var/obj/effect/overlay/O = new /obj/effect/overlay(locate(focus.x,focus.y,focus.z))
-	O.name = "sparkles"
-	O.anchored = 1
-	O.density = 0
-	O.layer = FLY_LAYER
-	O.dir = pick(cardinal)
-	O.icon = 'icons/effects/effects.dmi'
-	O.icon_state = "nothing"
-	flick("empdisable",O)
-	spawn(5)
-		qdel(O)
+	new /obj/effect/temp_visual/telekinesis(get_turf(focus))
 
 /obj/item/tk_grab/proc/form_grab(mob/user, obj/target)
 	user.put_in_active_hand(src)

code/controllers/configuration.dm

@@ -68,6 +68,7 @@
 	var/assistantratio = 2 //how many assistants to security members
 
 	var/traitor_objectives_amount = 2
+	var/shadowling_max_age = 0
 
 	var/max_maint_drones = 5				//This many drones can spawn,
 	var/allow_drone_spawn = 1				//assuming the admin allow them to.
@@ -260,6 +261,9 @@
 				if("jobs_have_minimal_access")
 					config.jobs_have_minimal_access = 1
 
+				if("shadowling_max_age")
+					config.shadowling_max_age = text2num(value)
+
 				if("log_ooc")
 					config.log_ooc = 1
 

code/datums/cargoprofile.dm

@@ -139,8 +139,7 @@
 	whitelist = list(/obj/item/stack/cable_coil,/obj/item/stack/rods,
 					/obj/item/stack/sheet/metal,/obj/item/stack/sheet/plasteel,
 					/obj/item/stack/sheet/glass,/obj/item/stack/sheet/rglass,
-					/obj/item/stack/tile,/obj/item/weapon/light,
-					/obj/item/weapon/table_parts)
+					/obj/item/stack/tile,/obj/item/weapon/light)
 	//todo: maybe stack things while we're here?
 
 /datum/cargoprofile/exotics

code/datums/outfits/outfit_admin.dm

@@ -727,73 +727,6 @@
 		/obj/item/weapon/melee/classic_baton/telescopic = 1,
 		/obj/item/ammo_box/magazine/m50 = 2)
 
-/datum/outfit/admin/paranormal_ert
-	name = "Paranormal ERT member"
-
-	uniform = /obj/item/clothing/under/syndicate
-	suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal
-	back = /obj/item/weapon/storage/backpack/ert/security
-	belt = /obj/item/weapon/gun/energy/gun/nuclear
-	gloves = /obj/item/clothing/gloves/color/black
-	shoes = /obj/item/clothing/shoes/combat
-	head = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
-	l_ear = /obj/item/device/radio/headset/ert/alt
-	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	id = /obj/item/weapon/card/id/centcom
-	pda = /obj/item/device/pda/centcom
-	backpack_contents = list(
-		/obj/item/weapon/storage/box/survival = 1,
-		/obj/item/clothing/mask/gas/sechailer/swat = 1,
-		/obj/item/weapon/storage/box/zipties = 1,
-		/obj/item/device/flashlight = 1)
-
-/datum/outfit/admin/paranormal_ert/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	. = ..()
-	if(visualsOnly)
-		return
-
-	var/obj/item/weapon/card/id/I = H.wear_id
-	if(istype(I))
-		apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), "Emergency Response Team Member")
-
-	var/obj/item/weapon/implant/L = new /obj/item/weapon/implant/mindshield(H)
-	L.implant(H)
-
-/datum/outfit/admin/janitorial_ert
-	name = "Janitorial ERT member"
-
-	uniform = /obj/item/clothing/under/syndicate
-	suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor
-	back = /obj/item/weapon/storage/backpack/ert/janitor
-	belt = /obj/item/weapon/storage/belt/janitor/full
-	gloves = /obj/item/clothing/gloves/color/yellow
-	shoes = /obj/item/clothing/shoes/galoshes
-	head = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
-	l_ear = /obj/item/device/radio/headset/ert/alt
-	glasses = /obj/item/clothing/glasses/sunglasses
-	id = /obj/item/weapon/card/id/centcom
-	pda = /obj/item/device/pda/centcom
-	backpack_contents = list(
-		/obj/item/weapon/caution = 2,
-		/obj/item/weapon/storage/box/survival = 1,
-		/obj/item/weapon/reagent_containers/spray/cleaner = 1,
-		/obj/item/weapon/storage/bag/trash = 1,
-		/obj/item/weapon/storage/box/lights/mixed = 1,
-		/obj/item/weapon/holosign_creator = 1,
-		/obj/item/device/flashlight = 1)
-
-/datum/outfit/admin/janitorial_ert/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	. = ..()
-	if(visualsOnly)
-		return
-
-	var/obj/item/weapon/card/id/I = H.wear_id
-	if(istype(I))
-		apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), "Emergency Response Team Member")
-
-	var/obj/item/weapon/implant/L = new /obj/item/weapon/implant/mindshield(H)
-	L.implant(H)
-
 /datum/outfit/admin/chrono
 	name = "Chrono Legionnaire"
 

code/datums/spells/construct_spells.dm

@@ -94,7 +94,7 @@
 /obj/effect/forcefield/cult
 	desc = "That eerie looking obstacle seems to have been pulled from another dimension through sheer force"
 	name = "eldritch wall"
-	icon = 'icons/effects/effects.dmi'
+	icon = 'icons/effects/cult_effects.dmi'
 	icon_state = "m_shield_cult"
 	light_color = LIGHT_COLOR_PURE_RED
 
@@ -110,10 +110,14 @@
 	invocation_type = "none"
 	range = -1
 	include_user = 1
-	phaseshift = 1
 	jaunt_duration = 50 //in deciseconds
 	centcom_cancast = 0 //Stop people from getting to centcom
+	jaunt_in_time = 12
+	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
 
 /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser
 	name = "Lesser Magic Missile"

code/datums/spells/ethereal_jaunt.dm

@@ -13,109 +13,89 @@
 	nonabstract_req = 1
 	centcom_cancast = 0 //Prevent people from getting to centcom
 
-	var phaseshift = 0
 	var/jaunt_duration = 50 //in deciseconds
+	var/jaunt_in_time = 5
+	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
+	playsound(get_turf(user), 'sound/magic/Ethereal_Enter.ogg', 50, 1, -1)
 	for(var/mob/living/target in targets)
 		if(!target.can_safely_leave_loc()) // No more brainmobs hopping out of their brains
 			to_chat(target, "<span class='warning'>You are somehow too bound to your current location to abandon it.</span>")
 			continue
-		spawn(0)
+		addtimer(src, "do_jaunt", 0, FALSE, target)
 
-			if(target.buckled)
-				var/obj/structure/stool/bed/buckled_to = target.buckled.
-				buckled_to.unbuckle_mob()
+/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/do_jaunt(mob/living/target)
+	target.notransform = 1
+	var/turf/mobloc = get_turf(target)
+	var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt(mobloc)
+	new jaunt_out_type(mobloc, target.dir)
+	target.ExtinguishMob()
+	target.forceMove(holder)
+	target.reset_perspective(holder)
+	target.notransform = 0 //mob is safely inside holder now, no need for protection.
+	jaunt_steam(mobloc)
 
-			var/mobloc = get_turf(target.loc)
-			var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt( mobloc )
-			var/atom/movable/overlay/animation = new /atom/movable/overlay( mobloc )
-			animation.name = "water"
-			animation.density = 0
-			animation.anchored = 1
-			animation.icon = 'icons/mob/mob.dmi'
-			animation.icon_state = "liquify"
-			animation.layer = 5
-			animation.master = holder
-			target.ExtinguishMob()
-			if(target.buckled)
-				target.buckled.unbuckle_mob()
-			if(phaseshift == 1)
-				animation.dir = target.dir
-				flick("phase_shift",animation)
-				target.loc = holder
-				target.client.eye = holder
-				sleep(jaunt_duration)
-				mobloc = get_turf(target.loc)
-				animation.loc = mobloc
-				target.canmove = 0
-				sleep(20)
-				animation.dir = target.dir
-				flick("phase_shift2",animation)
-				sleep(5)
-				if(!target.Move(mobloc))
-					for(var/direction in list(1,2,4,8,5,6,9,10))
-						var/turf/T = get_step(mobloc, direction)
-						if(T)
-							if(target.Move(T))
-								break
-				target.canmove = 1
-				target.client.eye = target
-				qdel(animation)
-				qdel(holder)
-			else
-				flick("liquify",animation)
-				target.loc = holder
-				target.client.eye = holder
-				var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
-				steam.set_up(10, 0, mobloc)
-				steam.start()
-				sleep(jaunt_duration)
-				mobloc = get_turf(target.loc)
-				animation.loc = mobloc
-				steam.location = mobloc
-				steam.start()
-				target.canmove = 0
-				sleep(20)
-				flick("reappear",animation)
-				sleep(5)
-				if(!target.Move(mobloc))
-					for(var/direction in list(1,2,4,8,5,6,9,10))
-						var/turf/T = get_step(mobloc, direction)
-						if(T)
-							if(target.Move(T))
-								break
-				target.canmove = 1
-				target.client.eye = target
-				qdel(animation)
-				qdel(holder)
+	sleep(jaunt_duration)
+
+	if(target.loc != holder) //mob warped out of the warp
+		qdel(holder)
+		return
+	mobloc = get_turf(target.loc)
+	jaunt_steam(mobloc)
+	target.canmove = 0
+	holder.reappearing = 1
+	playsound(get_turf(target), 'sound/magic/Ethereal_Exit.ogg', 50, 1, -1)
+	sleep(25 - jaunt_in_time)
+	new jaunt_in_type(mobloc, holder.dir)
+	target.setDir(holder.dir)
+	sleep(jaunt_in_time)
+	qdel(holder)
+	if(!qdeleted(target))
+		if(mobloc.density)
+			for(var/direction in alldirs)
+				var/turf/T = get_step(mobloc, direction)
+				if(T)
+					if(target.Move(T))
+						break
+		target.canmove = 1
+
+/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
+	var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
+	steam.set_up(10, 0, mobloc)
+	steam.start()
 
 /obj/effect/dummy/spell_jaunt
 	name = "water"
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "nothing"
-	var/canmove = 1
+	var/reappearing = 0
+	var/movedelay = 0
+	var/movespeed = 2
 	density = 0
 	anchored = 1
+	invisibility = 60
 	burn_state = LAVA_PROOF
 
 /obj/effect/dummy/spell_jaunt/Destroy()
 	// Eject contents if deleted somehow
 	for(var/atom/movable/AM in src)
-		AM.loc = get_turf(src)
+		AM.forceMove(get_turf(src))
 	return ..()
 
-/obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
-	if(!src.canmove) return
+/obj/effect/dummy/spell_jaunt/relaymove(mob/user, direction)
+	if((movedelay > world.time) || reappearing || !direction)
+		return
 	var/turf/newLoc = get_step(src,direction)
+	setDir(direction)
 	if(!(newLoc.flags & NOJAUNT))
-		loc = newLoc
+		forceMove(newLoc)
 	else
 		to_chat(user, "<span class='warning'>Some strange aura is blocking the way!</span>")
-	src.canmove = 0
-	spawn(2) src.canmove = 1
+	movedelay = world.time + movespeed
 
 /obj/effect/dummy/spell_jaunt/ex_act(blah)
 	return

code/datums/spells/wizard.dm

@@ -25,7 +25,7 @@
 	proj_trail_icon_state = "magicmd"
 
 	action_icon_state = "magicm"
-	
+
 	sound = 'sound/magic/MAGIC_MISSILE.ogg'
 
 /obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile
@@ -97,7 +97,7 @@
 
 	emp_heavy = 6
 	emp_light = 10
-	
+
 	sound = 'sound/magic/Disable_Tech.ogg'
 
 /obj/effect/proc_holder/spell/targeted/turf_teleport/blink
@@ -123,7 +123,7 @@
 	centcom_cancast = 0 //prevent people from getting to centcom
 
 	action_icon_state = "blink"
-	
+
 	sound1 = 'sound/magic/blink.ogg'
 	sound2 = 'sound/magic/blink.ogg'
 
@@ -144,7 +144,7 @@
 	smoke_amt = 5
 
 	action_icon_state = "spell_teleport"
-	
+
 	sound1 = 'sound/magic/Teleport_diss.ogg'
 	sound2 = 'sound/magic/Teleport_app.ogg'
 
@@ -194,7 +194,7 @@
 	summon_type = list(/mob/living/simple_animal/hostile/carp)
 
 	cast_sound = 'sound/magic/Summon_Karp.ogg'
-	
+
 /obj/effect/proc_holder/spell/aoe_turf/conjure/construct
 	name = "Artificer"
 	desc = "This spell conjures a construct which may be controlled by Shades"
@@ -334,7 +334,7 @@
 	cooldown_min = 150
 	selection_type = "view"
 	var/maxthrow = 5
-
+	var/sparkle_path = /obj/effect/temp_visual/gravpush
 	action_icon_state = "repulse"
 	sound = 'sound/magic/Repulse.ogg'
 
@@ -347,16 +347,13 @@
 		for(var/atom/movable/AM in T)
 			thrownatoms += AM
 
-	for(var/atom/movable/AM in thrownatoms)
-		if(AM == user || AM.anchored) continue
+	for(var/am in thrownatoms)
+		var/atom/movable/AM = am
+		if(AM == user || AM.anchored)
+			continue
 
-		var/obj/effect/overlay/targeteffect	= new /obj/effect/overlay{icon='icons/effects/effects.dmi'; icon_state="shieldsparkles"; mouse_opacity=0; density = 0}()
-		AM.overlays += targeteffect
 		throwtarget = get_edge_target_turf(user, get_dir(user, get_step_away(AM, user)))
 		distfromcaster = get_dist(user, AM)
-		spawn(10)
-			AM.overlays -= targeteffect
-			qdel(targeteffect)
 		if(distfromcaster == 0)
 			if(istype(AM, /mob/living))
 				var/mob/living/M = AM
@@ -364,11 +361,13 @@
 				M.adjustBruteLoss(5)
 				to_chat(M, "<span class='userdanger'>You're slammed into the floor by a mystical force!</span>")
 		else
+			new sparkle_path(get_turf(AM), get_dir(user, AM)) //created sparkles will disappear on their own
 			if(istype(AM, /mob/living))
 				var/mob/living/M = AM
 				M.Weaken(2)
 				to_chat(M, "<span class='userdanger'>You're thrown back by a mystical force!</span>")
-			spawn(0) AM.throw_at(throwtarget, ((Clamp((maxthrow - (Clamp(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1)//So stuff gets tossed around at the same time.
+			spawn(0)
+				AM.throw_at(throwtarget, ((Clamp((maxthrow - (Clamp(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1)//So stuff gets tossed around at the same time.
 
 /obj/effect/proc_holder/spell/targeted/sacred_flame
 	name = "Sacred Flame"

code/datums/uplink_item.dm

@@ -417,7 +417,7 @@ var/list/uplink_items = list()
 	desc = "A flamethrower, fuelled by a portion of highly flammable bio-toxins stolen previously from Nanotrasen stations. Make a statement by roasting the filth in their own greed. Use with caution."
 	reference = "FT"
 	item = /obj/item/weapon/flamethrower/full/tank
-	cost = 11
+	cost = 8
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 40
 
@@ -457,7 +457,7 @@ var/list/uplink_items = list()
 	desc = "A unique grenade that deploys a swarm of viscerators upon activation, which will chase down and shred any non-operatives in the area."
 	reference = "VDG"
 	item = /obj/item/weapon/grenade/spawnergrenade/manhacks
-	cost = 8
+	cost = 6
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 35
 
@@ -466,7 +466,7 @@ var/list/uplink_items = list()
 	desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor and broca system , making it impossible for them to move or speak while in their system."
 	reference = "BTS"
 	item = /obj/item/weapon/storage/box/syndie_kit/bioterror
-	cost = 6
+	cost = 5
 	gamemodes = list(/datum/game_mode/nuclear)
 
 /datum/uplink_item/dangerous/saringrenades
@@ -474,7 +474,7 @@ var/list/uplink_items = list()
 	desc = "A box of four (4) grenades filled with Sarin, a deadly neurotoxin. Use extreme caution when handling and be sure to vacate the premise after using; ensure communication is maintained with team to avoid accidental gassings."
 	reference = "TGG"
 	item = /obj/item/weapon/storage/box/syndie_kit/sarin
-	cost = 15
+	cost = 12
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 0
 
@@ -698,7 +698,7 @@ var/list/uplink_items = list()
 	desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!"
 	reference = "50S"
 	item = /obj/item/ammo_box/magazine/sniper_rounds/soporific
-	cost = 6
+	cost = 3
 
 /datum/uplink_item/ammo/sniper/haemorrhage
 	name = ".50 Haemorrhage Magazine"
@@ -783,6 +783,15 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/gun/syringe/syndicate
 	cost = 4
 	surplus = 50
+	excludefrom = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/stealthy_weapons/RSG
+	name = "Rapid Syringe Gun"
+	desc = "A rapid syringe gun able to hold six shot and fire them rapidly. Great together with the bioterror syringe"
+	reference = "RSG"
+	item = /obj/item/weapon/gun/syringe/rapidsyringe
+	cost = 4
+	gamemodes = list(/datum/game_mode/nuclear)
 
 /datum/uplink_item/stealthy_weapons/detomatix
 	name = "Detomatix PDA Cartridge"
@@ -968,7 +977,7 @@ var/list/uplink_items = list()
 	and other medical supplies helpful for a medical field operative."
 	reference = "SCMK"
 	item = /obj/item/weapon/storage/firstaid/tactical
-	cost = 9
+	cost = 7
 	gamemodes = list(/datum/game_mode/nuclear)
 
 //Space Suits and Hardsuits
@@ -1045,7 +1054,7 @@ var/list/uplink_items = list()
 	desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. Be careful with their wording, as artificial intelligences may look for loopholes to exploit."
 	reference = "HAI"
 	item = /obj/item/weapon/aiModule/syndicate
-	cost = 14
+	cost = 12
 
 /datum/uplink_item/device_tools/magboots
 	name = "Blood-Red Magboots"
@@ -1149,7 +1158,7 @@ var/list/uplink_items = list()
 	desc = "A printed circuit board that completes the teleporter onboard the mothership. Advise you test fire the teleporter before entering it, as malfunctions can occur."
 	item = /obj/item/weapon/circuitboard/teleporter
 	reference = "TP"
-	cost = 40
+	cost = 20
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 0
 
@@ -1158,7 +1167,7 @@ var/list/uplink_items = list()
 	desc = "Use to select the landing zone of your assault pod."
 	item = /obj/item/device/assault_pod
 	reference = "APT"
-	cost = 30
+	cost = 25
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 0
 

code/game/area/Space Station 13 areas.dm

@@ -2128,8 +2128,8 @@ area/security/podbay
 	name = "\improper Construction Site Eng Core"
 	icon_state = "green"
 
-/area/constructionsite/hallway/scicore
-	name = "\improper Construction Site Sci Core"
+/area/constructionsite/hallway/fore
+	name = "\improper Construction Site Fore"
 	icon_state = "green"
 
 /area/constructionsite/hallway/port

code/game/asteroid.dm

@@ -72,7 +72,7 @@ var/global/max_secret_rooms = 6
 			treasureitems = list(/obj/item/device/soulstone=1, /obj/item/clothing/suit/space/cult=1, /obj/item/weapon/bedsheet/cult=2,
 								 /obj/item/clothing/suit/hooded/cultrobes=2, /mob/living/simple_animal/hostile/creature=3)
 			fluffitems = list(/obj/effect/gateway=1,/obj/effect/gibspawner=1,/obj/structure/cult/talisman=1,/obj/item/toy/crayon/red=2,
-							  /obj/item/organ/internal/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/woodentable=2,/obj/item/weapon/reagent_containers/food/snacks/ectoplasm=3,
+							  /obj/item/organ/internal/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/wood=2,/obj/item/weapon/reagent_containers/food/snacks/ectoplasm=3,
 							  /obj/item/clothing/head/helmet/space/cult=1, /obj/item/clothing/shoes/cult=1)
 
 		if("wizden")
@@ -115,7 +115,7 @@ var/global/max_secret_rooms = 6
 			floortypes = list(/turf/simulated/floor,/turf/simulated/floor/wood)
 			treasureitems = list(/obj/item/weapon/melee/energy/sword/pirate=1,/obj/item/weapon/gun/projectile/revolver/doublebarrel=1,/obj/item/weapon/storage/backpack/satchel_flat=1,
 			/obj/machinery/reagentgrinder=2, /obj/machinery/computer/security/wooden_tv=4, /obj/machinery/vending/coffee=3)
-			fluffitems = list(/obj/structure/table/woodentable=2,/obj/structure/reagent_dispensers/beerkeg=1,/obj/item/stack/spacecash/c500=4,
+			fluffitems = list(/obj/structure/table/wood=2,/obj/structure/reagent_dispensers/beerkeg=1,/obj/item/stack/spacecash/c500=4,
 							  /obj/item/weapon/reagent_containers/food/drinks/shaker=1,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine=3,
 							  /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey=3,/obj/item/clothing/shoes/laceup=2)
 

code/game/atoms.dm

@@ -610,6 +610,9 @@ var/list/blood_splatter_icons = list()
 /atom/proc/narsie_act()
 	return
 
+/atom/proc/ratvar_act()
+	return
+
 /atom/proc/atom_say(message)
 	if(!message)
 		return

code/game/dna/genes/monkey.dm

@@ -25,13 +25,8 @@
 	H.icon = null
 	H.invisibility = 101
 
-	var/atom/movable/overlay/animation = new /atom/movable/overlay(H.loc)
-	animation.icon_state = "blank"
-	animation.icon = 'icons/mob/mob.dmi'
-	animation.master = H
-	flick("h2monkey", animation)
+	new /obj/effect/temp_visual/monkeyify(H.loc)
 	sleep(22)
-	qdel(animation)
 
 	H.SetStunned(0)
 	H.invisibility = initial(H.invisibility)
@@ -68,13 +63,8 @@
 	H.icon = null
 	H.invisibility = 101
 
-	var/atom/movable/overlay/animation = new /atom/movable/overlay(H.loc)
-	animation.icon_state = "blank"
-	animation.icon = 'icons/mob/mob.dmi'
-	animation.master = H
-	flick("monkey2h", animation)
+	new /obj/effect/temp_visual/monkeyify/humanify(H.loc)
 	sleep(22)
-	qdel(animation)
 
 	H.SetStunned(0)
 	H.invisibility = initial(H.invisibility)

code/game/gamemodes/changeling/powers/mutations.dm

@@ -147,7 +147,7 @@
 		return
 	if(istype(target, /obj/structure/table))
 		var/obj/structure/table/T = target
-		T.destroy()
+		T.deconstruct(FALSE)
 
 	else if(istype(target, /obj/machinery/computer))
 		var/obj/machinery/computer/C = target

code/game/gamemodes/cult/cult_items.dm

@@ -165,7 +165,7 @@
 	if(current_charges)
 		owner.visible_message("<span class='danger'>\The [attack_text] is deflected in a burst of blood-red sparks!</span>")
 		current_charges--
-		new /obj/effect/overlay/temp/cult/sparks(get_turf(owner))
+		new /obj/effect/temp_visual/cult/sparks(get_turf(owner))
 		if(!current_charges)
 			owner.visible_message("<span class='danger'>The runed shield around [owner] suddenly disappears!</span>")
 			owner.update_inv_wear_suit()
@@ -329,14 +329,14 @@
 		if(uses <= 0)
 			icon_state ="shifter_drained"
 		playsound(mobloc, "sparks", 50, 1)
-		new /obj/effect/overlay/temp/cult/phase/out(mobloc)
+		new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, C.dir)
 
 		var/atom/movable/pulled = handle_teleport_grab(destination, C)
 		C.forceMove(destination)
 		if(pulled)
 			C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull
 
-		new /obj/effect/overlay/temp/cult/phase(destination)
+		new /obj/effect/temp_visual/dir_setting/cult/phase(destination, C.dir)
 		playsound(destination, 'sound/effects/phasein.ogg', 25, 1)
 		playsound(destination, "sparks", 50, 1)
 

code/game/gamemodes/cult/cult_structures.dm

@@ -208,7 +208,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list(
 		for(var/mob/living/L in range(5, src))
 			if(iscultist(L) || istype(L, /mob/living/simple_animal/shade) || istype(L, /mob/living/simple_animal/hostile/construct))
 				if(L.health != L.maxHealth)
-					new /obj/effect/overlay/temp/heal(get_turf(src), "#960000")
+					new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
 					if(ishuman(L))
 						L.adjustBruteLoss(-1)
 						L.adjustFireLoss(-1)
@@ -237,7 +237,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list(
 		else
 			var/turf/simulated/floor/engine/cult/F = safepick(cultturfs)
 			if(F)
-				new /obj/effect/overlay/temp/cult/turf/open/floor(F)
+				new /obj/effect/temp_visual/cult/turf/open/floor(F)
 			else
 				// Are we in space or something? No cult turfs or
 				// convertable turfs?

code/game/gamemodes/cult/runes.dm

@@ -427,7 +427,7 @@ var/list/teleport_runes = list()
 			sacrificed.Add(T.mind)
 			if(is_sacrifice_target(T.mind))
 				sacrifice_fulfilled = 1
-		new /obj/effect/overlay/temp/cult/sac(loc)
+		new /obj/effect/temp_visual/cult/sac(loc)
 		if(ticker && ticker.mode && ticker.mode.name == "cult")
 
 			cult_mode.harvested++
@@ -608,6 +608,7 @@ var/list/teleport_runes = list()
 	new /mob/living/simple_animal/slaughter/cult(T, pick(NORTHEAST, SOUTHEAST, NORTHWEST, SOUTHWEST))
 	cult_mode.demons_summoned = 1
 	shuttle_master.emergency.request(null, 0.5,null)
+	shuttle_master.emergency.canRecall = FALSE
 	cult_mode.third_phase()
 	qdel(src)
 
@@ -670,7 +671,7 @@ var/list/teleport_runes = list()
 		user.say("Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!")
 	..()
 	mob_to_sacrifice.visible_message("<span class='warning'><b>[mob_to_sacrifice]'s body rises into the air, connected to [mob_to_revive] by a glowing tendril!</span>")
-	mob_to_revive.Beam(mob_to_sacrifice,icon_state="sendbeam",icon='icons/effects/effects.dmi',time=20)
+	mob_to_revive.Beam(mob_to_sacrifice,icon_state="sendbeam",time=20)
 	sleep(20)
 	if(!mob_to_sacrifice || !in_range(mob_to_sacrifice, src))
 		mob_to_sacrifice.visible_message("<span class='warning'><b>[mob_to_sacrifice] disintegrates into a pile of bones</span>")
@@ -770,7 +771,7 @@ var/list/teleport_runes = list()
 		affecting.apply_damage(1, BRUTE)
 		if(!(user in T.contents))
 			user.visible_message("<span class='warning'>A spectral tendril wraps around [user] and pulls them back to the rune!</span>")
-			Beam(user,icon_state="drainbeam",icon='icons/effects/effects.dmi',time=2)
+			Beam(user,icon_state="drainbeam",time=2)
 			user.forceMove(get_turf(src)) //NO ESCAPE :^)
 		if(user.key)
 			user.visible_message("<span class='warning'>[user] slowly relaxes, the glow around them dimming.</span>", \
@@ -926,7 +927,7 @@ var/list/teleport_runes = list()
 			M.apply_damage(drained_amount, BRUTE, "chest")
 			user.adjustBruteLoss(-drained_amount)
 			to_chat(M, "<span class='cultitalic'>You feel extremely weak.</span>")
-	user.Beam(T,icon_state="drainbeam",icon='icons/effects/effects.dmi',time=5)
+	user.Beam(T,icon_state="drainbeam",time=5)
 	user.visible_message("<span class='warning'>Blood flows from the rune into [user]!</span>", \
 	"<span class='cult'>Blood flows into you, healing your wounds and revitalizing your spirit.</span>")
 

code/game/gamemodes/miniantags/abduction/abduction_gear.dm

@@ -54,9 +54,7 @@
 	stealth_active = 1
 	if(ishuman(loc))
 		var/mob/living/carbon/human/M = src.loc
-		spawn(0)
-			anim(M.loc,M,'icons/mob/mob.dmi',,"cloak",,M.dir)
-
+		new /obj/effect/temp_visual/dir_setting/ninja/cloak(get_turf(M), M.dir)
 		M.name_override = disguise.name
 		M.icon = disguise.icon
 		M.icon_state = disguise.icon_state
@@ -70,8 +68,7 @@
 	stealth_active = 0
 	if(ishuman(loc))
 		var/mob/living/carbon/human/M = src.loc
-		spawn(0)
-			anim(M.loc,M,'icons/mob/mob.dmi',,"uncloak",,M.dir)
+		new /obj/effect/temp_visual/dir_setting/ninja(get_turf(M), M.dir)
 		M.name_override = null
 		M.overlays.Cut()
 		M.regenerate_icons()
@@ -539,19 +536,22 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "bed"
 
-/obj/structure/abductor_tableframe
+/obj/structure/table_frame/abductor
 	name = "alien table frame"
 	desc = "A sturdy table frame made from alien alloy."
 	icon_state = "alien_frame"
-	density = 1
+	framestack = /obj/item/stack/sheet/mineral/abductor
+	framestackamount = 1
+	density = TRUE
 
-/obj/structure/abductor_tableframe/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/wrench))
+/obj/structure/table_frame/abductor/attackby(obj/item/I, mob/user, params)
+	if(iswrench(I))
 		to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
-		playsound(src.loc, I.usesound, 50, 1)
-		if(do_after(user, 30 * I.toolspeed, target = src))
-			playsound(src.loc, I.usesound, 50, 1)
-			new /obj/item/stack/sheet/mineral/abductor(get_turf(src))
+		playsound(loc, I.usesound, 50, 1)
+		if(do_after(user, 30*I.toolspeed, target = src))
+			playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
+			for(var/i = 1, i <= framestackamount, i++)
+				new framestack(get_turf(src))
 			qdel(src)
 			return
 	if(istype(I, /obj/item/stack/sheet/mineral/abductor))
@@ -560,9 +560,9 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 			to_chat(user, "<span class='warning'>You need one alien alloy sheet to do this!</span>")
 			return
 		to_chat(user, "<span class='notice'>You start adding [P] to [src]...</span>")
-		if(do_after(user, 50 * I.toolspeed, target = src))
+		if(do_after(user, 50, target = src))
 			P.use(1)
-			new /obj/structure/table/abductor(src.loc)
+			new /obj/structure/table/abductor(loc)
 			qdel(src)
 		return
 	if(istype(I, /obj/item/stack/sheet/mineral/silver))
@@ -581,8 +581,12 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	desc = "Advanced flat surface technology at work!"
 	icon = 'icons/obj/smooth_structures/alien_table.dmi'
 	icon_state = "alien_table"
+	buildstack = /obj/item/stack/sheet/mineral/abductor
+	framestack = /obj/item/stack/sheet/mineral/abductor
+	buildstackamount = 1
+	framestackamount = 1
 	canSmoothWith = null
-	parts = /obj/item/stack/sheet/mineral/abductor
+	frame = /obj/structure/table_frame/abductor
 
 /obj/machinery/optable/abductor
 	icon = 'icons/obj/abductor.dmi'

code/game/gamemodes/miniantags/abduction/machinery/pad.dm

@@ -15,41 +15,37 @@
 	flick("alien-pad", src)
 	for(var/mob/living/target in loc)
 		target.forceMove(teleport_target)
-		spawn(0)
-			anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir)
+		new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
 		to_chat(target, "<span class='warning'>The instability of the warp leaves you disoriented!</span>")
 		target.Stun(3)
 
 /obj/machinery/abductor/pad/proc/Retrieve(mob/living/target)
 	flick("alien-pad", src)
-	spawn(0)
-		anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir)
+	new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
 	Warp(target)
 
 /obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target)
-	new/obj/effect/overlay/temp/teleport_abductor(place)
+	new/obj/effect/temp_visual/teleport_abductor(place)
 	sleep(80)
 	flick("alien-pad", src)
 	target.forceMove(place)
-	anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir)
+	new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
 
 /obj/machinery/abductor/pad/proc/PadToLoc(place)
-	new/obj/effect/overlay/temp/teleport_abductor(place)
+	new/obj/effect/temp_visual/teleport_abductor(place)
 	sleep(80)
 	flick("alien-pad", src)
 	for(var/mob/living/target in src.loc)
 		target.forceMove(place)
-		spawn(0)
-			anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir)
+		new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
 
-
-/obj/effect/overlay/temp/teleport_abductor
+/obj/effect/temp_visual/teleport_abductor
 	name = "Huh"
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "teleport"
 	duration = 80
 
-/obj/effect/overlay/temp/teleport_abductor/New()
+/obj/effect/temp_visual/teleport_abductor/New()
 	var/datum/effect_system/spark_spread/S = new
 	S.set_up(10,0,loc)
 	S.start()

code/game/gamemodes/miniantags/guardian/guardian.dm

@@ -65,9 +65,9 @@
 			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) //move to summoner's tile, don't recall
-				new /obj/effect/overlay/temp/guardian/phase(loc)
+				new /obj/effect/temp_visual/guardian/phase(loc)
 
 /mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range
 	..()
@@ -136,7 +136,7 @@
 	if(cooldown > world.time && !forced)
 		return
 	if(!summoner) return
-	new /obj/effect/overlay/temp/guardian/phase/out(get_turf(src))
+	new /obj/effect/temp_visual/guardian/phase/out(get_turf(src))
 	forceMove(summoner)
 	buckled = null
 	cooldown = world.time + 30

code/game/gamemodes/miniantags/guardian/types/assassin.dm

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

code/game/gamemodes/miniantags/guardian/types/charger.dm

@@ -39,7 +39,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/game/gamemodes/miniantags/guardian/types/fire.dm

@@ -39,9 +39,9 @@
 				if(ismovableatom(target))
 					var/atom/movable/M = target
 					if(!M.anchored && M != summoner)
-						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)
-						new /obj/effect/overlay/temp/guardian/phase/out(get_turf(M))
+						new /obj/effect/temp_visual/guardian/phase/out(get_turf(M))
 
 /mob/living/simple_animal/hostile/guardian/fire/Crossed(AM as mob|obj)
 	..()

code/game/gamemodes/miniantags/guardian/types/healer.dm

@@ -125,9 +125,9 @@
 						if((Z.temperature > 270) && (Z.temperature < 360))
 							var/pressure = Z.return_pressure()
 							if((pressure > 20) && (pressure < 550))
-								new /obj/effect/overlay/temp/guardian/phase/out(get_turf(A))
+								new /obj/effect/temp_visual/guardian/phase/out(get_turf(A))
 								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))
 						else
 							to_chat(src, "<span class='danger'>The beacon isn't in a safe location!</span>")
 					else

code/game/gamemodes/miniantags/guardian/types/protector.dm

@@ -52,6 +52,6 @@
 			else
 				to_chat(summoner, "<span class='holoparasite'>You moved out of range, and were pulled back! You can only move [range] meters from <b>[src]</b>!</span>")
 				summoner.visible_message("<span class='danger'>[summoner] jumps back to 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))//Protector
+				new /obj/effect/temp_visual/guardian/phase(get_turf(summoner))//Protector

code/game/gamemodes/miniantags/morph/morph.dm

@@ -108,8 +108,6 @@
 	morphed = 0
 	form = null
 
-	//anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir)
-
 	visible_message("<span class='warning'>[src] suddenly collapses in on itself, dissolving into a pile of green flesh!</span>", \
 					"<span class='notice'>You reform to your normal body.</span>")
 	name = initial(name)

code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

@@ -212,7 +212,7 @@
 						var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread/
 						s.set_up(4, 0, L)
 						s.start()
-						new/obj/effect/overlay/temp/revenant(L.loc)
+						new/obj/effect/temp_visual/revenant(L.loc)
 						sleep(20)
 						if(!L.on) //wait, wait, don't shock me
 							return
@@ -249,23 +249,23 @@
 			spawn(0)
 				if(T.flags & NOJAUNT)
 					T.flags -= NOJAUNT
-					new/obj/effect/overlay/temp/revenant(T)
+					new/obj/effect/temp_visual/revenant(T)
 				for(var/mob/living/carbon/human/human in T.contents)
 					to_chat(human, "<span class='warning'>You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")].</span>")
 					human.adjustStaminaLoss(stamdamage)
 					human.adjustToxLoss(toxdamage)
 					human.AdjustConfused(confusion, bound_lower = 0, bound_upper = maxconfusion)
-					new/obj/effect/overlay/temp/revenant(human.loc)
+					new/obj/effect/temp_visual/revenant(human.loc)
 				if(!istype(T, /turf/simulated/shuttle) && !istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15))
-					new/obj/effect/overlay/temp/revenant(T)
+					new/obj/effect/temp_visual/revenant(T)
 					T.ChangeTurf(/turf/simulated/wall/rust)
 				if(!istype(T, /turf/simulated/wall/r_wall/rust) && istype(T, /turf/simulated/wall/r_wall) && prob(15))
-					new/obj/effect/overlay/temp/revenant(T)
+					new/obj/effect/temp_visual/revenant(T)
 					T.ChangeTurf(/turf/simulated/wall/r_wall/rust)
 				for(var/obj/structure/window/window in T.contents)
 					window.hit(rand(30,80))
 					if(window && window.is_fulltile())
-						new/obj/effect/overlay/temp/revenant/cracks(window.loc)
+						new/obj/effect/temp_visual/revenant/cracks(window.loc)
 				for(var/obj/structure/closet/closet in T.contents)
 					closet.open()
 
@@ -296,26 +296,26 @@
 			spawn(0)
 				for(var/mob/living/simple_animal/bot/bot in T.contents)
 					if(!bot.emagged)
-						new/obj/effect/overlay/temp/revenant(bot.loc)
+						new/obj/effect/temp_visual/revenant(bot.loc)
 						bot.locked = 0
 						bot.open = 1
 						bot.emag_act(null)
 				for(var/mob/living/carbon/human/human in T.contents)
 					to_chat(human, "<span class='warning'>You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].</span>")
-					new/obj/effect/overlay/temp/revenant(human.loc)
+					new/obj/effect/temp_visual/revenant(human.loc)
 					human.emp_act(1)
 				for(var/obj/thing in T.contents)
 					if(istype(thing, /obj/machinery/power/apc) || istype(thing, /obj/machinery/power/smes)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery
 						continue
 					if(prob(20))
 						if(prob(50))
-							new/obj/effect/overlay/temp/revenant(thing.loc)
+							new/obj/effect/temp_visual/revenant(thing.loc)
 						thing.emag_act(null)
 					else
 						if(!istype(thing, /obj/machinery/clonepod)) //I hate everything but mostly the fact there's no better way to do this without just not affecting it at all
 							thing.emp_act(1)
 				for(var/mob/living/silicon/robot/S in T.contents) //Only works on cyborgs, not AI
 					playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1)
-					new/obj/effect/overlay/temp/revenant(S.loc)
+					new/obj/effect/temp_visual/revenant(S.loc)
 					S.spark_system.start()
 					S.emp_act(1)

code/game/gamemodes/shadowling/shadowling.dm

@@ -201,11 +201,23 @@ Made by Xhuis
 /datum/game_mode/shadowling/check_finished()
 	var/shadows_alive = 0 //and then shadowling was kill
 	for(var/datum/mind/shadow in shadows) //but what if shadowling was not kill?
-		if(!istype(shadow.current,/mob/living/carbon/human) && !istype(shadow.current,/mob/living/simple_animal/ascendant_shadowling))
+		if(!ishuman(shadow.current) && !istype(shadow.current,/mob/living/simple_animal/ascendant_shadowling))
 			continue
 		if(shadow.current.stat == DEAD)
 			continue
 		shadows_alive++
+		if(shadow.special_role == SPECIAL_ROLE_SHADOWLING && config.shadowling_max_age)
+			if(ishuman(shadow.current))
+				var/mob/living/carbon/human/H = shadow.current
+				if(H.get_species() != "Shadow")
+					for(var/obj/effect/proc_holder/spell/targeted/shadowling_hatch/hatch_ability in shadow.spell_list)
+						hatch_ability.cycles_unused++
+						if(!H.stunned && prob(20) && hatch_ability.cycles_unused > config.shadowling_max_age)
+							var/shadow_nag_messages = list("You can barely hold yourself in this lesser form!", "The urge to become something greater is overwhelming!", "You feel a burning passion to hatch free of this shell and assume godhood!")
+							H.take_overall_damage(0, 3)
+							to_chat(H, "<span class='userdanger'>[pick(shadow_nag_messages)]</span>")
+							H << 'sound/weapons/sear.ogg'
+
 	if(shadows_alive)
 		return ..()
 	else

code/game/gamemodes/shadowling/special_shadowling_abilities.dm

@@ -9,6 +9,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
 	range = -1
 	include_user = 1
 	action_icon_state = "hatch"
+	var/cycles_unused = 0
 
 /obj/effect/proc_holder/spell/targeted/shadowling_hatch/cast(list/targets, mob/user = usr)
 	if(user.stat || !ishuman(user) || !user || !is_shadow(user || isinspace(user)))
@@ -178,6 +179,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
 				sleep(50)
 				if(!ticker.mode.shadowling_ascended)
 					shuttle_master.emergency.request(null, 0.3)
+					shuttle_master.emergency.canRecall = FALSE
 				ticker.mode.shadowling_ascended = 1
 				A.mind.RemoveSpell(src)
 				qdel(H)

code/game/gamemodes/wizard/soulstone.dm

@@ -180,7 +180,7 @@
 /obj/structure/constructshell
 	name = "empty shell"
 	icon = 'icons/obj/wizard.dmi'
-	icon_state = "construct"
+	icon_state = "construct-cult"
 	desc = "A wicked machine used by those skilled in magical arts. It is inactive"
 
 /obj/structure/constructshell/examine(mob/user)

code/game/jobs/access.dm

@@ -252,7 +252,7 @@ var/const/access_trade_sol = 160
 	return list(access_syndicate, access_syndicate_leader, access_vox)
 
 /proc/get_all_misc_access()
-	return list(access_salvage_captain)
+	return list(access_salvage_captain, access_trade_sol, access_crate_cash, access_away01)
 
 /proc/get_absolutely_all_accesses()
 	return (get_all_accesses() | get_all_centcom_access() | get_all_syndicate_access() | get_all_misc_access())

code/game/machinery/computer/HolodeckControl.dm

@@ -353,30 +353,15 @@
 	// HOLOFLOOR DOES NOT GIVE A FUCK
 
 /obj/structure/table/holotable
-	name = "table"
-
-/obj/structure/table/holotable/attack_alien(mob/user as mob)
-	return attack_hand(user)
-
-/obj/structure/table/holotable/attack_animal(mob/living/simple_animal/user as mob)
-	return attack_hand(user)
-
-/obj/structure/table/holotable/attack_hand(mob/user as mob)
-	return // HOLOTABLE DOES NOT GIVE A FUCK
-
-/obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/grab))
-		return ..()
-
-	if(istype(W, /obj/item/weapon/wrench))
-		to_chat(user, "<span class='warning'>It's a holotable! There are no bolts!</span>")
-		return
+	can_deconstruct = FALSE
+	canSmoothWith = list(/obj/structure/table/holotable)
 
 /obj/structure/table/holotable/wood
-	name = "table"
+	name = "wooden table"
 	desc = "A square piece of wood standing on four wooden legs. It can not move."
-	icon = 'icons/obj/structures.dmi'
+	icon = 'icons/obj/smooth_structures/wood_table.dmi'
 	icon_state = "wood_table"
+	canSmoothWith = list(/obj/structure/table/holotable/wood)
 
 /obj/item/clothing/gloves/boxing/hologlove
 	name = "boxing gloves"
@@ -396,21 +381,7 @@
 	flags = ON_BORDER
 
 /obj/structure/rack/holorack
-	name = "rack"
-
-/obj/structure/rack/holorack/attack_alien(mob/user as mob)
-	return attack_hand(user)
-
-/obj/structure/rack/holorack/attack_animal(mob/living/simple_animal/user as mob)
-	return attack_hand(user)
-
-/obj/structure/rack/holorack/attack_hand(mob/user as mob)
-	return // HOLORACK DOES NOT GIVE A FUCK
-
-/obj/structure/rack/holorack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wrench))
-		to_chat(user, "<span class='warning'>It's a holorack! There are no bolts!</span>")
-		return
+	can_deconstruct = FALSE
 
 /obj/item/weapon/holo
 	damtype = STAMINA

code/game/machinery/computer/card.dm

@@ -194,6 +194,8 @@ var/time_last_changed_position = 0
 		return 1
 	if(!scan.assignment)
 		return 0
+	if(access_captain in scan.access)
+		return 1
 	if(!targetjob || !targetjob.title)
 		return 0
 	if(targetjob.title in get_subordinates(scan.assignment, includecivs))

code/game/machinery/computer/communications.dm

@@ -500,10 +500,13 @@
 	if(ticker.mode.name == "meteor")
 		return
 
-	shuttle_master.cancelEvac(user)
-	log_game("[key_name(user)] has recalled the shuttle.")
-	message_admins("[key_name_admin(user)] has recalled the shuttle - [formatJumpTo(user)].", 1)
-	return
+	if(shuttle_master.cancelEvac(user))
+		log_game("[key_name(user)] has recalled the shuttle.")
+		message_admins("[key_name_admin(user)] has recalled the shuttle - [ADMIN_FLW(user)].", 1)
+	else
+		to_chat(user, "<span class='warning'>Central Command has refused the recall request!</span>")
+		log_game("[key_name(user)] has tried and failed to recall the shuttle.")
+		message_admins("[key_name_admin(user)] has tried and failed to recall the shuttle - [ADMIN_FLW(user)].", 1)
 
 /proc/post_status(command, data1, data2, mob/user = null)
 

code/game/machinery/cryopod.dm

@@ -747,8 +747,9 @@
 		for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags
 			O.loc = R
 		qdel(I)
-	R.module.remove_subsystems_and_actions(R)
-	qdel(R.module)
+	if(R.module)
+		R.module.remove_subsystems_and_actions(R)
+		qdel(R.module)
 
 	return ..()
 

code/game/machinery/doors/poddoor.dm

@@ -101,6 +101,7 @@
 
 /obj/machinery/door/poddoor/multi_tile // Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell.
 	name = "large pod door"
+	layer = CLOSED_DOOR_LAYER
 
 /obj/machinery/door/poddoor/multi_tile/four_tile_ver/
 	icon = 'icons/obj/doors/1x4blast_vert.dmi'
@@ -130,4 +131,4 @@
 /obj/machinery/door/poddoor/multi_tile/two_tile_hor/
 	icon = 'icons/obj/doors/1x2blast_hor.dmi'
 	width = 2
-	dir = EAST
+	dir = EAST

code/game/machinery/machinery.dm

@@ -173,7 +173,7 @@ Class Procs:
 	if(use_power && stat == 0)
 		use_power(7500/severity)
 
-	new/obj/effect/overlay/temp/emp(loc)
+	new/obj/effect/temp_visual/emp(loc)
 	..()
 
 /obj/machinery/ex_act(severity)
@@ -404,14 +404,19 @@ Class Procs:
 	return 0
 
 /obj/machinery/deconstruct(disassembled = TRUE)
-	on_deconstruction()
-	spawn_frame()
-	for(var/obj/item/I in component_parts)
-		I.forceMove(loc)
+	if(can_deconstruct)
+		on_deconstruction()
+		if(component_parts && component_parts.len)
+			spawn_frame()
+			for(var/obj/item/I in component_parts)
+				I.forceMove(loc)
 	qdel(src)
 
-/obj/machinery/proc/spawn_frame()
+/obj/machinery/proc/spawn_frame(disassembled)
 	var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(loc)
+	if(!disassembled)
+		M.obj_integrity = M.max_integrity * 0.5 //the frame is already half broken
+	transfer_fingerprints_to(M)
 	M.state = 2
 	M.icon_state = "box_1"
 

code/game/machinery/poolcontroller.dm

@@ -1,3 +1,9 @@
+#define FRIGID		80
+#define COOL		290
+#define NORMAL		310
+#define WARM		330
+#define SCALDING	500
+
 /obj/machinery/poolcontroller
 	name = "Pool Controller"
 	desc = "A controller for the nearby pool."
@@ -6,7 +12,7 @@
 	anchored = 1 //this is what I get for assuming /obj/machinery has anchored set to 1 by default
 	var/list/linkedturfs = list() //List contains all of the linked pool turfs to this controller, assignment happens on New()
 	var/linked_area = null
-	var/temperature = "normal" //The temperature of the pool, starts off on normal, which has no effects.
+	var/temperature = NORMAL //The temperature of the pool, starts off on normal, which has no effects.
 	var/temperaturecolor = "" //used for nanoUI fancyness
 	var/srange = 5 //The range of the search for pool turfs, change this for bigger or smaller pools.
 	var/list/linkedmist = list() //Used to keep track of created mist
@@ -59,32 +65,23 @@
 				qdel(decal)
 
 /obj/machinery/poolcontroller/proc/handleTemp(var/mob/M)
-	M.water_act(100, 0, src)//leave temp at 0, we handle it in the switch.
-	if(temperature == "normal")		//This setting does nothing, so let's skip the next checks since we won't be doing jack
-		return
 	if(!M || isAIEye(M) || issilicon(M) || isobserver(M) || M.stat == DEAD)
 		return
+	M.water_act(100, temperature, src)//leave temp at 0, we handle it in the switch. oh wait
 	switch(temperature) //Apply different effects based on what the temperature is set to.
-		if("scalding") //Burn the mob.
-			M.bodytemperature = min(500, M.bodytemperature + 35) //heat mob at 35k(elvin) per cycle
+		if(SCALDING) //Burn the mob.
 			to_chat(M, "<span class='danger'>The water is searing hot!</span>")
 
-		if("warm") //Gently warm the mob.
-			M.bodytemperature = min(330, M.bodytemperature + 10) //Heats up mobs to just over normal, not enough to burn
+		if(WARM) //Warm the mob.
 			if(prob(50)) //inform the mob of warm water half the time
 				to_chat(M, "<span class='warning'>The water is quite warm.</span>")//Inform the mob it's warm water.
 
-
-		if("cool") //Gently cool the mob.
-			M.bodytemperature = max(290, M.bodytemperature - 10) //Cools mobs to just below normal, not enough to burn
+		if(COOL) //Cool the mob.
 			if(prob(50)) //inform the mob of cold water half the time
 				to_chat(M, "<span class='warning'>The water is chilly.</span>")//Inform the mob it's chilly water.
 
-
-		if("frigid") //Freeze the mob.
-			M.bodytemperature = max(80, M.bodytemperature - 35) //cool mob at -35k per cycle
+		if(FRIGID) //YOU'RE AS COLD AS ICE
 			to_chat(M, "<span class='danger'>The water is freezing!</span>")
-	return
 
 /obj/machinery/poolcontroller/proc/handleDrowning(var/mob/living/carbon/human/drownee)
 	if(!drownee)
@@ -136,8 +133,19 @@
 
 /obj/machinery/poolcontroller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
 	var/data[0]
-
-	data["currentTemp"] = temperature
+	var/currenttemp
+	switch(temperature) //So we can output nice things like "Cool" to nanoUI
+		if(FRIGID)
+			currenttemp = "frigid"
+		if(COOL)
+			currenttemp = "cool"
+		if(NORMAL)
+			currenttemp = "normal"
+		if(WARM)
+			currenttemp = "warm"
+		if(SCALDING)
+			currenttemp = "scalding"
+	data["currentTemp"] = currenttemp
 	data["emagged"] = emagged
 	data["TempColor"] = temperaturecolor
 
@@ -152,25 +160,25 @@
 		if("Scalding")
 			if(!emagged)
 				return 0
-			temperature = "scalding"
+			temperature = SCALDING
 			temperaturecolor = "#FF0000"
 			miston()
 		if("Frigid")
 			if(!emagged)
 				return 0
-			temperature = "frigid"
+			temperature = FRIGID
 			temperaturecolor = "#00CCCC"
 			mistoff()
 		if("Warm")
-			temperature = "warm"
+			temperature = WARM
 			temperaturecolor = "#990000"
 			mistoff()
 		if("Cool")
-			temperature = "cool"
+			temperature = COOL
 			temperaturecolor = "#009999"
 			mistoff()
 		if("Normal")
-			temperature = "normal"
+			temperature = NORMAL
 			temperaturecolor = ""
 			mistoff()
 
@@ -201,3 +209,9 @@
 			animate(decal, alpha = 10, time = 20)
 			spawn(25)
 				qdel(decal)
+
+#undef FRIGID
+#undef COOL
+#undef NORMAL
+#undef WARM
+#undef SCALDING

code/game/machinery/vending.dm

@@ -980,7 +980,7 @@
 						/obj/item/seeds/chili = 3, /obj/item/seeds/cocoapod = 3, /obj/item/seeds/coffee = 3, /obj/item/seeds/comfrey =3, /obj/item/seeds/corn = 3,
 						/obj/item/seeds/nymph =3, /obj/item/seeds/eggplant = 3, /obj/item/seeds/grape = 3, /obj/item/seeds/grass = 3, /obj/item/seeds/lemon = 3,
 						/obj/item/seeds/lime = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, /obj/item/seeds/peanuts = 3, /obj/item/seeds/pineapple = 3, /obj/item/seeds/potato = 3, /obj/item/seeds/poppy = 3,
-						/obj/item/seeds/pumpkin = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/wheat/rice = 3, /obj/item/seeds/soya = 3, /obj/item/seeds/sunflower = 3,
+						/obj/item/seeds/pumpkin = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/wheat/rice = 3, /obj/item/seeds/soya = 3, /obj/item/seeds/sunflower = 3, /obj/item/seeds/sugarcane = 3,
 						/obj/item/seeds/tea = 3, /obj/item/seeds/tobacco = 3, /obj/item/seeds/tomato = 3,
 						/obj/item/seeds/tower = 3, /obj/item/seeds/watermelon = 3, /obj/item/seeds/wheat = 3, /obj/item/seeds/whitebeet = 3)
 	contraband = list(/obj/item/seeds/amanita = 2, /obj/item/seeds/glowshroom = 2, /obj/item/seeds/liberty = 2, /obj/item/seeds/nettle = 2,

code/game/objects/effects/decals/Cleanable/aliens.dm

@@ -6,6 +6,10 @@
 	bloodiness = MAX_SHOE_BLOODINESS
 	blood_state = BLOOD_STATE_XENO
 
+/obj/effect/decal/cleanable/blood/xeno/splatter
+	random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
+	amount = 2
+
 /obj/effect/decal/cleanable/blood/gibs/xeno
 	name = "xeno gibs"
 	desc = "Gnarly..."

code/game/objects/effects/decals/Cleanable/robots.dm

@@ -58,4 +58,4 @@
 
 /obj/effect/decal/cleanable/blood/oil/streak
 	random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
-	amount = 2
+	amount = 2

code/game/objects/effects/overlays.dm

@@ -10,14 +10,14 @@
 	return
 
 /obj/effect/overlay/beam//Not actually a projectile, just an effect.
-	name="beam"
-	icon='icons/effects/beam.dmi'
-	icon_state="b_beam"
+	name = "beam"
+	icon = 'icons/effects/beam.dmi'
+	icon_state = "b_beam"
 	var/tmp/atom/BeamSource
-	New()
-		..()
-		spawn(10)
-			qdel(src)
+
+/obj/effect/overlay/beam/New()
+	..()
+	QDEL_IN(src, 10)
 
 /obj/effect/overlay/palmtree_r
 	name = "Palm tree"
@@ -46,168 +46,6 @@
 	icon_state = "admin"
 	layer = 4.1
 
-/obj/effect/overlay/temp
-	anchored = 1
-	layer = 4.1
-	mouse_opacity = 0
-	var/duration = 10
-	var/randomdir = 1
-
-/obj/effect/overlay/temp/New()
-	if(randomdir)
-		dir = pick(cardinal)
-
-	flick("[icon_state]", src) //Because we might be pulling it from a pool, flick whatever icon it uses so it starts at the start of the icon's animation.
-
-	spawn(duration)
-		qdel(src)
-
-/obj/effect/overlay/temp/revenant
-	name = "spooky lights"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "purplesparkles"
-
-/obj/effect/overlay/temp/revenant/cracks
-	name = "glowing cracks"
-	icon_state = "purplecrack"
-	duration = 6
-
-/obj/effect/overlay/temp/guardian
-	randomdir = 0
-
-/obj/effect/overlay/temp/guardian/phase
-	duration = 5
-	icon_state = "phasein"
-
-/obj/effect/overlay/temp/guardian/phase/out
-	icon_state = "phaseout"
-
-/obj/effect/overlay/temp/emp
-	name = "emp sparks"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "empdisable"
-
-/obj/effect/overlay/temp/emp/pulse
-	name = "emp pulse"
-	icon_state = "emppulse"
-	duration = 8
-	randomdir = 0
-
-/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
-	name = "healing glow"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "heal"
-	duration = 15
-
-/obj/effect/overlay/temp/heal/New(loc, colour)
-	..()
-	pixel_x = rand(-12, 12)
-	pixel_y = rand(-9, 0)
-	if(colour)
-		color = colour
-
-/obj/effect/overlay/temp/kinetic_blast
-	name = "kinetic explosion"
-	icon = 'icons/obj/projectiles.dmi'
-	icon_state = "kinetic_blast"
-	layer = 4.1
-	duration = 4
-
-/obj/effect/overlay/temp/explosion
-	name = "explosion"
-	icon = 'icons/effects/96x96.dmi'
-	icon_state = "explosion"
-	pixel_x = -32
-	pixel_y = -32
-	duration = 8
-
-/obj/effect/overlay/temp/explosion/fast
-	icon_state = "explosionfast"
-	duration = 4
-
-/obj/effect/overlay/temp/decoy
-	desc = "It's a decoy!"
-	duration = 15
-
-/obj/effect/overlay/temp/decoy/New(loc, atom/mimiced_atom)
-	..()
-	alpha = initial(alpha)
-	if(mimiced_atom)
-		name = mimiced_atom.name
-		appearance = mimiced_atom.appearance
-		dir = mimiced_atom.dir
-		mouse_opacity = 0
-
-/obj/effect/overlay/temp/decoy/fading/New(loc, atom/mimiced_atom)
-	..()
-	animate(src, alpha = 0, time = duration)
-
-/obj/effect/overlay/temp/cult
-	icon = 'icons/effects/effects.dmi'
-	randomdir = 0
-	duration = 10
-
-/obj/effect/overlay/temp/cult/sparks
-	randomdir = 1
-	name = "blood sparks"
-	icon_state = "bloodsparkles"
-
-/obj/effect/overlay/temp/dir_setting
-	randomdir = FALSE
-
-/obj/effect/overlay/temp/dir_setting/New(loc, set_dir)
-	if(set_dir)
-		setDir(set_dir)
-	..()
-
-/obj/effect/overlay/temp/dir_setting/bloodsplatter
-	icon = 'icons/effects/blood.dmi'
-	duration = 5
-	randomdir = FALSE
-	layer = MOB_LAYER - 0.1
-	color = "#C80000"
-	var/splatter_type = "splatter"
-
-/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir, blood_color)
-	if(blood_color)
-		color = blood_color
-	if(set_dir in diagonals)
-		icon_state = "[splatter_type][pick(1, 2, 6)]"
-	else
-		icon_state = "[splatter_type][pick(3, 4, 5)]"
-	..()
-	var/target_pixel_x = 0
-	var/target_pixel_y = 0
-	switch(set_dir)
-		if(NORTH)
-			target_pixel_y = 16
-		if(SOUTH)
-			target_pixel_y = -16
-			layer = MOB_LAYER + 0.1
-		if(EAST)
-			target_pixel_x = 16
-		if(WEST)
-			target_pixel_x = -16
-		if(NORTHEAST)
-			target_pixel_x = 16
-			target_pixel_y = 16
-		if(NORTHWEST)
-			target_pixel_x = -16
-			target_pixel_y = 16
-		if(SOUTHEAST)
-			target_pixel_x = 16
-			target_pixel_y = -16
-			layer = MOB_LAYER + 0.1
-		if(SOUTHWEST)
-			target_pixel_x = -16
-			target_pixel_y = -16
-			layer = MOB_LAYER + 0.1
-	animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)
-
-/obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter
-	color = null
-	splatter_type = "xsplatter"
-
 /obj/effect/overlay/wall_rot
 	name = "Wallrot"
 	desc = "Ick..."
@@ -221,68 +59,3 @@
 	..()
 	pixel_x += rand(-10, 10)
 	pixel_y += rand(-10, 10)
-/obj/effect/overlay/temp/cult
-	randomdir = 0
-	duration = 10
-
-
-	icon = 'icons/effects/effects.dmi'
-
-/obj/effect/overlay/temp/cult/sparks
-	randomdir = 1
-	name = "blood sparks"
-	icon_state = "bloodsparkles"
-
-/obj/effect/overlay/temp/cult/phase
-	name = "phase glow"
-	duration = 7
-	icon_state = "cultin"
-
-/obj/effect/overlay/temp/cult/phase/New(loc, set_dir)
-	..()
-	if(set_dir)
-		dir = set_dir
-
-/obj/effect/overlay/temp/cult/phase/out
-	icon_state = "cultout"
-
-/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
-	name = "healing glow"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "heal"
-	duration = 15
-
-/obj/effect/overlay/temp/heal/New(loc, colour)
-	..()
-	pixel_x = rand(-12, 12)
-	pixel_y = rand(-9, 0)
-	if(colour)
-		color = colour
-
-/obj/effect/overlay/temp/cult/sac
-	name = "maw of Nar-Sie"
-	icon_state = "sacconsume"
-
-/obj/effect/overlay/temp/cult/door
-	name = "unholy glow"
-	icon_state = "doorglow"
-	layer = 3.17 //above closed doors
-
-/obj/effect/overlay/temp/cult/door/unruned
-	icon_state = "unruneddoorglow"
-
-/obj/effect/overlay/temp/cult/turf
-	name = "unholy glow"
-	icon_state = "wallglow"
-	layer = TURF_LAYER + 0.07
-
-/obj/effect/overlay/temp/cult/turf/open/floor
-	icon_state = "floorglow"
-	duration = 5
-
-/obj/effect/overlay/temp/shieldflash
-	icon_state = "shield-flash"
-	duration = 3
-
-/obj/effect/overlay/temp/shieldflash/New(var/flash_color)
-

code/game/objects/effects/temporary_visuals/cult.dm

@@ -0,0 +1,40 @@
+//temporary visual effects(/obj/effect/temp_visual) used by cult stuff
+/obj/effect/temp_visual/cult
+	icon = 'icons/effects/cult_effects.dmi'
+	randomdir = FALSE
+	duration = 10
+
+/obj/effect/temp_visual/cult/sparks
+	randomdir = TRUE
+	name = "blood sparks"
+	icon_state = "bloodsparkles"
+
+/obj/effect/temp_visual/dir_setting/cult/phase
+	name = "phase glow"
+	duration = 7
+	icon = 'icons/effects/cult_effects.dmi'
+	icon_state = "cultin"
+
+/obj/effect/temp_visual/dir_setting/cult/phase/out
+	icon_state = "cultout"
+
+/obj/effect/temp_visual/cult/sac
+	name = "maw of Nar-Sie"
+	icon_state = "sacconsume"
+
+/obj/effect/temp_visual/cult/door
+	name = "unholy glow"
+	icon_state = "doorglow"
+	layer = 3.17 //above closed doors
+
+/obj/effect/temp_visual/cult/door/unruned
+	icon_state = "unruneddoorglow"
+
+/obj/effect/temp_visual/cult/turf
+	name = "unholy glow"
+	icon_state = "wallglow"
+	layer = TURF_LAYER + 0.07
+
+/obj/effect/temp_visual/cult/turf/open/floor
+	icon_state = "floorglow"
+	duration = 5

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -0,0 +1,204 @@
+/obj/effect/temp_visual/dir_setting/bloodsplatter
+	icon = 'icons/effects/blood.dmi'
+	duration = 5
+	randomdir = FALSE
+	layer = MOB_LAYER - 0.1
+	color = "#C80000"
+	var/splatter_type = "splatter"
+
+/obj/effect/temp_visual/dir_setting/bloodsplatter/New(loc, set_dir, blood_color)
+	if(blood_color)
+		color = blood_color
+	if(set_dir in diagonals)
+		icon_state = "[splatter_type][pick(1, 2, 6)]"
+	else
+		icon_state = "[splatter_type][pick(3, 4, 5)]"
+	..()
+	var/target_pixel_x = 0
+	var/target_pixel_y = 0
+	switch(set_dir)
+		if(NORTH)
+			target_pixel_y = 16
+		if(SOUTH)
+			target_pixel_y = -16
+			layer = MOB_LAYER + 0.1
+		if(EAST)
+			target_pixel_x = 16
+		if(WEST)
+			target_pixel_x = -16
+		if(NORTHEAST)
+			target_pixel_x = 16
+			target_pixel_y = 16
+		if(NORTHWEST)
+			target_pixel_x = -16
+			target_pixel_y = 16
+		if(SOUTHEAST)
+			target_pixel_x = 16
+			target_pixel_y = -16
+			layer = MOB_LAYER + 0.1
+		if(SOUTHWEST)
+			target_pixel_x = -16
+			target_pixel_y = -16
+			layer = MOB_LAYER + 0.1
+	animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)
+
+/obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter
+	color = null
+	splatter_type = "xsplatter"
+
+/obj/effect/temp_visual/dir_setting/speedbike_trail
+	name = "speedbike trails"
+	icon_state = "ion_fade"
+	duration = 10
+	randomdir = FALSE
+	layer = MOB_LAYER - 0.2
+
+/obj/effect/temp_visual/dir_setting/ninja
+	name = "ninja shadow"
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "uncloak"
+	duration = 9
+
+/obj/effect/temp_visual/dir_setting/ninja/cloak
+	icon_state = "cloak"
+
+/obj/effect/temp_visual/dir_setting/ninja/shadow
+	icon_state = "shadow"
+
+/obj/effect/temp_visual/dir_setting/ninja/phase
+	name = "ninja energy"
+	icon_state = "phasein"
+
+/obj/effect/temp_visual/dir_setting/ninja/phase/out
+	icon_state = "phaseout"
+
+/obj/effect/temp_visual/dir_setting/wraith
+	name = "blood"
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "phase_shift2"
+	duration = 12
+
+/obj/effect/temp_visual/dir_setting/wraith/out
+	icon_state = "phase_shift"
+
+/obj/effect/temp_visual/wizard
+	name = "water"
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "reappear"
+	duration = 5
+
+/obj/effect/temp_visual/wizard/out
+	icon_state = "liquify"
+	duration = 12
+
+/obj/effect/temp_visual/monkeyify
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "h2monkey"
+	duration = 22
+
+/obj/effect/temp_visual/monkeyify/humanify
+	icon_state = "monkey2h"
+
+/obj/effect/temp_visual/borgflash
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "blspell"
+	duration = 5
+
+/obj/effect/temp_visual/guardian
+	randomdir = FALSE
+
+/obj/effect/temp_visual/guardian/phase
+	duration = 5
+	icon_state = "phasein"
+
+/obj/effect/temp_visual/guardian/phase/out
+	icon_state = "phaseout"
+
+/obj/effect/temp_visual/decoy
+	desc = "It's a decoy!"
+	duration = 15
+
+/obj/effect/temp_visual/decoy/New(loc, atom/mimiced_atom)
+	..()
+	alpha = initial(alpha)
+	if(mimiced_atom)
+		name = mimiced_atom.name
+		appearance = mimiced_atom.appearance
+		setDir(mimiced_atom.dir)
+		mouse_opacity = 0
+
+/obj/effect/temp_visual/decoy/fading/New(loc, atom/mimiced_atom)
+	..()
+	animate(src, alpha = 0, time = duration)
+
+/obj/effect/temp_visual/revenant
+	name = "spooky lights"
+	icon_state = "purplesparkles"
+
+/obj/effect/temp_visual/revenant/cracks
+	name = "glowing cracks"
+	icon_state = "purplecrack"
+	duration = 6
+
+/obj/effect/temp_visual/gravpush
+	name = "gravity wave"
+	icon_state = "shieldsparkles"
+	duration = 5
+
+/obj/effect/temp_visual/telekinesis
+	name = "telekinetic force"
+	icon_state = "empdisable"
+	duration = 5
+
+/obj/effect/temp_visual/emp
+	name = "emp sparks"
+	icon_state = "empdisable"
+
+/obj/effect/temp_visual/emp/pulse
+	name = "emp pulse"
+	icon_state = "emppulse"
+	duration = 8
+	randomdir = FALSE
+
+/obj/effect/temp_visual/heal //color is white by default, set to whatever is needed
+	name = "healing glow"
+	icon_state = "heal"
+	duration = 15
+
+/obj/effect/temp_visual/heal/New(loc, colour)
+	..()
+	pixel_x = rand(-12, 12)
+	pixel_y = rand(-9, 0)
+	if(colour)
+		color = colour
+
+/obj/effect/temp_visual/kinetic_blast
+	name = "kinetic explosion"
+	icon = 'icons/obj/projectiles.dmi'
+	icon_state = "kinetic_blast"
+	layer = ABOVE_MOB_LAYER
+	duration = 4
+
+/obj/effect/temp_visual/explosion
+	name = "explosion"
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "explosion"
+	pixel_x = -32
+	pixel_y = -32
+	duration = 8
+
+/obj/effect/temp_visual/explosion/fast
+	icon_state = "explosionfast"
+	duration = 4
+
+/obj/effect/temp_visual/heart
+	name = "heart"
+	icon = 'icons/mob/animal.dmi'
+	icon_state = "heart"
+	duration = 25
+
+/obj/effect/temp_visual/heart/New(loc)
+	..()
+	pixel_x = rand(-4,4)
+	pixel_y = rand(-4,4)
+	animate(src, pixel_y = pixel_y + 32, alpha = 0, time = 25)

code/game/objects/effects/temporary_visuals/temporary_visual.dm

@@ -0,0 +1,30 @@
+//temporary visual effects
+/obj/effect/temp_visual
+	anchored = 1
+	layer = ABOVE_MOB_LAYER
+	mouse_opacity = 0
+	var/duration = 10
+	var/randomdir = TRUE
+
+/obj/effect/temp_visual/New()
+	if(randomdir)
+		setDir(pick(cardinal))
+
+	QDEL_IN(src, duration)
+
+/obj/effect/temp_visual/singularity_act()
+	return
+
+/obj/effect/temp_visual/singularity_pull()
+	return
+
+/obj/effect/temp_visual/ex_act()
+	return
+
+/obj/effect/temp_visual/dir_setting
+	randomdir = FALSE
+
+/obj/effect/temp_visual/dir_setting/New(loc, set_dir)
+	if(set_dir)
+		setDir(set_dir)
+	..()

code/game/objects/empulse.dm

@@ -9,7 +9,7 @@
 		log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
 
 	if(heavy_range > 1)
-		new/obj/effect/overlay/temp/emp/pulse(epicenter)
+		new/obj/effect/temp_visual/emp/pulse(epicenter)
 
 	if(heavy_range > light_range)
 		light_range = heavy_range

code/game/objects/items/devices/flash.dm

@@ -179,21 +179,11 @@
 
 /obj/item/device/flash/cyborg/attack(mob/living/M, mob/user)
 	..()
-	cyborg_flash_animation(user)
+	new /obj/effect/temp_visual/borgflash(get_turf(src))
 
 /obj/item/device/flash/cyborg/attack_self(mob/user)
 	..()
-	cyborg_flash_animation(user)
-
-/obj/item/device/flash/cyborg/proc/cyborg_flash_animation(var/mob/living/user)
-	var/atom/movable/overlay/animation = new(user.loc)
-	animation.layer = user.layer + 1
-	animation.icon_state = "blank"
-	animation.icon = 'icons/mob/mob.dmi'
-	animation.master = user
-	flick("blspell", animation)
-	sleep(5)
-	qdel(animation)
+	new /obj/effect/temp_visual/borgflash(get_turf(src))
 
 /obj/item/device/flash/memorizer
 	name = "memorizer"

code/game/objects/items/stacks/rods.dm

@@ -1,5 +1,6 @@
 var/global/list/datum/stack_recipe/rod_recipes = list ( \
 	new/datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \
 	)
 
 /obj/item/stack/rods

code/game/objects/items/stacks/sheets/mineral.dm

@@ -96,7 +96,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 var/global/list/datum/stack_recipe/abductor_recipes = list ( \
 	new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("alien table frame", /obj/structure/abductor_tableframe, 1, time = 15, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \
 	)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -1,12 +1,13 @@
-/* Diffrent misc types of sheets
+/* Different misc types of sheets
  * Contains:
- *		Metal
- *		Plasteel
- *		Wood
- *		Cloth
- *		Plastic
- *		Cardboard
- *		Runed Metal (cult)
+ * Metal
+ * Plasteel
+ * Wood
+ * Cloth
+ * Plastic
+ * Cardboard
+ * Runed Metal (cult)
+ * Brass (clockwork cult)
  */
 
 /*
@@ -42,8 +43,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	)),
 
 	null,
-	new /datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2),
-	new /datum/stack_recipe("glass table frame parts", /obj/item/weapon/table_parts/glass, 2),
 	new /datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts),
 	new /datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1, on_floor = 1),
 	null,
@@ -109,10 +108,13 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 /obj/item/stack/sheet/metal/fifty
 	amount = 50
 
+/obj/item/stack/sheet/metal/ratvar_act()
+	new /obj/item/stack/tile/brass(loc, amount)
+	qdel(src)
+
 /obj/item/stack/sheet/metal/narsie_act()
-	if(prob(20))
-		new /obj/item/stack/sheet/runed_metal(loc, amount)
-		qdel(src)
+	new /obj/item/stack/sheet/runed_metal(loc, amount)
+	qdel(src)
 
 /obj/item/stack/sheet/metal/New(var/loc, var/amount=null)
 	recipes = metal_recipes
@@ -156,7 +158,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
 var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1),
 	new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20),
-	new /datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2),
+	new /datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
 	new /datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1),
@@ -275,12 +277,15 @@ var/global/list/datum/stack_recipe/cult = list ( \
 /obj/item/stack/sheet/runed_metal
 	name = "runed metal"
 	desc = "Sheets of cold metal with shifting inscriptions writ upon them."
-	singular_name = "runed metal"
+	singular_name = "runed metal sheet"
 	icon_state = "sheet-runed"
-	icon = 'icons/obj/items.dmi'
 	sheettype = "runed"
 	merge_type = /obj/item/stack/sheet/runed_metal
 
+/obj/item/stack/sheet/runed_metal/ratvar_act()
+	new /obj/item/stack/tile/brass(loc, amount)
+	qdel(src)
+
 /obj/item/stack/sheet/runed_metal/attack_self(mob/living/user)
 	if(!iscultist(user))
 		to_chat(user, "<span class='warning'>Only one with forbidden knowledge could hope to work this metal...</span>")
@@ -308,6 +313,39 @@ var/global/list/datum/stack_recipe/cult = list ( \
 	recipes = cult
 	return ..()
 
+/*
+ * Brass
+ */
+var/global/list/datum/stack_recipe/brass_recipes = list ( \
+	new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \
+	)
+
+/obj/item/stack/tile/brass
+	name = "brass"
+	desc = "Sheets made out of brass."
+	singular_name = "brass sheet"
+	icon_state = "sheet-brass"
+	icon = 'icons/obj/items.dmi'
+	burn_state = FIRE_PROOF
+	throwforce = 10
+	max_amount = 50
+	throw_speed = 1
+	throw_range = 3
+	turf_type = /turf/simulated/floor/clockwork
+
+/obj/item/stack/tile/brass/narsie_act()
+	new /obj/item/stack/sheet/runed_metal(loc, amount)
+	qdel(src)
+
+/obj/item/stack/tile/brass/New(loc, amount=null)
+	recipes = brass_recipes
+	. = ..()
+	pixel_x = 0
+	pixel_y = 0
+
+/obj/item/stack/tile/brass/fifty
+	amount = 50
+
 /*
  * Bones
  */

code/game/objects/items/toys.dm

@@ -114,6 +114,14 @@
 	icon_state = "syndballoon"
 	item_state = "syndballoon"
 	w_class = WEIGHT_CLASS_BULKY
+	var/lastused = null
+
+/obj/item/toy/syndicateballoon/attack_self(mob/user)
+	if(world.time - lastused < CLICK_CD_MELEE)
+		return
+	var/playverb = pick("bat [src]", "tug on [src]'s string", "play with [src]")
+	user.visible_message("<span class='notice'>[user] plays with [src].</span>", "<span class='notice'>You [playverb].</span>")
+	lastused = world.time
 
 /*
  * Fake telebeacon

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -3,12 +3,18 @@
 	icon_state = "flashbang"
 	item_state = "flashbang"
 	origin_tech = "materials=2;combat=3"
+	light_power = 10
+	light_color = LIGHT_COLOR_WHITE
+	var/light_time = 2
 
 /obj/item/weapon/grenade/flashbang/prime()
 	update_mob()
 	var/flashbang_turf = get_turf(src)
 	if(!flashbang_turf)
 		return
+
+	set_light(7)
+
 	for(var/mob/living/M in hearers(7, flashbang_turf))
 		bang(get_turf(M), M)
 
@@ -16,7 +22,9 @@
 		var/damage = round(30/(get_dist(B,get_turf(src))+1))
 		B.health -= damage
 		B.update_icon()
-	qdel(src)
+
+	spawn(light_time)
+		qdel(src)
 
 /obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M)
 	M.show_message("<span class='warning'>BANG</span>", 2)

code/game/objects/items/weapons/powerfist.dm

@@ -85,7 +85,7 @@
 	target.apply_damage(force * fisto_setting, BRUTE)
 	target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as they punch [target.name]!</span>", \
 		"<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
-	new /obj/effect/overlay/temp/kinetic_blast(target.loc)
+	new /obj/effect/temp_visual/kinetic_blast(target.loc)
 	playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
 	playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
 

code/game/objects/items/weapons/storage/firstaid.dm

@@ -165,12 +165,12 @@
 /obj/item/weapon/storage/firstaid/tactical/New()
 	..()
 	if(empty) return
-	new /obj/item/clothing/accessory/stethoscope( src )
-	new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
 	new /obj/item/weapon/reagent_containers/hypospray/combat(src)
-	new /obj/item/weapon/reagent_containers/food/pill/patch/styptic(src)
-	new /obj/item/weapon/reagent_containers/food/pill/patch/silver_sulf(src)
-	new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
+	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh(src) // Because you ain't got no time to look at what damage dey taking yo
+	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh(src)
+	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh(src)
+	new /obj/item/weapon/reagent_containers/food/pill/patch/synthflesh(src)
+	new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
 	new /obj/item/clothing/glasses/hud/health/night(src)
 	return
 

code/game/objects/items/weapons/table_rack_parts.dm

@@ -1,133 +0,0 @@
-/* Table parts and rack parts
- * Contains:
- *		Table Parts
- *		Reinforced Table Parts
- *		Wooden Table Parts
- *		Rack Parts
- */
-
-/obj/item/weapon/table_parts
-	name = "table parts"
-	desc = "Parts of a table. Poor table."
-	gender = PLURAL
-	icon = 'icons/obj/items.dmi'
-	icon_state = "table_parts"
-	materials = list(MAT_METAL=4000)
-	flags = CONDUCT
-	attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	var/upgradable = 1
-	var/result = /obj/structure/table
-	var/parts = list(
-		/obj/item/stack/sheet/metal,
-		/obj/item/stack/sheet/metal)
-
-/obj/item/weapon/table_parts/reinforced
-	name = "reinforced table parts"
-	desc = "Hard table parts. Well...harder..."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "reinf_tableparts"
-	materials = list(MAT_METAL=8000)
-	flags = CONDUCT
-	upgradable = 0
-	result = /obj/structure/table/reinforced
-	parts = list(
-		/obj/item/stack/sheet/metal,
-		/obj/item/stack/rods)
-
-/obj/item/weapon/table_parts/wood
-	name = "wooden table parts"
-	desc = "Keep away from fire."
-	icon_state = "wood_tableparts"
-	flags = null
-	upgradable = 0
-	burn_state = FLAMMABLE
-	result = /obj/structure/table/woodentable
-	parts = list(
-		/obj/item/stack/sheet/wood,
-		/obj/item/stack/sheet/wood)
-
-/obj/item/weapon/table_parts/wood/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/stack/tile/carpet))
-		var/target = /obj/item/weapon/table_parts/fancy
-		if(istype(W, /obj/item/stack/tile/carpet/black))
-			target = /obj/item/weapon/table_parts/fancy/black
-		var/obj/item/stack/S = W
-		if(S.use(1))
-			new target(get_turf(src))
-			qdel(src)
-	else
-		. = ..()
-
-/obj/item/weapon/table_parts/glass
-	name = "glass table parts"
-	desc = "fragile!"
-	icon_state = "glass_tableparts"
-	flags = null
-	upgradable = 0
-	result = /obj/structure/glasstable_frame
-	parts = list(
-		/obj/item/stack/sheet/metal,
-		/obj/item/stack/sheet/metal)
-
-/obj/item/weapon/table_parts/fancy
-	name = "fancy table parts"
-	desc = "Pretty!"
-	icon_state = "fancy_tableparts"
-	result = /obj/structure/table/wood/fancy
-
-/obj/item/weapon/table_parts/fancy/black
-	name = "black fancy table parts"
-	icon_state = "black_fancy_tableparts"
-	result = /obj/structure/table/wood/fancy/black
-
-/obj/item/weapon/rack_parts
-	name = "rack parts"
-	desc = "Parts of a rack."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "rack_parts"
-	flags = CONDUCT
-	materials = list(MAT_METAL=2000)
-
-/*
- * Table Parts
- */
-/obj/item/weapon/table_parts/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	..()
-	if(istype(W, /obj/item/weapon/wrench))
-		for(var/p in parts)
-			new p(user.loc)
-		qdel(src)
-	else if(upgradable && istype(W, /obj/item/stack/rods))
-		var/obj/item/stack/rods/R = W
-		if(R.amount >= 4)
-			new /obj/item/weapon/table_parts/reinforced(user.loc)
-			to_chat(user, "<span class=notice>You reinforce the [name].</span>")
-			R.use(4)
-			qdel(src)
-		else
-			to_chat(user, "<span class=warning>You need at least four rods to do this.</span>")
-
-/obj/item/weapon/table_parts/attack_self(mob/user as mob)
-	for(var/obj/structure/table/T in user.loc)
-		to_chat(user, "<span class=warning>You can't build tables on top of tables!</span>")
-		return
-	if(do_after(user, 20, target = loc))
-		new result(user.loc)
-		user.drop_item()
-		qdel(src)
-
-/*
- * Rack Parts
- */
-/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	..()
-	if(istype(W, /obj/item/weapon/wrench))
-		new /obj/item/stack/sheet/metal(user.loc)
-		qdel(src)
-
-/obj/item/weapon/rack_parts/attack_self(mob/user as mob)
-	if(do_after(user, 20, target = loc))
-		var/obj/structure/rack/R = new /obj/structure/rack(user.loc)
-		R.add_fingerprint(user)
-		user.drop_item()
-		qdel(src)

code/game/objects/structures/misc.dm

@@ -46,8 +46,7 @@
 
 					playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)
 					playsound(user.loc, 'sound/effects/sparks2.ogg', 50, 1)
-					anim(user.loc,user,'icons/mob/mob.dmi',,"phasein",,user.dir)
-
+					new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(user), user.dir)
 					to_chat(user, "<span class='boldnotice'>VOID-Shift</span> translocation successful")
 
 				if("No")

code/game/objects/structures/table_frames.dm

@@ -0,0 +1,151 @@
+/* Table Frames
+ * Contains:
+ *		Frames
+ *		Wooden Frames
+ */
+
+
+/*
+ * Normal Frames
+ */
+
+/obj/structure/table_frame
+	name = "table frame"
+	desc = "Four metal legs with four framing rods for a table. You could easily pass through this."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "table_frame"
+	density = FALSE
+	anchored = FALSE
+	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+	max_integrity = 100
+	var/framestack = /obj/item/stack/rods
+	var/framestackamount = 2
+
+/obj/structure/table_frame/attackby(obj/item/I, mob/user, params)
+	if(iswrench(I))
+		to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
+		playsound(loc, I.usesound, 50, 1)
+		if(do_after(user, 30*I.toolspeed, target = src))
+			playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
+			deconstruct(TRUE)
+	else if(istype(I, /obj/item/stack/sheet/plasteel))
+		var/obj/item/stack/sheet/plasteel/P = I
+		if(P.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one plasteel sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [P] to [src]...</span>")
+		if(do_after(user, 50, target = src) && P.use(1))
+			make_new_table(/obj/structure/table/reinforced)
+	else if(istype(I, /obj/item/stack/sheet/metal))
+		var/obj/item/stack/sheet/metal/M = I
+		if(M.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one metal sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [M] to [src]...</span>")
+		if(do_after(user, 20, target = src) && M.use(1))
+			make_new_table(/obj/structure/table)
+	else if(istype(I, /obj/item/stack/sheet/glass))
+		var/obj/item/stack/sheet/glass/G = I
+		if(G.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one glass sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [G] to [src]...</span>")
+		if(do_after(user, 20, target = src) && G.use(1))
+			make_new_table(/obj/structure/table/glass)
+	else if(istype(I, /obj/item/stack/tile/carpet/black))
+		var/obj/item/stack/tile/carpet/black/C = I
+		if(C.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one black carpet sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [C] to [src]...</span>")
+		if(do_after(user, 20, target = src) && C.use(1))
+			make_new_table(/obj/structure/table/wood/fancy/black)
+	else if(istype(I, /obj/item/stack/tile/carpet))
+		var/obj/item/stack/tile/carpet/C = I
+		if(C.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one carpet sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [C] to [src]...</span>")
+		if(do_after(user, 20, target = src) && C.use(1))
+			make_new_table(/obj/structure/table/wood/fancy)
+	else
+		return ..()
+
+/obj/structure/table_frame/proc/make_new_table(table_type) //makes sure the new table made retains what we had as a frame
+	var/obj/structure/table/T = new table_type(loc)
+	T.frame = type
+	T.framestack = framestack
+	T.framestackamount = framestackamount
+	qdel(src)
+
+/obj/structure/table_frame/deconstruct(disassembled = TRUE)
+	new framestack(get_turf(src), framestackamount)
+	qdel(src)
+
+/obj/structure/table_frame/narsie_act()
+	new /obj/structure/table_frame/wood(loc)
+	qdel(src)
+
+/obj/structure/table_frame/ratvar_act()
+	new /obj/structure/table_frame/brass(loc)
+	qdel(src)
+
+/*
+ * Wooden Frames
+ */
+
+/obj/structure/table_frame/wood
+	name = "wooden table frame"
+	desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this."
+	icon_state = "wood_frame"
+	framestack = /obj/item/stack/sheet/wood
+	framestackamount = 2
+	burn_state = FLAMMABLE
+
+/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/stack/sheet/wood))
+		var/obj/item/stack/sheet/wood/W = I
+		if(W.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one wood sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [W] to [src]...</span>")
+		if(do_after(user, 20, target = src) && W.use(1))
+			make_new_table(/obj/structure/table/wood)
+		return
+	else if(istype(I, /obj/item/stack/tile/carpet))
+		var/obj/item/stack/tile/carpet/C = I
+		if(C.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one carpet sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [C] to [src]...</span>")
+		if(do_after(user, 20, target = src) && C.use(1))
+			make_new_table(/obj/structure/table/wood/poker)
+	else
+		return ..()
+
+/obj/structure/table_frame/brass
+	name = "brass table frame"
+	desc = "Four pieces of brass arranged in a square. It's slightly warm to the touch."
+	icon_state = "brass_frame"
+	burn_state = FIRE_PROOF
+	framestack = /obj/item/stack/tile/brass
+	framestackamount = 1
+
+/obj/structure/table_frame/brass/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/stack/tile/brass))
+		var/obj/item/stack/tile/brass/W = I
+		if(W.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one brass sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [W] to [src]...</span>")
+		if(do_after(user, 20, target = src) && W.use(1))
+			make_new_table(/obj/structure/table/reinforced/brass)
+	else
+		return ..()
+
+/obj/structure/table_frame/brass/narsie_act()
+	..()
+	if(src) //do we still exist?
+		var/previouscolor = color
+		color = "#960000"
+		animate(src, color = previouscolor, time = 8)

code/game/objects/structures/tables_racks.dm

@@ -1,49 +1,51 @@
 /* Tables and Racks
  * Contains:
  *		Tables
- *		Wooden tables
- *		Reinforced tables
+ *		Glass Tables
+ *		Wooden Tables
+ *		Reinforced Tables
  *		Racks
+ *		Rack Parts
  */
 
-
 /*
  * Tables
  */
+
 /obj/structure/table
 	name = "table"
 	desc = "A square piece of metal standing on four metal legs. It can not move."
 	icon = 'icons/obj/smooth_structures/table.dmi'
 	icon_state = "table"
-	density = 1
-	anchored = 1.0
-	layer = 2.8
+	density = TRUE
+	anchored = TRUE
+	layer = TABLE_LAYER
 	pass_flags = LETPASSTHROW
-	climbable = 1
-
-	var/parts = /obj/item/weapon/table_parts
-	var/flipped = 0
-	var/health = 100
-	var/busy = 0
+	climbable = TRUE
+	max_integrity = 100
+	integrity_failure = 30
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced)
+	var/frame = /obj/structure/table_frame
+	var/framestack = /obj/item/stack/rods
+	var/buildstack = /obj/item/stack/sheet/metal
+	var/busy = FALSE
+	var/buildstackamount = 1
+	var/framestackamount = 2
+	var/deconstruction_ready = TRUE
+	var/flipped = 0
 
 /obj/structure/table/New()
 	..()
-	for(var/obj/structure/table/T in src.loc)
-		if(T != src)
-			qdel(T)
 	if(flipped)
 		update_icon()
 
-/obj/structure/table/proc/destroy()
-	new parts(loc)
-	density = 0
-	qdel(src)
+/obj/structure/table/examine(mob/user)
+	..()
+	deconstruction_hints(user)
 
-/obj/structure/table/narsie_act()
-	if(prob(20))
-		new /obj/structure/table/woodentable(loc)
+/obj/structure/table/proc/deconstruction_hints(mob/user)
+	to_chat(user, "<span class='notice'>The top is <b>screwed</b> on, but the main <b>bolts</b> are also visible.</span>")
 
 /obj/structure/table/update_icon()
 	if(smooth && !flipped)
@@ -63,7 +65,7 @@
 				if(type == 1)
 					subtype = direction == turn(dir,90) ? "-" : "+"
 		var/base = "table"
-		if(istype(src, /obj/structure/table/woodentable))
+		if(istype(src, /obj/structure/table/wood))
 			base = "wood"
 		if(istype(src, /obj/structure/table/reinforced))
 			base = "rtable"
@@ -72,51 +74,57 @@
 
 		return 1
 
+/obj/structure/table/narsie_act()
+	new /obj/structure/table/wood(loc)
+	qdel(src)
+
+/obj/structure/table/ratvar_act()
+	new /obj/structure/table/reinforced/brass(loc)
+	qdel(src)
 
 /obj/structure/table/ex_act(severity)
 	switch(severity)
-		if(1.0)
+		if(1)
 			qdel(src)
 			return
-		if(2.0)
+		if(2)
 			if(prob(50))
 				qdel(src)
 				return
-		if(3.0)
+		if(3)
 			if(prob(25))
-				destroy()
+				deconstruct(FALSE)
 		else
 	return
 
-
 /obj/structure/table/blob_act()
 	if(prob(75))
-		destroy()
-
+		qdel(src)
 
 /obj/structure/table/attack_alien(mob/living/user)
 	user.do_attack_animation(src)
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1)
 	visible_message("<span class='danger'>[user] slices [src] apart!</span>")
-	destroy()
+	deconstruct(FALSE)
 
 /obj/structure/table/mech_melee_attack(obj/mecha/M)
 	visible_message("<span class='danger'>[M] smashes [src] apart!</span>")
-	destroy()
+	deconstruct(FALSE)
 
 /obj/structure/table/attack_animal(mob/living/simple_animal/user)
 	if(user.environment_smash)
 		user.do_attack_animation(src)
+		playsound(loc, 'sound/weapons/Genhit.ogg', 50, 1)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
-		destroy()
-
-
+		deconstruct(FALSE)
 
 /obj/structure/table/attack_hand(mob/living/user)
 	if(HULK in user.mutations)
 		user.do_attack_animation(src)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
+		playsound(loc, 'sound/effects/bang.ogg', 50, 1)
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-		destroy()
+		deconstruct(FALSE)
 	else
 		..()
 	if(climber)
@@ -171,17 +179,17 @@
 			else
 				return 1					//But only from one side
 		if(prob(chance))
-			health -= P.damage/2
-			if(health > 0)
+			obj_integrity -= P.damage/2
+			if(obj_integrity > 0)
 				visible_message("<span class='warning'>[P] hits \the [src]!</span>")
 				return 0
 			else
 				visible_message("<span class='warning'>[src] breaks down!</span>")
-				destroy()
+				deconstruct(FALSE)
 				return 1
 	return 1
 
-/obj/structure/table/CheckExit(atom/movable/O as mob|obj, target as turf)
+/obj/structure/table/CheckExit(atom/movable/O, turf/target)
 	if(istype(O) && O.checkpass(PASSTABLE))
 		return 1
 	if(flipped)
@@ -191,7 +199,7 @@
 			return 1
 	return 1
 
-/obj/structure/table/MouseDrop_T(obj/O as obj, mob/user as mob)
+/obj/structure/table/MouseDrop_T(obj/O, mob/user)
 	..()
 	if((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
 		return
@@ -223,58 +231,74 @@
 		return 1
 	qdel(I)
 
-/obj/structure/table/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/grab))
-		tablepush(W, user)
+/obj/structure/table/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/grab))
+		tablepush(I, user)
 		return
+	if(can_deconstruct)
+		if(isscrewdriver(I) && deconstruction_ready)
+			to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
+			playsound(loc, I.usesound, 50, 1)
+			if(do_after(user, 20*I.toolspeed, target = src))
+				deconstruct(TRUE)
+			return
 
-	if(istype(W, /obj/item/weapon/wrench))
-		user.visible_message("<span class='notice'>[user] is disassembling \a [src].</span>", "<span class='notice'>You start disassembling \the [src].</span>")
-		playsound(loc, W.usesound, 50, 1)
-		if(do_after(user, 50 * W.toolspeed, target = src))
-			playsound(loc, W.usesound, 50, 1)
-			destroy()
-		return
+		if(iswrench(I) && deconstruction_ready)
+			to_chat(user, "<span class='notice'>You start deconstructing [src]...</span>")
+			playsound(loc, I.usesound, 50, 1)
+			if(do_after(user, 40*I.toolspeed, target = src))
+				playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
+				deconstruct(TRUE, 1)
+			return
 
 	if(isrobot(user))
 		return
 
-	if(istype(W, /obj/item/weapon/melee/energy/blade))
+	if(istype(I, /obj/item/weapon/melee/energy/blade))
 		var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
-		spark_system.set_up(5, 0, src.loc)
+		spark_system.set_up(5, 0, loc)
 		spark_system.start()
-		playsound(src.loc, W.usesound, 50, 1)
-		playsound(src.loc, "sparks", 50, 1)
+		playsound(loc, I.usesound, 50, 1)
+		playsound(loc, "sparks", 50, 1)
 		for(var/mob/O in viewers(user, 4))
 			O.show_message("<span class='notice'>The [src] was sliced apart by [user]!</span>", 1, "<span class='warning'>You hear [src] coming apart.</span>", 2)
-		destroy()
+		deconstruct(FALSE)
 		return
 
-	if(!(W.flags & ABSTRACT))
+	if(!(I.flags & ABSTRACT))
 		if(user.drop_item())
-			W.Move(loc)
+			I.Move(loc)
 			var/list/click_params = params2list(params)
 			//Center the icon where the user clicked.
 			if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
 				return
 			//Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
-			W.pixel_x = Clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
-			W.pixel_y = Clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
+			I.pixel_x = Clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
+			I.pixel_y = Clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
 
 	return
 
-/obj/structure/table/proc/straight_table_check(var/direction)
+/obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0)
+	if(can_deconstruct)
+		var/turf/T = get_turf(src)
+		new buildstack(T, buildstackamount)
+		if(!wrench_disassembly)
+			new frame(T)
+		else
+			new framestack(T, framestackamount)
+	qdel(src)
+
+/obj/structure/table/proc/straight_table_check(direction)
 	var/obj/structure/table/T
 	for(var/angle in list(-90,90))
-		T = locate() in get_step(src.loc,turn(direction,angle))
+		T = locate() in get_step(loc,turn(direction,angle))
 		if(T && !T.flipped)
 			return 0
-	T = locate() in get_step(src.loc,direction)
+	T = locate() in get_step(loc,direction)
 	if(!T || T.flipped)
 		return 1
 	if(istype(T,/obj/structure/table/reinforced/))
-		var/obj/structure/table/reinforced/R = T
-		if(R.status == 2)
+		if(!T.deconstruction_ready)
 			return 0
 	return T.straight_table_check(direction)
 
@@ -309,7 +333,7 @@
 		return
 
 
-/obj/structure/table/proc/flip(var/direction)
+/obj/structure/table/proc/flip(direction)
 	if(flipped)
 		return 0
 
@@ -344,7 +368,7 @@
 		return 0
 
 	var/can_flip = 1
-	for(var/mob/A in oview(src,0))//src.loc)
+	for(var/mob/A in oview(src,0))//loc)
 		if(istype(A))
 			can_flip = 0
 	if(!can_flip)
@@ -365,52 +389,111 @@
 
 	return 1
 
+
+/*
+ * Glass Tables
+ */
+
+/obj/structure/table/glass
+	name = "glass table"
+	desc = "Looks fragile. You should totally flip it. It is begging for it."
+	icon = 'icons/obj/smooth_structures/glass_table.dmi'
+	icon_state = "glass_table"
+	buildstack = /obj/item/stack/sheet/glass
+	max_integrity = 70
+	canSmoothWith = null
+	var/list/debris = list()
+
+/obj/structure/table/glass/New()
+	. = ..()
+	debris += new frame
+	debris += new /obj/item/weapon/shard
+
+/obj/structure/table/glass/Destroy()
+	for(var/i in debris)
+		qdel(i)
+	. = ..()
+
+/obj/structure/table/glass/Crossed(atom/movable/AM)
+	. = ..()
+	if(!can_deconstruct)
+		return
+	if(!isliving(AM))
+		return
+	// Don't break if they're just flying past
+	if(AM.throwing)
+		addtimer(src, "throw_check", 5, FALSE, AM)
+	else
+		check_break(AM)
+
+/obj/structure/table/glass/proc/throw_check(mob/living/M)
+	if(M.loc == get_turf(src))
+		check_break(M)
+
+/obj/structure/table/glass/proc/check_break(mob/living/M)
+	if(has_gravity(M) && M.mob_size > MOB_SIZE_SMALL)
+		table_shatter(M)
+
+/obj/structure/table/glass/flip(direction)
+	deconstruct(FALSE)
+
+/obj/structure/table/glass/proc/table_shatter(mob/living/L)
+	visible_message("<span class='warning'>[src] breaks!</span>",
+		"<span class='danger'>You hear breaking glass.</span>")
+	var/turf/T = get_turf(src)
+	playsound(T, "shatter", 50, 1)
+	for(var/I in debris)
+		var/atom/movable/AM = I
+		AM.forceMove(T)
+		debris -= AM
+		if(istype(AM, /obj/item/weapon/shard))
+			AM.throw_impact(L)
+	L.Weaken(5)
+	qdel(src)
+
+/obj/structure/table/glass/deconstruct(disassembled = TRUE, wrench_disassembly = 0)
+	if(can_deconstruct)
+		if(disassembled)
+			..()
+			return
+		else
+			var/turf/T = get_turf(src)
+			playsound(T, "shatter", 50, 1)
+			for(var/X in debris)
+				var/atom/movable/AM = X
+				AM.forceMove(T)
+				debris -= AM
+	qdel(src)
+
 /*
  * Wooden tables
  */
-/obj/structure/table/woodentable
+/obj/structure/table/wood
 	name = "wooden table"
 	desc = "Do not apply fire to this. Rumour says it burns easily."
 	icon = 'icons/obj/smooth_structures/wood_table.dmi'
 	icon_state = "wood_table"
-	parts = /obj/item/weapon/table_parts/wood
-	health = 50
-	canSmoothWith = list(/obj/structure/table/woodentable, /obj/structure/table/woodentable/poker)
+	frame = /obj/structure/table_frame/wood
+	framestack = /obj/item/stack/sheet/wood
+	buildstack = /obj/item/stack/sheet/wood
+	max_integrity = 70
+	canSmoothWith = list(/obj/structure/table/wood, /obj/structure/table/wood/poker)
 	burn_state = FLAMMABLE
 	burntime = 20
-	var/canPokerize = 1
 
-/obj/structure/table/woodentable/attackby(obj/item/I as obj, mob/user as mob, params)
-	if(canPokerize && istype(I, /obj/item/stack/tile/grass))
-		var/obj/item/stack/tile/grass/gr = I
-		gr.use(1)
-		new /obj/structure/table/woodentable/poker( src.loc )
-		qdel(src)
-		visible_message("<span class='notice'>[user] adds the grass to the wooden table</span>")
-		return 1
-	else
-		return ..()
+/obj/structure/table/wood/narsie_act(total_override = TRUE)
+	if(!total_override)
+		..()
 
-	return 1
-
-
-/obj/structure/table/woodentable/narsie_act()
-	return
-
-/obj/structure/table/woodentable/poker //No specialties, Just a mapping object.
+/obj/structure/table/wood/poker //No specialties, Just a mapping object.
 	name = "gambling table"
 	desc = "A seedy table for seedy dealings in seedy places."
 	icon = 'icons/obj/smooth_structures/poker_table.dmi'
-	icon_state = "pokertable"
-	canSmoothWith = list(/obj/structure/table/woodentable/poker, /obj/structure/table/woodentable)
-	canPokerize = 0
+	icon_state = "poker_table"
+	buildstack = /obj/item/stack/tile/carpet
 
-/obj/structure/table/woodentable/poker/destroy()
-	new /obj/item/stack/tile/grass(loc)
-	..()
-
-/obj/structure/table/woodentable/poker/narsie_act()
-	return
+/obj/structure/table/wood/poker/narsie_act()
+	..(FALSE)
 
 /*
  * Fancy Tables
@@ -421,7 +504,9 @@
 	desc = "A standard metal table frame covered with an amazingly fancy, patterned cloth."
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "fancy_table"
-	parts = /obj/item/weapon/table_parts/fancy
+	frame = /obj/structure/table_frame
+	framestack = /obj/item/stack/rods
+	buildstack = /obj/item/stack/tile/carpet
 	canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black)
 
 /obj/structure/table/wood/fancy/New()
@@ -430,123 +515,82 @@
 
 /obj/structure/table/wood/fancy/black
 	icon_state = "fancy_table_black"
-	parts = /obj/item/weapon/table_parts/fancy/black
+	buildstack = /obj/item/stack/tile/carpet/black
 
 /obj/structure/table/wood/fancy/black/New()
 	..()
 	icon = 'icons/obj/smooth_structures/fancy_table_black.dmi' //so that the tables place correctly in the map editor
 
-
-/*
- * Glass Tables
- */
-
-/obj/structure/glasstable_frame
-	name = "glass table frame"
-	desc = "A metal frame for a glass table."
-	icon = 'icons/obj/structures.dmi'
-	icon_state = "glass_table_frame"
-	density = 1
-
-/obj/structure/glasstable_frame/attackby(obj/item/I as obj, mob/user as mob, params)
-	if(istype(I, /obj/item/stack/sheet/glass))
-		var/obj/item/stack/sheet/glass/G = I
-		if(G.amount >= 2)
-			to_chat(user, "<span class='notice'>You start to add the glass to \the [src].</span>")
-			if(do_after(user, 10 * G.toolspeed, target = src))
-				G.use(2)
-				to_chat(user, "<span class='notice'>You add the glass to \the [src].</span>")
-				playsound(get_turf(src), G.usesound, 50, 1)
-				new /obj/structure/table/glass(loc)
-				qdel(src)
-		else
-			to_chat(user, "<span class='notice'>You don't have enough glass! You need at least 2 sheets.</span>")
-			return
-
-	if(iswrench(I))
-		to_chat(user, "<span class='notice'>You start to deconstruct \the [src].</span>")
-		playsound(src.loc, I.usesound, 75, 1)
-		if(do_after(user, 10 * I.toolspeed, target = src))
-			playsound(src.loc, I.usesound, 75, 1)
-			to_chat(user, "<span class='notice'>You dismantle \the [src].</span>")
-			new /obj/item/stack/sheet/metal(loc)
-			new /obj/item/stack/sheet/metal(loc)
-			qdel(src)
-
-/obj/structure/table/glass
-	name = "glass table"
-	desc = "Looks fragile. You should totally flip it. It is begging for it."
-	icon = 'icons/obj/smooth_structures/glass_table.dmi'
-	icon_state = "glass_table"
-	parts = /obj/item/weapon/table_parts/glass
-	health = 10
-	canSmoothWith = null
-
-/obj/structure/table/glass/flip(var/direction)
-	collapse()
-
-/obj/structure/table/glass/proc/collapse() //glass table collapse is called twice in this code, more efficent to just have a proc
-	src.visible_message("<span class='warning'>\The [src] shatters, and the frame collapses!</span>", "<span class='warning'>You hear metal collapsing and glass shattering.</span>")
-	playsound(src.loc, "shatter", 50, 1)
-	destroy(1)
-
-/obj/structure/table/glass/destroy(dirty)
-	if(dirty)
-		new /obj/item/weapon/shard(loc)
-		new /obj/item/weapon/shard(loc)
-	else
-		new /obj/item/stack/sheet/glass(loc, 2)
-	..()
-
-/obj/structure/table/glass/tablepush(obj/item/I, mob/user)
-	if(..())
-		collapse()
-
 /*
  * Reinforced tables
  */
 /obj/structure/table/reinforced
 	name = "reinforced table"
-	desc = "A version of the four legged table. It is stronger."
+	desc = "A reinforced version of the four legged table."
 	icon = 'icons/obj/smooth_structures/reinforced_table.dmi'
 	icon_state = "r_table"
-	health = 200
-	var/status = 2
-	parts = /obj/item/weapon/table_parts/reinforced
+	deconstruction_ready = FALSE
+	buildstack = /obj/item/stack/sheet/plasteel
 	canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table)
+	max_integrity = 200
+	integrity_failure = 50
 
-/obj/structure/table/reinforced/flip(var/direction)
-	if(status == 2)
+/obj/structure/table/reinforced/deconstruction_hints(mob/user)
+	if(deconstruction_ready)
+		to_chat(user, "<span class='notice'>The top cover has been <i>welded</i> loose and the main frame's <b>bolts</b> are exposed.</span>")
+	else
+		to_chat(user, "<span class='notice'>The top cover is firmly <b>welded</b> on.</span>")
+
+/obj/structure/table/reinforced/flip(direction)
+	if(!deconstruction_ready)
 		return 0
 	else
 		return ..()
 
-/obj/structure/table/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/weldingtool))
+/obj/structure/table/reinforced/attackby(obj/item/weapon/W, mob/user, params)
+	if(iswelder(W))
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
-			if(src.status == 2)
-				to_chat(user, "<span class='notice'>Now weakening the reinforced table</span>")
-				playsound(src.loc, WT.usesound, 50, 1)
-				if(do_after(user, 50 * WT.toolspeed, target = src))
-					if(!src || !WT.isOn()) return
-					to_chat(user, "<span class='notice'>Table weakened</span>")
-					src.status = 1
+			playsound(loc, W.usesound, 50, 1)
+			if(deconstruction_ready)
+				to_chat(user, "<span class='notice'>You start strengthening the reinforced table...</span>")
+				if (do_after(user, 50*W.toolspeed, target = src))
+					if(!src || !WT.isOn())
+						return
+					to_chat(user, "<span class='notice'>You strengthen the table.</span>")
+					deconstruction_ready = FALSE
 			else
-				to_chat(user, "<span class='notice'>Now strengthening the reinforced table</span>")
-				playsound(src.loc, WT.usesound, 50, 1)
-				if(do_after(user, 50 * WT.toolspeed, target = src))
-					if(!src || !WT.isOn()) return
-					to_chat(user, "<span class='notice'>Table strengthened</span>")
-					src.status = 2
-			return
-		return
+				to_chat(user, "<span class='notice'>You start weakening the reinforced table...</span>")
+				if (do_after(user, 50*W.toolspeed, target = src))
+					if(!src || !WT.isOn())
+						return
+					to_chat(user, "<span class='notice'>You weaken the table.</span>")
+					deconstruction_ready = TRUE
+	else
+		. = ..()
 
-	if(istype(W, /obj/item/weapon/wrench))
-		if(src.status == 2)
-			return
+/obj/structure/table/reinforced/brass
+	name = "brass table"
+	desc = "A solid, slightly beveled brass table."
+	icon = 'icons/obj/smooth_structures/brass_table.dmi'
+	icon_state = "brass_table"
+	burn_state = FIRE_PROOF
+	frame = /obj/structure/table_frame/brass
+	framestack = /obj/item/stack/tile/brass
+	buildstack = /obj/item/stack/tile/brass
+	framestackamount = 1
+	buildstackamount = 1
+	canSmoothWith = list(/obj/structure/table/reinforced/brass)
 
-	..()
+/obj/structure/table/reinforced/brass/narsie_act()
+	take_damage(rand(15, 45), BRUTE)
+	if(src) //do we still exist?
+		var/previouscolor = color
+		color = "#960000"
+		animate(src, color = previouscolor, time = 8)
+
+/obj/structure/table/reinforced/brass/ratvar_act()
+	obj_integrity = max_integrity
 
 /*
  * Racks
@@ -556,42 +600,42 @@
 	desc = "Different from the Middle Ages version."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "rack"
+	layer = TABLE_LAYER
 	density = 1
-	anchored = 1.0
+	anchored = 1
 	pass_flags = LETPASSTHROW
-	var/parts = /obj/item/weapon/rack_parts
-	var/health = 5
+	max_integrity = 20
 
-/obj/structure/rack/proc/destroy()
-	new parts(loc)
-	density = 0
-	qdel(src)
+/obj/structure/rack/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
 
 /obj/structure/rack/ex_act(severity)
 	switch(severity)
-		if(1.0)
+		if(1)
 			qdel(src)
-		if(2.0)
+		if(2)
 			qdel(src)
 			if(prob(50))
-				new /obj/item/weapon/rack_parts(src.loc)
-		if(3.0)
+				new /obj/item/weapon/rack_parts(loc)
+		if(3)
 			if(prob(25))
 				qdel(src)
-				new /obj/item/weapon/rack_parts(src.loc)
+				new /obj/item/weapon/rack_parts(loc)
 
 /obj/structure/rack/blob_act()
 	if(prob(75))
 		qdel(src)
 		return
 	else if(prob(50))
-		new /obj/item/weapon/rack_parts(src.loc)
+		new /obj/item/weapon/rack_parts(loc)
 		qdel(src)
 		return
 
 /obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0)
-	if(height==0) return 1
-	if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!|
+	if(height==0)
+		return 1
+	if(density == 0) //Because broken racks -Agouri |TODO: SPRITE!|
 		return 1
 	if(istype(mover) && mover.checkpass(PASSTABLE))
 		return 1
@@ -606,7 +650,7 @@
 		var/atom/movable/mover = caller
 		. = . || mover.checkpass(PASSTABLE)
 
-/obj/structure/rack/MouseDrop_T(obj/O as obj, mob/user as mob)
+/obj/structure/rack/MouseDrop_T(obj/O, mob/user)
 	if((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
 		return
 	if(isrobot(user))
@@ -615,13 +659,11 @@
 		return
 	if(O.loc != src.loc)
 		step(O, get_dir(O, src))
-	return
 
-/obj/structure/rack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wrench))
-		new /obj/item/weapon/rack_parts( src.loc )
-		playsound(src.loc, W.usesound, 50, 1)
-		qdel(src)
+/obj/structure/rack/attackby(obj/item/weapon/W, mob/user, params)
+	if(iswrench(W) && can_deconstruct)
+		playsound(loc, W.usesound, 50, 1)
+		deconstruct(TRUE)
 		return
 	if(isrobot(user))
 		return
@@ -634,38 +676,47 @@
 	if(HULK in user.mutations)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-		destroy()
+		deconstruct()
 	else
 		user.changeNext_move(CLICK_CD_MELEE)
 		user.do_attack_animation(src)
 		playsound(loc, 'sound/items/dodgeball.ogg', 80, 1)
 		user.visible_message("<span class='warning'>[user] kicks [src].</span>", \
 							 "<span class='danger'>You kick [src].</span>")
-		health -= rand(1,2)
+		obj_integrity -= rand(1,2)
 		healthcheck()
 
 /obj/structure/rack/mech_melee_attack(obj/mecha/M)
 	visible_message("<span class='danger'>[M] smashes [src] apart!</span>")
-	destroy()
+	deconstruct()
 
 /obj/structure/rack/attack_alien(mob/living/user)
 	user.do_attack_animation(src)
 	visible_message("<span class='danger'>[user] slices [src] apart!</span>")
-	destroy()
-
+	deconstruct()
 
 /obj/structure/rack/attack_animal(mob/living/simple_animal/user)
 	if(user.environment_smash)
 		user.do_attack_animation(src)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
-		destroy()
+		deconstruct()
 
 /obj/structure/rack/attack_tk() // no telehulk sorry
 	return
 
 /obj/structure/rack/proc/healthcheck()
-	if(health <= 0)
-		destroy()
+	if(obj_integrity <= 0)
+		deconstruct()
+
+/obj/structure/rack/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			if(damage_amount)
+				playsound(loc, 'sound/items/dodgeball.ogg', 80, 1)
+			else
+				playsound(loc, 'sound/weapons/tap.ogg', 50, 1)
+		if(BURN)
+			playsound(loc, 'sound/items/welder.ogg', 40, 1)
 
 /obj/structure/rack/skeletal_bar
 	name = "skeletal minibar"
@@ -678,3 +729,49 @@
 
 /obj/structure/rack/skeletal_bar/right
 	icon_state = "minibar_right"
+
+/*
+ * Rack destruction
+ */
+
+/obj/structure/rack/deconstruct(disassembled = TRUE)
+	if(can_deconstruct)
+		density = FALSE
+		var/obj/item/weapon/rack_parts/newparts = new(loc)
+		transfer_fingerprints_to(newparts)
+	qdel(src)
+
+/*
+ * Rack Parts
+ */
+
+/obj/item/weapon/rack_parts
+	name = "rack parts"
+	desc = "Parts of a rack."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "rack_parts"
+	flags = CONDUCT
+	materials = list(MAT_METAL=2000)
+	var/building = FALSE
+
+/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W, mob/user, params)
+	if(iswrench(W))
+		new /obj/item/stack/sheet/metal(user.loc)
+		qdel(src)
+	else
+		. = ..()
+
+/obj/item/weapon/rack_parts/attack_self(mob/user)
+	if(building)
+		return
+	building = TRUE
+	to_chat(user, "<span class='notice'>You start constructing a rack...</span>")
+	if(do_after(user, 50, target = user, progress=TRUE))
+		if(!user.drop_item(src))
+			return
+		var/obj/structure/rack/R = new /obj/structure/rack(user.loc)
+		user.visible_message("<span class='notice'>[user] assembles \a [R].\
+			</span>", "<span class='notice'>You assemble \a [R].</span>")
+		R.add_fingerprint(user)
+		qdel(src)
+	building = FALSE

code/game/response_team.dm

@@ -90,6 +90,16 @@ var/ert_request_answered = 0
 		return 0
 
 	var/index = 1
+	var/ert_spawn_seconds = 120
+	spawn(ert_spawn_seconds * 10) // to account for spawn() using deciseconds
+		var/list/unspawnable_ert = list()
+		for(var/mob/M in response_team_members)
+			if(M)
+				unspawnable_ert |= M
+		if(unspawnable_ert.len)
+			message_admins("ERT SPAWN: The following ERT members could not be spawned within [ert_spawn_seconds] seconds:")
+			for(var/mob/M in unspawnable_ert)
+				message_admins("- Unspawned ERT: [ADMIN_FULLMONTY(M)]")
 	for(var/mob/M in response_team_members)
 		if(index > emergencyresponseteamspawn.len)
 			index = 1
@@ -115,23 +125,7 @@ var/ert_request_answered = 0
 	if(class == "Cyborg")
 		active_team.reduceCyborgSlots()
 		var/cyborg_unlock = active_team.getCyborgUnlock()
-		var/mob/living/silicon/robot/ert/R = new()
-		R.forceMove(spawn_location)
-		var/rnum = rand(1,1000)
-		var/borgname = "ERT [rnum]"
-		R.name = borgname
-		R.custom_name = borgname
-		R.real_name = R.name
-		R.mind = new
-		R.mind.current = R
-		R.mind.original = R
-		R.mind.assigned_role = "MODE"
-		R.mind.special_role = SPECIAL_ROLE_ERT
-		if(cyborg_unlock)
-			R.crisis = 1
-		if(!(R.mind in ticker.minds))
-			ticker.minds += R.mind //Adds them to regular mind list.
-		ticker.mode.ert += R.mind
+		var/mob/living/silicon/robot/ert/R = new /mob/living/silicon/robot/ert(spawn_location, cyborg_unlock)
 		return R
 
 	var/mob/living/carbon/human/M = new(null)

code/game/turfs/simulated/floor.dm

@@ -223,5 +223,10 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
 	if(prob(20))
 		ChangeTurf(/turf/simulated/floor/engine/cult)
 
+/turf/simulated/floor/ratvar_act(force, ignore_mobs)
+	. = ..()
+	if(.)
+		ChangeTurf(/turf/simulated/floor/clockwork)
+
 /turf/simulated/floor/can_have_cabling()
 	return !burnt && !broken

code/game/turfs/simulated/floor/fancy_floor.dm

@@ -107,7 +107,7 @@
 				set_light(1, 1)
 
 /turf/simulated/floor/carpet
-	name = "Carpet"
+	name = "carpet"
 	icon = 'icons/turf/floors/carpet.dmi'
 	icon_state = "carpet"
 	floor_tile = /obj/item/stack/tile/carpet

code/game/turfs/simulated/floor/mineral.dm

@@ -178,11 +178,11 @@
 	floor_tile = /obj/item/stack/tile/mineral/abductor
 	icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9")
 
-/turf/simulated/floor/mineral/New()
+/turf/simulated/floor/mineral/abductor/New()
 	..()
 	icon_state = "alienpod[rand(1,9)]"
 
-/turf/simulated/floor/mineral/break_tile()
+/turf/simulated/floor/mineral/abductor/break_tile()
 	return //unbreakable
 
 /turf/simulated/floor/mineral/abductor/burn_tile()

code/game/turfs/simulated/floor/misc_floor.dm

@@ -67,3 +67,32 @@
 
 /turf/simulated/floor/noslip/MakeSlippery()
 	return
+
+//Clockwork floor: Slowly heals toxin damage on nearby servants.
+/turf/simulated/floor/clockwork
+	name = "clockwork floor"
+	desc = "Tightly-pressed brass tiles. They emit minute vibration."
+	icon_state = "clockwork_floor"
+
+/turf/simulated/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
+	if(iscrowbar(I))
+		user.visible_message("<span class='notice'>[user] begins slowly prying up [src]...</span>", "<span class='notice'>You begin painstakingly prying up [src]...</span>")
+		playsound(src, I.usesound, 20, 1)
+		if(!do_after(user, 70*I.toolspeed, target = src))
+			return 0
+		user.visible_message("<span class='notice'>[user] pries up [src]!</span>", "<span class='notice'>You pry up [src]!</span>")
+		playsound(src, I.usesound, 80, 1)
+		make_plating()
+		return 1
+	return ..()
+
+/turf/simulated/floor/clockwork/make_plating()
+	new /obj/item/stack/tile/brass(src)
+	return ..()
+
+/turf/simulated/floor/clockwork/narsie_act()
+	..()
+	if(istype(src, /turf/simulated/floor/clockwork)) //if we haven't changed type
+		var/previouscolor = color
+		color = "#960000"
+		animate(src, color = previouscolor, time = 8)

code/game/turfs/simulated/floor/plating.dm

@@ -146,6 +146,13 @@
 /turf/simulated/floor/engine/cult/narsie_act()
 	return
 
+/turf/simulated/floor/engine/cult/ratvar_act()
+	. = ..()
+	if(istype(src, /turf/simulated/floor/engine/cult)) //if we haven't changed type
+		var/previouscolor = color
+		color = "#FAE48C"
+		animate(src, color = previouscolor, time = 8)
+
 /turf/simulated/floor/engine/n20/New()
 	..()
 	var/datum/gas_mixture/adding = new

code/game/turfs/simulated/walls_misc.dm

@@ -13,7 +13,7 @@
 /turf/simulated/wall/cult/New()
 	..()
 	if(ticker.mode)//game hasn't started offically don't do shit..
-		new /obj/effect/overlay/temp/cult/turf(src)
+		new /obj/effect/temp_visual/cult/turf(src)
 		icon_state = ticker.mode.cultdat.cult_wall_icon_state
 
 /turf/simulated/wall/cult/artificer
@@ -21,11 +21,11 @@
 	desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound."
 
 /turf/simulated/wall/cult/artificer/break_wall()
-	new /obj/effect/overlay/temp/cult/turf(get_turf(src))
+	new /obj/effect/temp_visual/cult/turf(get_turf(src))
 	return null //excuse me we want no runed metal here
 
 /turf/simulated/wall/cult/artificer/devastate_wall()
-	new /obj/effect/overlay/temp/cult/turf(get_turf(src))
+	new /obj/effect/temp_visual/cult/turf(get_turf(src))
 
 /turf/simulated/wall/cult/narsie_act()
 	return

code/game/turfs/turf.dm

@@ -415,6 +415,15 @@
 /turf/proc/can_lay_cable()
 	return can_have_cabling() & !intact
 
+/turf/ratvar_act(force, ignore_mobs, probability = 40)
+	. = (prob(probability) || force)
+	for(var/I in src)
+		var/atom/A = I
+		if(ignore_mobs && ismob(A))
+			continue
+		if(ismob(A) || .)
+			A.ratvar_act()
+
 /turf/proc/add_blueprints(atom/movable/AM)
 	var/image/I = new
 	I.appearance = AM.appearance

code/modules/admin/verbs/debug.dm

@@ -577,7 +577,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	var/list/choices = list(
 		"strip",
 		"as job...",
-		"emergency response team member",
+		"emergency response team member",
 		"emergency response team leader"
 	)
 
@@ -642,7 +642,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			if(dresscode == "emergency response team leader")
 				equip_team.equip_officer("Commander", M)
 			else
-				switch(alert("Loadout Type", "Emergency Response Team", "Security", "Engineer", "Medic"))
+				var/list/ert_outfits = list("Security", "Engineer", "Medic", "Janitor", "Paranormal")
+				var/echoice = input("Loadout Type", "Emergency Response Team") as null|anything in ert_outfits
+				if(!echoice)
+					return
+				switch(echoice)
 					if("Commander")
 						equip_team.equip_officer("Commander", M)
 					if("Security")
@@ -651,6 +655,10 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 						equip_team.equip_officer("Engineer", M)
 					if("Medic")
 						equip_team.equip_officer("Medic", M)
+					if("Janitor")
+						equip_team.equip_officer("Janitor", M)
+					if("Paranormal")
+						equip_team.equip_officer("Paranormal", M)
 					else
 						to_chat(src, "Invalid ERT Loadout selected")
 

code/modules/admin/verbs/randomverbs.dm

@@ -576,7 +576,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 			command_announcement.Announce(input, customname, MsgSound[beepsound], , , type)
 			print_command_report(input, "[command_name()] Update")
-		else if("No")
+		if("No")
 			//same thing as the blob stuff - it's not public, so it's classified, dammit
 			command_announcer.autosay("A classified message has been printed out at all communication consoles.");
 			print_command_report(input, "Classified [command_name()] Update")
@@ -763,6 +763,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm != "Yes") return
 
+	if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes")
+		shuttle_master.emergency.canRecall = TRUE
+	else
+		shuttle_master.emergency.canRecall = FALSE
+
 	shuttle_master.emergency.request()
 
 	feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -781,7 +786,18 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
 		return
 
-	shuttle_master.emergency.cancel()
+	if(shuttle_master.emergency.canRecall == FALSE)
+		if(alert("Shuttle is currently set to be nonrecallable. Recalling may break things. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes")
+			return
+		else
+			var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability
+			shuttle_master.emergency.canRecall = TRUE // must be true for cancel proc to work
+			shuttle_master.emergency.cancel()
+			if(keepStatus)
+				shuttle_master.emergency.canRecall = FALSE // restores original status
+	else
+		shuttle_master.emergency.cancel()
+
 	feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] admin-recalled the emergency shuttle.</span>")

code/modules/awaymissions/corpse.dm

@@ -117,7 +117,7 @@
 	name = "Syndicate Commando"
 	corpseuniform = /obj/item/clothing/under/syndicate
 	corpsesuit = /obj/item/clothing/suit/space/hardsuit/syndi
-	corpseshoes = /obj/item/clothing/shoes/combat
+	corpseshoes = /obj/item/clothing/shoes/magboots/syndie
 	corpsegloves = /obj/item/clothing/gloves/combat
 	corpseradio = /obj/item/device/radio/headset
 	corpsemask = /obj/item/clothing/mask/gas/syndicate

code/modules/awaymissions/mission_code/wildwest.dm

@@ -215,4 +215,76 @@
 		to_chat(C, "<span class='notice'>You have regenerated.</span>")
 		C.visible_message("<span class='warning'>[usr] appears to wake from the dead, having healed all wounds.</span>")
 		C.update_canmove()
-	return 1
+	return 1
+
+/obj/item/device/wildwest_communicator
+	name = "Syndicate Comms Device"
+	icon_state = "gangtool-red"
+	item_state = "walkietalkie"
+	desc = "Use to communicate with the syndicate base commander."
+	var/used = FALSE
+
+/obj/item/device/wildwest_communicator/attack_self(mob/living/user)
+
+	if(!is_away_level(user.z))
+		to_chat(user, "<span class='warning'>The communicator emits a faint beep. Perhaps it is out of range?</span>")
+		return
+
+	if(used)
+		to_chat(user, "<span class='warning'>The communicator buzzes, and then dies. Apparently nobody is responding.</span>")
+		return
+
+	var/initial_question = "<span class='warning'>The communicator buzzes, and you hear a voice on the line, almost lost in the static. 'Hello? Who is this?'.</span>"
+	to_chat(user, initial_question)
+
+	var/const/option_explorer = "(TRUTH) Explorers."
+	var/const/option_bluff = "(BLUFF) Weapons delivery."
+	var/const/option_threat = "(THREAT) NT, here to kick your ass!"
+	var/const/option_syndicate = "(SYNDI) Agent reporting in..."
+	var/list/response_choices = list(option_explorer, option_bluff, option_threat)
+
+	if(istype(user, /mob/living) && user.mind)
+		if(user.mind.special_role == "Traitor")
+			response_choices |= option_syndicate
+
+	var/selected_choice = input(user, "How do you respond on the comms device?", "Response to Syndicate") as null|anything in response_choices
+
+	if(!selected_choice)
+		return
+	switch(selected_choice)
+		if(option_explorer)
+			to_chat(user, "<span class='warning'>The communicator buzzes, and you hear the voice again: 'Hah! You sure picked the wrong asteroid to explore. Get em, boys!'</span>")
+		if(option_bluff)
+			to_chat(user, "<span class='warning'>The communicator buzzes, and you hear the voice again: 'Really? I think not. Get them!'</span>")
+		if(option_threat)
+			to_chat(user, "<span class='warning'>The communicator buzzes, and you hear the voice again: 'Oh really now?' You hear a clicking sound. 'Team, get back here. We have trouble'. Then the line goes dead.</span>")
+			for(var/obj/effect/landmark/L in landmarks_list)
+				if(L.name == "wildwest_syndipod")
+					var/obj/spacepod/syndi/P = new /obj/spacepod/syndi(get_turf(L))
+					P.name = "Syndi Recon Pod"
+				if(L.name == "wildwest_syndibackup")
+					var/mob/living/simple_animal/hostile/syndicate/ranged/space/R = new /mob/living/simple_animal/hostile/syndicate/ranged/space(get_turf(L))
+					R.name = "Syndi Recon Team"
+		if(option_syndicate)
+			to_chat(user, "<span class='warning'>The communicator buzzes, and you hear the voice again: 'Well, I'll be damned. An agent out here? You must be off-mission! Leave my troops alone, and they will do the same for you. Our Commander will handle you himself.'</span>")
+			stand_down()
+	used = TRUE
+
+/obj/item/device/wildwest_communicator/proc/stand_down()
+	for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in living_mob_list)
+		W.on_alert = FALSE
+
+/mob/living/simple_animal/hostile/syndicate/ranged/wildwest
+	var/on_alert = TRUE
+
+/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/ListTargets()
+	if(on_alert)
+		return ..()
+	return list()
+
+/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/death(gibbed)
+	if(!on_alert)
+		say("How could you betray the Syndicate?")
+		for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in living_mob_list)
+			W.on_alert = TRUE
+	..(gibbed)

code/modules/client/preference/loadout/loadout_donor.dm

@@ -25,14 +25,6 @@
 	path = /obj/item/clothing/suit/furcoat
 	cost = 2
 
-/datum/gear/donor/lord_admiral
-	display_name = "Lord Admiral Coat"
-	path = /obj/item/clothing/suit/lordadmiral
-
-/datum/gear/donor/lord_admiral_hat
-	display_name = "Lord Admiral Hat"
-	path = /obj/item/clothing/head/lordadmiralhat
-
 /datum/gear/donor/kamina
 	display_name = "Spiky Orange-tinted Shades"
 	path = /obj/item/clothing/glasses/fluff/kamina

code/modules/client/preference/loadout/loadout_shoes.dm

@@ -17,12 +17,12 @@
 
 /datum/gear/shoes/fancysandals
 	display_name = "sandals, fancy"
-	cost = 5
+	cost = 2
 	path = /obj/item/clothing/shoes/sandal/fancy
 
 /datum/gear/shoes/dressshoes
 	display_name = "dress shoes"
-	cost = 5
+	cost = 2
 	path = /obj/item/clothing/shoes/centcom
 
 /datum/gear/shoes/cowboyboots

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

@@ -40,8 +40,6 @@
 	to_chat(H, "<font color='blue'><b>You are now invisible to normal detection.</b></font>")
 	H.invisibility = INVISIBILITY_LEVEL_TWO
 
-	anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null)
-
 	H.visible_message("[H.name] vanishes into thin air!",1)
 
 /obj/item/rig_module/stealth_field/deactivate()
@@ -54,8 +52,7 @@
 	to_chat(H, "<span class='danger'>You are now visible.</span>")
 	H.invisibility = 0
 
-	anim(get_turf(H), H,'icons/mob/mob.dmi',,"uncloak",,H.dir)
-	anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null)
+	new /obj/effect/temp_visual/dir_setting/ninja(get_turf(H), H.dir)
 
 	for(var/mob/O in oviewers(H))
 		O.show_message("[H.name] appears from thin air!",1)
@@ -85,7 +82,7 @@
 	holder.spark_system.start()
 	playsound(T, 'sound/effects/phasein.ogg', 25, 1)
 	playsound(T, 'sound/effects/sparks2.ogg', 50, 1)
-	anim(T,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
+	new /obj/effect/temp_visual/dir_setting/ninja/phase(T, M.dir)
 
 /obj/item/rig_module/teleporter/proc/phase_out(var/mob/M,var/turf/T)
 
@@ -93,7 +90,7 @@
 		return
 
 	playsound(T, "sparks", 50, 1)
-	anim(T,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
+	new /obj/effect/temp_visual/dir_setting/ninja/phase/out(T, M.dir)
 
 /obj/item/rig_module/teleporter/engage(var/atom/target, var/notify_ai)
 

code/modules/customitems/item_defines.dm

@@ -1246,3 +1246,19 @@
 	icon_state = "sheetcosmos"
 	item_state = "sheetcosmos"
 	item_color = "sheetcosmos"
+
+
+/obj/item/clothing/head/fluff/lfbowler //Lightfire: Hyperion
+	name = "Classy bowler hat"
+	desc = "a very classy looking bowler hat"
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "bowler_lightfire"
+
+/obj/item/clothing/under/fluff/lfvicsuit //Lightfire: Hyperion
+	name = "Classy victorian suit"
+	desc = "A blue and black victorian suit with silver buttons, very fancy!"
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "victorianlightfire"
+	item_state = "victorianvest"
+	item_color = "victorianlightfire"
+	displays_id = FALSE

code/modules/economy/Accounts.dm

@@ -72,8 +72,8 @@ var/global/list/all_money_accounts = list()
 	T.amount = starting_funds
 	if(!source_db)
 		//set a random date, time and location some time over the past few decades
-		T.date = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 25[rand(10,56)]"
-		T.time = "[rand(0,24)]:[rand(11,59)]"
+		T.date = "[num2text(rand(1,31))] [pick(month_names)], [rand(game_year - 20,game_year - 1)]"
+		T.time = "[rand(0,23)]:[rand(0,59)]"
 		T.source_terminal = "NTGalaxyNet Terminal #[rand(111,1111)]"
 
 		M.account_number = rand(111111, 999999)

code/modules/economy/Accounts_DB.dm

@@ -55,7 +55,7 @@
 		vendor_account = department_accounts["Vendor"]
 
 	if(!current_date_string)
-		current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 2557"
+		current_date_string = "[time2text(world.timeofday, "DD MM")], [game_year]"
 
 	machine_id = "[station_name()] Acc. DB #[num_financial_terminals++]"
 	..()

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -429,9 +429,9 @@
 		component_parts.Cut()
 	component_parts = null
 
-/obj/machinery/smartfridge/drying_rack/Destroy()
+/obj/machinery/smartfridge/drying_rack/on_deconstruction()
 	new /obj/item/stack/sheet/wood(loc, 10)
-	return ..()
+	..()
 
 /obj/machinery/smartfridge/drying_rack/RefreshParts()
 	return

code/modules/hydroponics/hydroponics.dm

@@ -704,7 +704,7 @@
 		adjustPests(rand(2,4))
 
 	// FEED ME SEYMOUR
-	if(S.has_reagent("strangereagent", 1))
+	if(S.has_reagent("strange_reagent", 1))
 		spawnplant()
 
 	// The best stuff there is. For testing/debugging.

code/modules/mining/equipment_locker.dm

@@ -562,7 +562,7 @@
 
 /obj/item/device/wormhole_jaunter/attack_self(mob/user)
 	var/turf/device_turf = get_turf(user)
-	if(!device_turf||is_teleport_allowed(device_turf.z))
+	if(!device_turf || !is_teleport_allowed(device_turf.z))
 		to_chat(user, "<span class='notice'>You're having difficulties getting the [src.name] to work.</span>")
 		return
 	else
@@ -906,10 +906,10 @@
 			minerals += M
 	if(minerals.len)
 		for(var/turf/simulated/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 = 18
 	icon = 'icons/turf/mining.dmi'
 	anchored = 1
@@ -1009,7 +1009,7 @@
 		var/target_turf = get_turf(target)
 		if(istype(target_turf, /turf/simulated/mineral))
 			var/turf/simulated/mineral/M = target_turf
-			new /obj/effect/overlay/temp/kinetic_blast(M)
+			new /obj/effect/temp_visual/kinetic_blast(M)
 			M.gets_drilled(firer)
 	..()
 
@@ -1035,7 +1035,7 @@
 		return
 	if(proximity_flag && target == mark && isliving(target))
 		var/mob/living/L = target
-		new /obj/effect/overlay/temp/kinetic_blast(get_turf(L))
+		new /obj/effect/temp_visual/kinetic_blast(get_turf(L))
 		mark = 0
 		if(L.mob_size >= MOB_SIZE_LARGE)
 			L.underlays -= marked_image

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

@@ -189,7 +189,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>")
@@ -211,6 +211,6 @@
 			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

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

@@ -203,7 +203,7 @@
 			NewTerrainFloors = /turf/simulated/floor/grass
 			NewTerrainWalls = /turf/simulated/wall/mineral/sandstone
 			NewTerrainChairs = /obj/structure/stool/bed/chair/wood/normal
-			NewTerrainTables = /obj/structure/table/woodentable
+			NewTerrainTables = /obj/structure/table/wood
 			NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush,
 							/obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/human/monkey,
 							/obj/item/weapon/gun/projectile/bow, /obj/item/weapon/storage/backpack/quiver/full)
@@ -284,7 +284,7 @@
 	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
@@ -367,7 +367,7 @@
 		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()
 	if(..())
@@ -388,7 +388,7 @@
 	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/mining/lavaland/loot/hierophant_loot.dm

@@ -38,7 +38,7 @@
 			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, 1.5, friendly_fire_check)
+				new /obj/effect/temp_visual/hierophant/chaser(get_turf(user), user, target, 1.5, friendly_fire_check)
 				add_logs(user, target, "fired a chaser at", src)
 			else
 				spawn(0)
@@ -63,7 +63,7 @@
 			if(do_after(user, 50, target = user))
 				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)
 				var/obj/effect/hierophant/H = new/obj/effect/hierophant(T)
 				rune = H
 				user.update_action_buttons_icon()
@@ -93,8 +93,8 @@
 			to_chat(user, "<span class='warning'>The rune is blocked by something, preventing teleportation!</span>")
 			user.update_action_buttons_icon()
 			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/blink.ogg', 200, 1)
 		//playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
 		playsound(source,'sound/magic/blink.ogg', 200, 1)
@@ -110,13 +110,13 @@
 			user.update_action_buttons_icon()
 			return
 		add_logs(user, rune, "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))
 			spawn(0)
@@ -155,11 +155,11 @@
 /obj/item/weapon/hierophant_staff/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/magic/blink.ogg', 200, 1)
 	//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 cardinal)
 		spawn(0)
 			blast_wall(T, d, user)
@@ -173,16 +173,16 @@
 	for(var/i in 1 to range)
 		if(!J)
 			return
-		new /obj/effect/overlay/temp/hierophant/blast(J, user, friendly_fire_check)
+		new /obj/effect/temp_visual/hierophant/blast(J, user, friendly_fire_check)
 		previousturf = J
 		J = get_step(previousturf, dir)
 
 /obj/item/weapon/hierophant_staff/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/magic/blink.ogg', 200, 1)
 	//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)
+		new /obj/effect/temp_visual/hierophant/blast(t, user, friendly_fire_check)

code/modules/mob/language.dm

@@ -562,7 +562,7 @@
 	
 	log_robot("[key_name(speaker)] : [message]")
 	var/message_start = "<i><span class='game say'>[name], <span class='name'>[speaker.name]</span>"
-	var/message_body = "<span class='message'>[speaker.say_quote(message)], \"[message]\"</span></span></i>"
+	var/message_body = "<span class='message'>[speaker.say_quote(message)],</i> <span class='ibm'>\"[message]\"</span></span></span>"
 
 	for(var/mob/M in dead_mob_list)
 		if(!isnewplayer(M) && !isbrain(M))

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

@@ -313,6 +313,7 @@
 /mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
 	. = ..()
 	var/damage = intensity - check_eye_prot()
+	var/extra_damage = 0
 	if(.)
 		if(visual)
 			return
@@ -323,19 +324,32 @@
 		if(!E || (E && E.weld_proof))
 			return
 
+		var/extra_darkview = 0
+		if(E.dark_view)
+			extra_darkview = max(E.dark_view - 2, 0)
+			extra_damage = extra_darkview
+
+		var/light_amount = 10 // assume full brightness
+		if(isturf(src.loc))
+			var/turf/T = src.loc
+			light_amount = round(T.get_lumcount() * 10)
+
+		// a dark view of 8, in full darkness, will result in maximum 1st tier damage
+		var/extra_prob = (10 - light_amount) * extra_darkview
+
 		switch(damage)
 			if(1)
 				to_chat(src, "<span class='warning'>Your eyes sting a little.</span>")
-				if(prob(40)) //waiting on carbon organs
-					E.receive_damage(1, 1)
-
+				var/minor_damage_multiplier = min(40 + extra_prob, 100) / 100
+				var/minor_damage = minor_damage_multiplier * (1 + extra_damage)
+				E.receive_damage(minor_damage, 1)
 			if(2)
 				to_chat(src, "<span class='warning'>Your eyes burn.</span>")
-				E.receive_damage(rand(2, 4), 1)
+				E.receive_damage(rand(2, 4) + extra_damage, 1)
 
 			else
 				to_chat(src, "Your eyes itch and burn severely!</span>")
-				E.receive_damage(rand(12, 16), 1)
+				E.receive_damage(rand(12, 16) + extra_damage, 1)
 
 		if(E.damage > E.min_bruised_damage)
 			AdjustEyeBlind(damage)
@@ -1105,4 +1119,4 @@ so that different stomachs can handle things in different ways VB*/
 			update_tint()
 	if(I.flags_inv & HIDEMASK || forced)
 		update_inv_wear_mask()
-	update_inv_head()
+	update_inv_head()

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

@@ -565,7 +565,5 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		H.see_invisible = H.see_override
 
 /datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source)
-	if(temperature >= 330)
-		M.bodytemperature = M.bodytemperature + (temperature - M.bodytemperature)
-	if(temperature <= 280)
-		M.bodytemperature = M.bodytemperature - (M.bodytemperature - temperature)
+	if(abs(temperature - M.bodytemperature) > 10) //If our water and mob temperature varies by more than 10K, cool or/ heat them appropriately
+		M.bodytemperature = (temperature + M.bodytemperature) * 0.5 //Approximation for gradual heating or cooling

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

@@ -1,3 +1,4 @@
+#define EMAG_TIMER 3000
 /mob/living/silicon/robot/drone
 	name = "drone"
 	real_name = "drone"
@@ -30,6 +31,7 @@
 	var/mail_destination = 0
 	var/reboot_cooldown = 60 // one minute
 	var/last_reboot
+	var/emagged_time
 
 	holder_type = /obj/item/weapon/holder/drone
 //	var/sprite[0]
@@ -180,14 +182,17 @@
 		return
 
 	to_chat(user, "<span class='warning'>You swipe the sequencer across [src]'s interface and watch its eyes flicker.</span>")
-	to_chat(src, "<span class='warning'>You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.</span>")
+	to_chat(src, "<span class='warning'>You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script. You sense you have five minutes before the drone server detects this and automatically shuts you down.</span>")
 
 	message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)].  Laws overridden.")
 	log_game("[key_name(user)] emagged drone [key_name(src)].  Laws overridden.")
 	var/time = time2text(world.realtime,"hh:mm:ss")
 	lawchanges.Add("[time] <B>:</B> [H.name]([H.key]) emagged [name]([key])")
 
+	emagged_time = world.time
 	emagged = 1
+	density = 1
+	pass_flags = 0
 	icon_state = "repairbot-emagged"
 	holder_type = /obj/item/weapon/holder/drone/emagged
 	update_icons()
@@ -196,11 +201,11 @@
 	clear_supplied_laws()
 	clear_inherent_laws()
 	laws = new /datum/ai_laws/syndicate_override
-	set_zeroth_law("Only [H.real_name] and people he designates as being such are Syndicate Agents.")
+	set_zeroth_law("Only [H.real_name] and people [H.real_name] designates as being such are Syndicate Agents.")
 
 	to_chat(src, "<b>Obey these laws:</b>")
 	laws.show_laws(src)
-	to_chat(src, "<span class='boldwarning'>ALERT: [H.real_name] is your new master. Obey your new laws and his commands.</span>")
+	to_chat(src, "<span class='boldwarning'>ALERT: [H.real_name] is your new master. Obey your new laws and [H.real_name]'s commands.</span>")
 	return
 
 //DRONE LIFE/DEATH
@@ -245,13 +250,16 @@
 			full_law_reset()
 			show_laws()
 
-/mob/living/silicon/robot/drone/proc/shut_down()
-	if(stat != 2)
-		if(emagged)
-			to_chat(src, "<span class='warning'>You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.</span>")
-		else
-			to_chat(src, "<span class='warning'>You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.</span>")
-			death()
+/mob/living/silicon/robot/drone/proc/shut_down(force=FALSE)
+	if(stat == 2)
+		return
+
+	if(emagged && !force)
+		to_chat(src, "<span class='warning'>You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.</span>")
+		return
+
+	to_chat(src, "<span class='warning'>You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.</span>")
+	death()
 
 /mob/living/silicon/robot/drone/proc/full_law_reset()
 	clear_supplied_laws()
@@ -347,6 +355,11 @@
 
 /mob/living/silicon/robot/drone/update_canmove(delay_action_updates = 0)
 	. = ..()
+	if(emagged)
+		density = 1
+		if(world.time - emagged_time > EMAG_TIMER)
+			shut_down(TRUE)
+		return
 	density = 0 //this is reset every canmove update otherwise
 
 /mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -24,7 +24,6 @@
 		/obj/item/mounted/frame/firealarm,
 		/obj/item/mounted/frame/newscaster_frame,
 		/obj/item/mounted/frame/intercom,
-		/obj/item/weapon/table_parts,
 		/obj/item/weapon/rack_parts,
 		/obj/item/weapon/camera_assembly,
 		/obj/item/weapon/tank,

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

@@ -1481,10 +1481,28 @@ var/list/robot_verbs_default = list(
 	radio.recalculateChannels()
 	aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
 
-/mob/living/silicon/robot/ert/New(loc)
-	..()
+/mob/living/silicon/robot/ert/New(loc, cyborg_unlock)
+	..(loc)
 	cell.maxcharge = 25000
 	cell.charge = 25000
+	var/rnum = rand(1,1000)
+	var/borgname = "ERT [rnum]"
+	name = borgname
+	custom_name = borgname
+	real_name = name
+	mind = new
+	mind.current = src
+	mind.original = src
+	mind.assigned_role = "MODE"
+	mind.special_role = SPECIAL_ROLE_ERT
+	if(cyborg_unlock)
+		crisis = 1
+	if(!(mind in ticker.minds))
+		ticker.minds += mind
+	ticker.mode.ert += mind
+
+/mob/living/silicon/robot/ert/gamma
+	crisis = 1
 
 /mob/living/silicon/robot/nations
 	base_icon = "droidpeace"

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

@@ -502,8 +502,6 @@
 	modules += new /obj/item/device/t_scanner(src)
 	modules += new /obj/item/weapon/rpd(src)
 
-	emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src)
-
 	for(var/T in stacktypes)
 		var/obj/item/stack/sheet/W = new T(src)
 		W.amount = stacktypes[T]

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

@@ -67,7 +67,7 @@
 		if(health < maxHealth)
 			adjustBruteLoss(-5)
 			if(src != M)
-				Beam(M,icon_state="sendbeam",icon='icons/effects/effects.dmi',time=4)
+				Beam(M,icon_state="sendbeam",time=4)
 				M.visible_message("<span class='danger'>[M] repairs some of \the <b>[src]'s</b> dents.</span>", \
 						   "<span class='cult'>You repair some of <b>[src]'s</b> dents, leaving <b>[src]</b> at <b>[health]/[maxHealth]</b> health.</span>")
 			else

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

@@ -563,7 +563,7 @@
 	if(change)
 		if(change > 0)
 			if(M && stat != DEAD) // Added check to see if this mob (the corgi) is dead to fix issue 2454
-				flick_overlay(image('icons/mob/animal.dmi',src,"heart-ani2",MOB_LAYER+1), list(M.client), 20)
+				new /obj/effect/temp_visual/heart(loc)
 				custom_emote(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/hostile/deathsquid.dm

@@ -0,0 +1,49 @@
+/mob/living/simple_animal/hostile/deathsquid
+	name = "death squid"
+	desc = "A large, floating eldritch horror. Its body glows with an evil red light, and its tentacles look to have been dipped in alien blood."
+
+	speed = 1
+	speak_emote = list("telepathically thunders", "telepathically booms")
+	maxHealth = 2500 // same as megafauna
+	health = 2500
+
+	icon = 'icons/mob/deathsquid_large.dmi' // Credit: FullofSkittles
+	icon_state = "deathsquid"
+	icon_living = "deathsquid"
+	icon_dead = "deathsquiddead"
+
+	attacktext = "slices"
+	attack_sound = 'sound/weapons/bladeslice.ogg'
+	armour_penetration = 25
+	melee_damage_lower = 10
+	melee_damage_upper = 100
+	environment_smash = 3
+
+	force_threshold = 15
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	unsuitable_atmos_damage = 0
+	heat_damage_per_tick = 0
+
+	see_in_dark = 8
+	mob_size = MOB_SIZE_LARGE
+	ventcrawler = 0
+	gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
+
+
+
+/mob/living/simple_animal/hostile/deathsquid/Process_Spacemove(var/movement_dir = 0)
+	return 1 //copypasta from carp code
+
+/mob/living/simple_animal/hostile/deathsquid/ex_act(severity)
+	return
+
+/mob/living/simple_animal/hostile/deathsquid/joke
+	name = "deaf squid"
+	desc = "An elderly, hard-of-hearing eldrich horror."
+	maxHealth = 200
+	health = 200
+	speed = 3
+	armour_penetration = 5
+	melee_damage_lower = 10
+	melee_damage_upper = 20
+	environment_smash = 2

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

@@ -131,7 +131,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 && .)
@@ -152,12 +152,12 @@ Difficulty: Hard
 	var/turf/T = get_turf(target)
 	if(!T || T == loc)
 		return
-	new /obj/effect/overlay/temp/dragon_swoop(T)
+	new /obj/effect/temp_visual/dragon_swoop(T)
 	charging = 1
 	DestroySurroundings()
 	walk(src, 0)
 	dir = 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 = 5)
 	sleep(5)
 	throw_at(T, get_dist(src, T), 1, src, 0)
@@ -242,9 +242,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(L))
@@ -256,11 +256,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(L))
@@ -274,28 +274,28 @@ Difficulty: Hard
 					devour(L)
 	sleep(1)
 
-/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 = MOB_LAYER - 0.1
 
-/obj/effect/overlay/temp/bubblegum_hands/leftpaw
+/obj/effect/temp_visual/bubblegum_hands/leftpaw
 	icon_state = "leftpawgrab"
 	layer = MOB_LAYER - 0.1
 
-/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()
@@ -311,7 +311,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
@@ -353,7 +353,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.CanAtmosPass(J))
 			break

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

@@ -97,7 +97,7 @@ Difficulty: Very Hard
 	..()
 	internal_gps = 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'
@@ -107,7 +107,7 @@ Difficulty: Very Hard
 	duration = 8
 	var/target
 
-/obj/effect/overlay/temp/at_shield/New(new_loc, new_target)
+/obj/effect/temp_visual/at_shield/New(new_loc, new_target)
 	..()
 	target = new_target
 	spawn(0)
@@ -115,7 +115,7 @@ Difficulty: Very Hard
 
 /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(loc, src)
+		var/obj/effect/temp_visual/at_shield/AT = new /obj/effect/temp_visual/at_shield(loc, src)
 		var/random_x = rand(-32, 32)
 		AT.pixel_x += random_x
 

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

@@ -86,7 +86,7 @@ Difficulty: Medium
 /mob/living/simple_animal/hostile/megafauna/dragon/Process_Spacemove(movement_dir = 0)
 	return 1
 
-/obj/effect/overlay/temp/fireball
+/obj/effect/temp_visual/fireball
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "fireball"
 	name = "fireball"
@@ -96,18 +96,18 @@ Difficulty: Medium
 	duration = 12
 	pixel_z = 500
 
-/obj/effect/overlay/temp/fireball/New(loc)
+/obj/effect/temp_visual/fireball/New(loc)
 	..()
 	animate(src, pixel_z = 0, time = 12)
 
-/obj/effect/overlay/temp/target
+/obj/effect/temp_visual/target
 	icon = 'icons/mob/actions.dmi'
 	icon_state = "sniper_zoom"
 	layer = MOB_LAYER - 0.1
 	luminosity = 2
 	duration = 12
 
-/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'
@@ -118,18 +118,18 @@ Difficulty: Medium
 	color = "#FF0000"
 	duration = 10
 
-/obj/effect/overlay/temp/target/ex_act()
+/obj/effect/temp_visual/target/ex_act()
 	return
 
-/obj/effect/overlay/temp/target/New(loc)
+/obj/effect/temp_visual/target/New(loc)
 	..()
 	spawn(0)
 		fall()
 
-/obj/effect/overlay/temp/target/proc/fall()
+/obj/effect/temp_visual/target/proc/fall()
 	var/turf/T = get_turf(src)
 	playsound(T,'sound/magic/Fireball.ogg', 200, 1)
-	new /obj/effect/overlay/temp/fireball(T)
+	new /obj/effect/temp_visual/fireball(T)
 	sleep(12)
 	explosion(T, 0, 0, 1, 0, 0, 0, 1)
 
@@ -161,7 +161,7 @@ Difficulty: Medium
 	visible_message("<span class='boldwarning'>Fire rains from the sky!</span>")
 	for(var/turf/turf in range(12,get_turf(src)))
 		if(prob(10))
-			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)
@@ -223,7 +223,7 @@ Difficulty: Medium
 	else
 		tturf = get_turf(src)
 	forceMove(tturf)
-	new /obj/effect/overlay/temp/dragon_swoop(tturf)
+	new /obj/effect/temp_visual/dragon_swoop(tturf)
 	animate(src, pixel_x = initial(pixel_x), pixel_z = 0, time = 10)
 	sleep(10)
 	playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1)

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

@@ -242,7 +242,7 @@ Difficulty: Hard
 							pickedtarget = pick_n_take(targets)
 						if(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)
@@ -277,10 +277,10 @@ Difficulty: Hard
 				spawn(0)
 					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(cardinal - C.moving_dir)
 	else //just release a burst of power
@@ -291,11 +291,11 @@ 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/magic/blink.ogg', 200, 1)
 	//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 diagonals)
 		spawn(0)
 			blast_wall(T, d)
@@ -304,11 +304,11 @@ 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/magic/blink.ogg', 200, 1)
 	//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 cardinal)
 		spawn(0)
 			blast_wall(T, d)
@@ -317,11 +317,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/magic/blink.ogg', 200, 1)
 	//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 alldirs)
 		spawn(0)
 			blast_wall(T, d)
@@ -331,7 +331,7 @@ Difficulty: Hard
 	var/turf/previousturf = T
 	var/turf/J = get_step(previousturf, 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, dir)
 
@@ -340,21 +340,21 @@ 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/blink.ogg', 200, 1)
 	//playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
 	playsound(source,'sound/magic/blink.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)
@@ -376,12 +376,12 @@ 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/magic/blink.ogg', 200, 1)
 	//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/magic/blink.ogg', 200, 1)
@@ -395,7 +395,7 @@ Difficulty: Hard
 		if(dist > last_dist)
 			last_dist = dist
 			sleep(1 + (burst_range - last_dist) * 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)
@@ -403,16 +403,16 @@ Difficulty: Hard
 	blink(A)
 
 //Hierophant overlays
-/obj/effect/overlay/temp/hierophant
+/obj/effect/temp_visual/hierophant
 	layer = MOB_LAYER - 0.1
 	var/mob/living/caster //who made this, anyway
 
-/obj/effect/overlay/temp/hierophant/New(loc, new_caster)
+/obj/effect/temp_visual/hierophant/New(loc, new_caster)
 	..()
 	if(new_caster)
 		caster = new_caster
 
-/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
@@ -426,7 +426,7 @@ Difficulty: Hard
 	var/currently_seeking = FALSE
 	var/friendly_fire_check = FALSE //if blasts produced apply friendly fire
 
-/obj/effect/overlay/temp/hierophant/chaser/New(loc, new_caster, new_target, new_speed, is_friendly_fire)
+/obj/effect/temp_visual/hierophant/chaser/New(loc, new_caster, new_target, new_speed, is_friendly_fire)
 	..()
 	target = new_target
 	friendly_fire_check = is_friendly_fire
@@ -435,14 +435,14 @@ Difficulty: Hard
 	spawn(0)
 		seek_target()
 
-/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 = 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)
@@ -470,27 +470,27 @@ Difficulty: Hard
 				sleep(speed)
 			targetturf = get_turf(target)
 
-/obj/effect/overlay/temp/hierophant/chaser/proc/make_blast()
-	new /obj/effect/overlay/temp/hierophant/blast(loc, caster, friendly_fire_check)
+/obj/effect/temp_visual/hierophant/chaser/proc/make_blast()
+	new /obj/effect/temp_visual/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/blast
+/obj/effect/temp_visual/hierophant/blast
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "hierophant_blast"
 	name = "vortex blast"
@@ -502,7 +502,7 @@ Difficulty: Hard
 	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/New(loc, new_caster, friendly_fire)
+/obj/effect/temp_visual/hierophant/blast/New(loc, new_caster, friendly_fire)
 	..()
 	friendly_fire_check = friendly_fire
 	if(new_caster)
@@ -513,7 +513,7 @@ Difficulty: Hard
 	spawn(0)
 		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
@@ -524,12 +524,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(L)) || L.stat == DEAD)
@@ -570,7 +570,7 @@ Difficulty: Hard
 			H.timer = world.time + 51
 			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 touch the rune with the staff, dispelling it!</span>")
 				H.rune = null
 				user.update_action_buttons_icon()

code/modules/mob/mob_movement.dm

@@ -203,9 +203,9 @@
 	if(isobj(mob.loc) || ismob(mob.loc)) //Inside an object, tell it we moved
 		var/atom/O = mob.loc
 		return O.relaymove(mob, direct)
-
+
 	if(!mob.Process_Spacemove(direct))
-		return 0
+		return 0
 
 	if(mob.restrained()) // Why being pulled while cuffed prevents you from moving
 		for(var/mob/M in orange(1, mob))
@@ -252,7 +252,7 @@
 						return
 					spawn(1)
 						M.other_mobs = null
-						M.animate_movement = 2
+						M.animate_movement = 2
 						return
 
 	else if(mob.confused)
@@ -361,13 +361,12 @@
 				spawn(0)
 					var/limit = 2//For only two trailing shadows.
 					for(var/turf/T in getline(mobloc, L.loc))
-						spawn(0)
-							anim(T,L,'icons/mob/mob.dmi',,"shadow",,L.dir)
+						new /obj/effect/temp_visual/dir_setting/ninja/shadow(T, L.dir)
 						limit--
-						if(limit<=0)	break
+						if(limit<=0)
+							break
 			else
-				spawn(0)
-					anim(mobloc,mob,'icons/mob/mob.dmi',,"shadow",,L.dir)
+				new /obj/effect/temp_visual/dir_setting/ninja/shadow(mobloc, L.dir)
 				L.forceMove(get_step(L, direct))
 			L.dir = direct
 		if(3) //Incorporeal move, but blocked by holy-watered tiles

code/modules/power/singularity/narsie.dm

@@ -31,13 +31,14 @@
 
 	var/area/A = get_area(src)
 	if(A)
-		var/image/alert_overlay = image('icons/effects/effects.dmi', "ghostalertsie")
+		var/image/alert_overlay = image('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)
 
 	narsie_spawn_animation()
 
 	sleep(70)
 	shuttle_master.emergency.request(null, 0.3) // Cannot recall
+	shuttle_master.emergency.canRecall = FALSE
 
 /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
 	makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, user, null, 1)

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

@@ -205,7 +205,7 @@
 	if(ismineralturf(target_turf))
 		var/turf/simulated/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)
@@ -328,7 +328,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