Merge pull request #7039 from Citadel-Station-13/upstream-merge-38279

[MIRROR] Fix pAI suicide while in holoform deleting the card

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

@@ -3,8 +3,6 @@
 		return
 	stat = DEAD
 	canmove = 0
-	card.removePersonality()
-	card.forceMove(loc)
 	update_sight()
 	clear_fullscreens()
 

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

@@ -90,6 +90,11 @@
 	return FALSE
 
 /mob/living/silicon/pai/Destroy()
+	if (loc != card)
+		card.forceMove(drop_location())
+	card.pai = null
+	card.cut_overlays()
+	card.add_overlay("pai-off")
 	GLOB.pai_list -= src
 	return ..()
 

code/modules/mob/living/silicon/pai/pai_shell.dm

@@ -57,7 +57,7 @@
 	if(client)
 		client.perspective = EYE_PERSPECTIVE
 		client.eye = card
-	var/turf/T = get_turf(src)
+	var/turf/T = drop_location()
 	card.forceMove(T)
 	forceMove(card)
 	canmove = FALSE