diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
index 0b9ca79290b..893ab2e148d 100644
--- a/code/_onclick/hud/blob_overmind.dm
+++ b/code/_onclick/hud/blob_overmind.dm
@@ -34,8 +34,8 @@
 
 /obj/screen/blob/Blobbernaut
 	icon_state = "ui_blobbernaut"
-	name = "Produce Blobbernaut (20)"
-	desc = "Produces a blobbernaut for 20 points."
+	name = "Produce Blobbernaut (30)"
+	desc = "Produces a blobbernaut for 30 points."
 
 /obj/screen/blob/Blobbernaut/Click()
 	if(isovermind(usr))
@@ -102,7 +102,7 @@
 	blobpwrdisplay.screen_loc = ui_health
 	blobpwrdisplay.mouse_opacity = 0
 	blobpwrdisplay.layer = 20
-	static_inventory += blobpwrdisplay
+	infodisplay += blobpwrdisplay
 
 	healths = new /obj/screen/healths/blob()
 	static_inventory += healths
diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm
index 8473ad3ca87..9f0441495bc 100644
--- a/code/_onclick/hud/guardian.dm
+++ b/code/_onclick/hud/guardian.dm
@@ -3,6 +3,9 @@
 	..()
 	var/obj/screen/using
 
+	healths = new /obj/screen/healths/guardian()
+	infodisplay += healths
+
 	using = new /obj/screen/guardian/Manifest()
 	using.screen_loc = ui_rhand
 	static_inventory += using
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 6e9ae488c53..33137e1954c 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -370,6 +370,11 @@
 	screen_loc = ui_internal
 	mouse_opacity = 0
 
+/obj/screen/healths/guardian
+	name = "summoner health"
+	screen_loc = ui_health
+	mouse_opacity = 0
+
 /obj/screen/healthdoll
 	name = "health doll"
