diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm
index 01a295634f..cd731c2c3b 100644
--- a/code/__DEFINES/maths.dm
+++ b/code/__DEFINES/maths.dm
@@ -108,7 +108,8 @@
 #define TORADIANS(degrees) ((degrees) * 0.0174532925)
 
 /// Gets shift x that would be required the bitflag (1<<x)
-#define TOBITSHIFT(bit) ( log(2, bit) )
+/// We need the round because log has floating-point inaccuracy, and if we undershoot at all on list indexing we'll get the wrong index.
+#define TOBITSHIFT(bit) ( round(log(2, bit), 1) )
 
 // Will filter out extra rotations and negative rotations
 // E.g: 540 becomes 180. -180 becomes 180.
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index d3b54bfd87..a8105f13a6 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -265,7 +265,7 @@
 	static_inventory += using
 
 	inv_box = new /atom/movable/screen/inventory()
-	inv_box.name = "i_clothing"
+	inv_box.name = "uniform"
 	inv_box.icon = ui_style
 	inv_box.slot_id = ITEM_SLOT_ICLOTHING
 	inv_box.icon_state = "uniform"
@@ -273,7 +273,7 @@
 	toggleable_inventory += inv_box
 
 	inv_box = new /atom/movable/screen/inventory()
-	inv_box.name = "o_clothing"
+	inv_box.name = "suit"
 	inv_box.icon = ui_style
 	inv_box.slot_id = ITEM_SLOT_OCLOTHING
 	inv_box.icon_state = "suit"
@@ -329,7 +329,7 @@
 	static_inventory += inv_box
 
 	inv_box = new /atom/movable/screen/inventory()
-	inv_box.name = "storage1"
+	inv_box.name = "left pocket"
 	inv_box.icon = ui_style
 	inv_box.icon_state = "pocket"
 	inv_box.screen_loc = ui_storage1
@@ -337,7 +337,7 @@
 	static_inventory += inv_box
 
 	inv_box = new /atom/movable/screen/inventory()
-	inv_box.name = "storage2"
+	inv_box.name = "right pocket"
 	inv_box.icon = ui_style
 	inv_box.icon_state = "pocket"
 	inv_box.screen_loc = ui_storage2
diff --git a/code/datums/elements/photosynthesis.dm b/code/datums/elements/photosynthesis.dm
index 1efe1d3597..ba51875a4a 100644
--- a/code/datums/elements/photosynthesis.dm
+++ b/code/datums/elements/photosynthesis.dm
@@ -39,7 +39,7 @@
 	attached_atoms[target]++
 
 /datum/element/photosynthesis/Detach(datum/target)
-	if(attached_atoms)
+	if(attached_atoms && LAZYLEN(attached_atoms))
 		attached_atoms[target]--
 		if(!attached_atoms[target])
 			attached_atoms -= target
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index b00c7d5155..d6261bb259 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -88,7 +88,7 @@
 	/// A lazy list of statuses to add next to this mind in the traitor panel
 	var/list/special_statuses
 
-/datum/mind/New(var/key)
+/datum/mind/New(key)
 	skill_holder = new(src)
 	src.key = key
 	soulOwner = src
diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm
index 5190900b24..37da0c80bf 100644
--- a/code/datums/mutations/actions.dm
+++ b/code/datums/mutations/actions.dm
@@ -479,7 +479,6 @@
 	been_places = TRUE
 	chems = new
 	chems.transfered = WEAKREF(embedded_mob)
-	chems.spikey = src
 	var/mob/fired_by_mob = fired_by.resolve()
 	if(fired_by_mob)
 		to_chat(fired_by_mob, span_notice("Link established! Use the \"Transfer Chemicals\" ability to send your chemicals to the linked target!"))
@@ -514,4 +513,3 @@
 	//this is where it would deal damage, if it transfers chems it removes itself so no damage
 	spikey.forceMove(get_turf(L))
 	transfered_mob.visible_message(span_notice("[spikey] falls out of [transfered_mob]!"))
-
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 6512f2e7b0..6a343cf4bd 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1494,7 +1494,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 				to_chat(usr, "<span class='warning'>[C] is dead!")
 				return
 			else
