diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 649a868077d..1a5866a5e4a 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -344,6 +344,10 @@
 		to_chat(user, "[choice] is already dead!")
 		used = FALSE
 		return
+	else if(choice == user)
+		user << "You feel like writing your own name into a cursed death warrant would be unwise."
+		used = FALSE
+		return
 	else
 		var/mob/living/L = choice
 
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 11d6b68aeec..bd916532519 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -95,7 +95,8 @@
 	visible_message(
 		"<span class='danger'>[src] devours [L]!</span>",
 		"<span class='userdanger'>You feast on [L], restoring your health!</span>")
-	adjustBruteLoss(-L.maxHealth/2)
+	if(!is_station_level(z) && !client) //NPC monsters won't heal while on station
+		adjustBruteLoss(-L.maxHealth/2)
 	L.gib()
 
 /mob/living/simple_animal/hostile/megafauna/ex_act(severity, target)
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index f7b5a36e1a9..afa7bdc3cd1 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -246,7 +246,8 @@
 		/obj/machinery/teleport/station,
 		/obj/machinery/teleport/hub,
 		/obj/machinery/telepad,
-		/obj/machinery/clonepod
+		/obj/machinery/clonepod,
+		/obj/effect/hierophant
 	)
 	if(A)
 		if(is_type_in_list(A, blacklist))