-	screen_loc = ui_healthdoll
+	screen_loc = ui_healthdoll
diff --git a/code/game/gamemodes/changeling/powers/horror_form.dm b/code/game/gamemodes/changeling/powers/horror_form.dm
deleted file mode 100644
index f1dab9fe804..00000000000
--- a/code/game/gamemodes/changeling/powers/horror_form.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/obj/effect/proc_holder/changeling/horror_form //Horror Form: turns the changeling into a terrifying abomination
-	name = "Horror Form"
-	desc = "We tear apart our human disguise, revealing our true form."
-	helptext = "We will become an unstoppable force of destruction. We will be able to turn back into a human after some time."
-	chemical_cost = 75
-	dna_cost = 20 //Requires a massive amount of absorptions
-	req_human = 1
-
-/obj/effect/proc_holder/changeling/horror_form/sting_action(mob/living/carbon/human/user)
-	if(!user || user.notransform)
-		return 0
-	user.visible_message("<span class='warning'>[user] writhes and contorts, their body expanding to inhuman proportions!</span>", \
-						"<span class='danger'>We begin our transformation to our true form!</span>")
-	if(!do_after(user, 30, target = user))
-		user.visible_message("<span class='warning'>[user]'s transformation abruptly reverts itself!</span>", \
-							"<span class='warning'>Our transformation has been interrupted!</span>")
-		return 0
-	user.visible_message("<span class='warning'>[user] grows into an abomination and lets out an awful scream!</span>", \
-						"<span class='userdanger'>We cast off our petty shell and enter our true form!</span>")
-	var/mob/living/simple_animal/hostile/true_changeling/new_mob = new(get_turf(user))
-	new_mob.real_name = user.mind.changeling.changelingID
-	new_mob.name = new_mob.real_name
-	new_mob.stored_changeling = user
-	user.loc = new_mob
-	user.status_flags |= GODMODE
-	user.mind.transfer_to(new_mob)
-	feedback_add_details("changeling_powers","HF")
-	return 1
diff --git a/code/game/gamemodes/changeling/powers/swap_forms.dm b/code/game/gamemodes/changeling/powers/swap_forms.dm
deleted file mode 100644
index a2b1fc62c24..00000000000
--- a/code/game/gamemodes/changeling/powers/swap_forms.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-/obj/effect/proc_holder/changeling/swap_form //Swap Forms: Allows the changeling to swap minds with another human
-	name = "Swap Forms"
-	desc = "We force ourselves into the body of another form, pushing their consciousness into the form we left behind."
-	helptext = "We will bring all our abilities with us, but we will lose our old form DNA in exchange for the new one. The process will seem suspicious to any observers."
-	chemical_cost = 40
-	dna_cost = 1
-	req_human = 1 //Monkeys can't grab
-
-/obj/effect/proc_holder/changeling/swap_form/can_sting(mob/living/carbon/user)
-	if(!..())
-		return
-	var/obj/item/weapon/grab/G = user.get_active_hand()
-	if(!istype(G) || (G.state < GRAB_AGGRESSIVE))
-		user << "<span class='warning'>We must have an aggressive grab on creature in our active hand to do this!</span>"
-		return
-	var/mob/living/carbon/target = G.affecting
-	if((target.disabilities & NOCLONE) || (target.disabilities & HUSK))
-		user << "<span class='warning'>DNA of [target] is ruined beyond usability!</span>"
-		return
-	if(!ishuman(target))
-		user << "<span class='warning'>[target] is not compatible with this ability.</span>"
-		return
-	return 1
-
-
-/obj/effect/proc_holder/changeling/swap_form/sting_action(mob/living/carbon/user)
-	var/obj/item/weapon/grab/G = user.get_active_hand()
-	var/mob/living/carbon/target = G.affecting
-	var/datum/changeling/changeling = user.mind.changeling
-
-	user << "<span class='notice'>We tighen our grip. We must hold still....</span>"
-	target.do_jitter_animation(500)
-	user.do_jitter_animation(500)
-
-	if(!do_mob(user,target,20))
-		user << "<span class='warning'>The body swap has been interrupted!</span>"
-		return
-
-	target << "<span class='userdanger'>[user] tightens their grip as a painful sensation invades your body.</span>"
-
-	if(!changeling.has_dna(target.dna))
-		changeling.add_profile(target, user)
-	changeling.remove_profile(user)
-
-	var/mob/dead/observer/ghost = target.ghostize(0)
-	user.mind.transfer_to(target)
-	if(ghost && ghost.mind)
-		ghost.mind.transfer_to(user)
-	else
-		user.key = ghost.key
-
-	user.Paralyse(2)
-	target << "<span class='warning'>Our genes cry out as we swap our [user] form for [target].</span>"
diff --git a/code/game/gamemodes/changeling/powers/synaptic_enhancement.dm b/code/game/gamemodes/changeling/powers/synaptic_enhancement.dm
deleted file mode 100644
index 7bace751249..00000000000
--- a/code/game/gamemodes/changeling/powers/synaptic_enhancement.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-/obj/effect/proc_holder/changeling/synaptic_enhancement //Synaptic Enhancement; allows changelings to attack faster
-	name = "Synaptic Enhancement"
-	desc = "We redirect mental pathways to devote more energy to muscle movement."
-	helptext = "The delay between attacks and actions will be halved."
-	dna_cost = 5
-	chemical_cost = 25
-	var/active = FALSE
-
-/obj/effect/proc_holder/changeling/synaptic_enhancement/sting_action(mob/user)
-	active = !active
-	user << "<span class='notice'>We [active ? "quicken our mind" : "return to normal"].</span>"
-	if(active)
-		user.next_move_modifier = 0.5
-	else
-		user.next_move_modifier = initial(user.next_move_modifier)
-	feedback_add_details("changeling_powers","SE")
-	return 1
-
-/obj/effect/proc_holder/changeling/synaptic_enhancement/on_refund(mob/user)
-	user.next_move_modifier = initial(user.next_move_modifier)
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 1e6e563a1fa..d3d5d4b026a 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -143,8 +143,8 @@
 		C.reset_perspective(null)
 		if(remote_eye.visible_icon)
 			C.client.images -= remote_eye.user_image
-//		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
-//			C.client.images -= chunk.obscured
+		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
+			C.client.images -= chunk.obscured
 	C.remote_control = null
 	C.unset_machine()
 	src.Remove(C)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 863ef140120..07bd6b78ed7 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -175,12 +175,8 @@ Class Procs:
 			else
 				target = C
 	if(target && !target.buckled && !target.buckled_mob)
-		target.reset_perspective(src)
 		occupant = target
-		target.loc = src
-		target.stop_pulling()
-		if(target.pulledby)
-			target.pulledby.stop_pulling()
+		target.forceMove(src)
 	updateUsrDialog()
 	update_icon()
 
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index a53180bd568..fa5c0c83b28 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -84,7 +84,7 @@
 
 	R.stat = UNCONSCIOUS
 	R.update_stat()
-	if(R.camera && !R.wires.IsCameraCut())
+	if(R.camera && !R.wires.is_cut(WIRE_CAMERA))
 		R.camera.toggle_cam(R,0)
 	dead_mob_list -= R //please never forget this ever kthx
 	living_mob_list += R
@@ -294,4 +294,4 @@
 			cyborg << "<span class='notice'>Self-repair is active in <span class='boldnotice'>[msgmode]</span> mode.</span>"
 			msg_cooldown = world.time
 	else
