From 14ca4935fa430ee4676a0e4c27ca9c63fb703734 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Sat, 27 Jan 2018 21:11:47 -0200
Subject: [PATCH] Fixes #4166 (#4171)

What the title says.
Also, fixes a minor issue with ghost traps.
---
 code/modules/ghosttrap/trap.dm           | 6 +++---
 code/modules/holodeck/HolodeckControl.dm | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm
index 47ea32c6394..f061720992a 100644
--- a/code/modules/ghosttrap/trap.dm
+++ b/code/modules/ghosttrap/trap.dm
@@ -394,7 +394,7 @@ datum/ghosttrap/pai/transfer_personality(var/mob/candidate, var/mob/living/silic
 	object = "Vampire"
 	pref_check = MODE_VAMPIRE
 	ghost_trap_message = "They are occupying a vampire."
-	ghost_trap_role = "vampire"
+	ghost_trap_role = "Vampire"
 	ban_checks = list(MODE_VAMPIRE)
 	can_set_own_name = FALSE
 	list_as_special_role = FALSE
@@ -417,7 +417,7 @@ datum/ghosttrap/pai/transfer_personality(var/mob/candidate, var/mob/living/silic
 /datum/ghosttrap/brainwashed
 	object = "split personality"
 	ghost_trap_message = "They are a split personality now."
-	ghost_trap_role = "pAI"
+	ghost_trap_role = "split personality"
 	can_set_own_name = TRUE
 	list_as_special_role = TRUE
 
@@ -427,7 +427,7 @@ datum/ghosttrap/pai/transfer_personality(var/mob/candidate, var/mob/living/silic
 /datum/ghosttrap/friend
 	object = "friend"
 	ghost_trap_message = "They are an imaginary friend now."
-	ghost_trap_role = "pAI"
+	ghost_trap_role = "imaginary friend"
 	can_set_own_name = TRUE
 	list_as_special_role = TRUE
 
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index aaaa21c9313..df0cb6e99d0 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -180,6 +180,10 @@
 			if (get_area(C.loc) != linkedholodeck)
 				holographic_mobs -= C
 				C.derez()
+		for(var/mob/living/simple_animal/penguin/holodeck/P in holographic_mobs)
+			if (get_area(P.loc) != linkedholodeck)
+				holographic_mobs -= P
+				P.derez()
 
 	if(inoperable())
 		return
@@ -266,6 +270,10 @@
 		holographic_mobs -= C
 		C.derez()
 
+	for(var/mob/living/simple_animal/penguin/holodeck/P in holographic_mobs)
+		holographic_mobs -= P
+		P.derez()
+
 	for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
 		qdel(B)