-				C.goodbye(C) //sandstorm punish and ends here.
+				C.goodbye() //sandstorm punish and ends here.
 		if(ADMIN_PUNISHMENT_TABLETIDESTATIONWIDE) //SPLURT punishments start here
 			priority_announce(html_decode("[target] has brought the wrath of the gods upon themselves and is now being tableslammed across the station. Please stand by."), null, 'sound/misc/announce.ogg', "CentCom")
 			var/list/areas = list()
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 9d77f25c47..d76d4ffb75 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -766,9 +766,9 @@
 	background_icon_state = "bg_alien"
 	var/datum/species/jelly/stargazer/species
 
-/datum/action/innate/link_minds/New(_species)
+/datum/action/innate/link_minds/New(species)
 	..()
-	species = _species
+	src.species = species
 
 /datum/action/innate/link_minds/Destroy()
 	species = null
@@ -796,3 +796,7 @@
 		else
 			to_chat(H, "<span class='warning'>You can't seem to link [target]'s mind...</span>")
 			to_chat(target, "<span class='warning'>The foreign presence leaves your mind.</span>")
+
+/datum/action/innate/link_minds/Destroy()
+	species = null
+	return ..()
diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm
index ce398f3e2a..8f0d0fd6c0 100644
--- a/code/modules/spells/spell_types/ethereal_jaunt.dm
+++ b/code/modules/spells/spell_types/ethereal_jaunt.dm
@@ -55,7 +55,7 @@
 				if(T)
 					if(target.Move(T))
 						break
-		REMOVE_TRAIT(target, TRAIT_MOBILITY_NOMOVE, src)
+		REMOVE_TRAIT(target, TRAIT_MOBILITY_NOMOVE, MAGIC_TRAIT)
 		target.update_mobility()
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
diff --git a/modular_sand/code/modules/mob/living/living.dm b/modular_sand/code/modules/mob/living/living.dm
index 59c460efa7..d334af9829 100644
--- a/modular_sand/code/modules/mob/living/living.dm
+++ b/modular_sand/code/modules/mob/living/living.dm
@@ -35,26 +35,26 @@
 		if(1.21 to INFINITY)
 			mob_size = MOB_SIZE_LARGE
 
-//It's here so it doesn't make a big mess on randomverbs.dm,
-//also because of this you can proccall it, why would you if you have smite?
+// It's here so it doesn't make a big mess on randomverbs.dm,
+// also because of this you can proccall it, why would you if you have smite?
 // This code was bad. For future reference, stoplag() and sleep() are very different and not at all interchangeable.
 // You can also use animate() to cleanly animate variables like alpha.
 // Finally, NEVER call Destroy() directly.
-/mob/living/proc/goodbye(C)
+/mob/living/proc/goodbye()
 	set waitfor = FALSE
-	if(isanimal(C))
-		var/mob/living/simple_animal/D = C
-		D.toggle_ai(AI_OFF)
-	AllImmobility(900, TRUE, TRUE) // Complete 15 minutes of stun, hopefully they shouldn't take that long
-	playsound(C, "modular_sand/sound/effects/admin_punish/changetheworld.ogg", 100, FALSE)
+	if(isanimal(src))
+		var/mob/living/simple_animal/simple_animal = src
+		simple_animal.toggle_ai(AI_OFF)
+	AllImmobility(INFINITY, TRUE, TRUE)
+	playsound(src, "modular_sand/sound/effects/admin_punish/changetheworld.ogg", 100, FALSE)
 	say("Change the world")
 	sleep(20)
-	playsound(C, "modular_sand/sound/effects/admin_punish/myfinalmessage.ogg", 100, FALSE)
+	playsound(src, "modular_sand/sound/effects/admin_punish/myfinalmessage.ogg", 100, FALSE)
 	say("My final message")
 	sleep(20)
-	playsound(C, "modular_sand/sound/effects/admin_punish/goodbye.ogg", 100, FALSE)
+	playsound(src, "modular_sand/sound/effects/admin_punish/goodbye.ogg", 100, FALSE)
 	say("Goodbye.")
 	sleep(20)
-	playsound(C, "modular_sand/sound/effects/admin_punish/endjingle.ogg", 100, FALSE)
+	playsound(src, "modular_sand/sound/effects/admin_punish/endjingle.ogg", 100, FALSE)
 	animate(src, alpha = 10, 3.5 SECONDS)
 	QDEL_IN(src, 2)