-		deactivate()
+		deactivate()
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index b7efcf93052..c761431995a 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -169,14 +169,12 @@
 				return
 			if(user.internal == src)
 				user.internal = null
-				user.internals.icon_state = "internal0"
 				user << "<span class='notice'>You close the tank release valve.</span>"
 				user.update_internals_hud_icon(0)
 				. = TRUE
 			else
 				if(user.wear_mask && (user.wear_mask.flags & MASKINTERNALS))
 					user.internal = src
-					user.internals.icon_state = "internal1"
 					user << "<span class='notice'>You open \the [src] valve.</span>"
 					user.update_internals_hud_icon(1)
 					. = TRUE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index fb0a6616f4d..7882568fe07 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -85,8 +85,8 @@
 			return
 
 		if(occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic.
-			occupant.Sleeping(occupant.bodytemperature / sleep_factor) * 100)
-			occupant.Paralyse(occupant.bodytemperature / paralyze_factor) * 100)
+			occupant.Sleeping((occupant.bodytemperature / sleep_factor) * 100)
+			occupant.Paralyse((occupant.bodytemperature / paralyze_factor) * 100)
 
 		if(beaker)
 			if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 364cc3e7f96..e97420afbde 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -722,6 +722,7 @@ var/const/GALOSHES_DONT_HELP = 4
 	eye_blurry = 0
 	ear_deaf = 0
 	ear_damage = 0
+	hallucination = 0
 	heal_overall_damage(1000, 1000)
 	ExtinguishMob()
 	fire_stacks = 0
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 70c66179119..3dcc0f30172 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -264,7 +264,7 @@ Sorry Giacom. Please don't be mad :(
 /mob/living/proc/adjustToxLoss(amount, updating_health=1)
 	if(status_flags & GODMODE)
 		return 0
-	toxloss = Clamp(toxloss + amount, 0, maxHealth*2
+	toxloss = Clamp(toxloss + amount, 0, maxHealth*2)
 	if(updating_health)
 		updatehealth()
 
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index c9a6292ee56..d5bec802eb6 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -113,7 +113,7 @@
 		if(summoner.stat == UNCONSCIOUS)
 			summoner << "<span class='danger'><B>Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!</span></B>"
 			summoner.adjustCloneLoss(amount*0.5) //dying hosts take 50% bonus damage as cloneloss
-		updatehudhealth()
+		update_health_hud()
 
 /mob/living/simple_animal/hostile/guardian/ex_act(severity, target)
 	switch(severity)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index bcbf95f0b2f..59f9a7303f3 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -288,7 +288,7 @@
 	if(status_flags & GODMODE)
 		return 0
 	bruteloss = Clamp(bruteloss + amount, 0, maxHealth)
-	handle_regular_status_updates()
+	updatehealth()
 	return amount
 
 /mob/living/simple_animal/adjustBruteLoss(amount)
diff --git a/tgstation.dme b/tgstation.dme
index 8741b2351cf..91da5d0781d 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -111,7 +111,8 @@
 #include "code\_onclick\hud\other_mobs.dm"
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\screen_objects.dm"
-#include "code\_onclick\hud\swarmer.dm"#include "code\controllers\admin.dm"
+#include "code\_onclick\hud\swarmer.dm"
+#include "code\controllers\admin.dm"
 #include "code\controllers\configuration.dm"
 #include "code\controllers\controller.dm"
 #include "code\controllers\failsafe.dm"
@@ -304,7 +305,6 @@
 #include "code\game\gamemodes\changeling\powers\glands.dm"
 #include "code\game\gamemodes\changeling\powers\headcrab.dm"
 #include "code\game\gamemodes\changeling\powers\hivemind.dm"
-#include "code\game\gamemodes\changeling\powers\horror_form.dm"
 #include "code\game\gamemodes\changeling\powers\humanform.dm"
 #include "code\game\gamemodes\changeling\powers\lesserform.dm"
 #include "code\game\gamemodes\changeling\powers\mimic_voice.dm"
@@ -314,8 +314,6 @@
 #include "code\game\gamemodes\changeling\powers\shriek.dm"
 #include "code\game\gamemodes\changeling\powers\spiders.dm"
 #include "code\game\gamemodes\changeling\powers\strained_muscles.dm"
-#include "code\game\gamemodes\changeling\powers\swap_forms.dm"
-#include "code\game\gamemodes\changeling\powers\synaptic_enhancement.dm"
 #include "code\game\gamemodes\changeling\powers\tiny_prick.dm"
 #include "code\game\gamemodes\changeling\powers\transform.dm"
 #include "code\game\gamemodes\cult\cult.dm"