diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index cae97fe91c8..011436675df 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -470,6 +470,8 @@
 	icon_dead = "penguin_baby_dead"
 
 /mob/living/simple_animal/penguin/holodeck/emperor
+	name = "emperor penguin"
+	desc = "Emperor of all he surveys."
 
 /mob/living/simple_animal/penguin/holodeck/gib()
 	derez() //holograms can't gib
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 1f025901d7e..4d6de6246af 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -302,7 +302,7 @@
 // Penguins
 
 /mob/living/simple_animal/penguin
-	name = "\improper King penguin"
+	name = "penguin"
 	desc = "A king of the icy regions."
 	icon_state = "penguin"
 	icon_living = "penguin"
@@ -310,7 +310,7 @@
 	speak = list("Gah Gah!", "NOOT NOOT!", "NOOT!", "Noot", "noot", "Prah!", "Grah!")
 	speak_emote = list("squawks", "gakkers")
 	emote_hear = list("squawk!", "gakkers!", "noots.","NOOTS!")
-	emote_see = list("shakes its beak.", "flaps its wings.","preens itself.")
+	emote_see = list("shakes its beak", "flaps its wings","preens itself")
 	faction = list("penguin")
 	speak_chance = 1
 	turns_per_move = 10
@@ -318,9 +318,10 @@
 	response_disarm = "bops"
 	response_harm   = "kicks"
 	attacktext = "kicked"
+	mob_size = 2
 
 /mob/living/simple_animal/penguin/baby
-	name = "\improper baby penguin"
+	name = "baby penguin"
 	desc = "Can't fly and barely waddles, yet the prince of all chicks."
 	icon_state = "penguin_baby"
 	icon_living = "penguin_baby"
@@ -334,7 +335,6 @@
 	desc = "Who would do such a thing? You monster!"
 
 /mob/living/simple_animal/penguin/emperor
-	name = "Emperor penguin"
+	name = "emperor penguin"
 	desc = "Emperor of all he surveys."
-	density = 0
-	mob_size = 2
+
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 208c4289da1..da9e6e83e87 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -3716,7 +3716,7 @@
 /turf/space/transit/north/shuttlespace_ns12,
 /area/template_noop)
 "akd" = (
-/turf/simulated/shuttle/plating,
+/turf/space,
 /turf/simulated/shuttle/wall/dark{
 	dir = 8;
 	icon_state = "diagonalWall3"
@@ -3744,7 +3744,7 @@
 /turf/template_noop,
 /area/shuttle/syndicate_elite/mothership)
 "akh" = (
-/turf/simulated/shuttle/plating,
+/turf/space,
 /turf/simulated/shuttle/wall/dark{
 	dir = 6;
 	icon_state = "diagonalWall3"
@@ -4309,8 +4309,9 @@
 /turf/space/transit/north/shuttlespace_ns8,
 /area/template_noop)
 "alt" = (
-/turf/simulated/shuttle/plating,
+/turf/space,
 /turf/simulated/shuttle/wall/dark{
+	dir = 5;
 	icon_state = "diagonalWall3"
 	},
 /area/shuttle/syndicate_elite/mothership)
@@ -4329,7 +4330,7 @@
 /turf/simulated/shuttle/plating,
 /area/shuttle/syndicate_elite/mothership)
 "alv" = (
-/turf/simulated/shuttle/plating,
+/turf/space,
 /turf/simulated/shuttle/wall/dark{
 	dir = 4;
 	icon_state = "diagonalWall3"
@@ -22116,6 +22117,42 @@
 	icon_state = "diagonalWall3"
 	},
 /area/space)
+"aWO" = (
+/turf/space,
+/turf/simulated/shuttle/wall/dark{
+	dir = 8;
+	icon_state = "diagonalWall3"
+	},
+/area/syndicate_mothership{
+	name = "\improper Ninja Base"
+	})
+"aWP" = (
+/turf/space,
+/turf/simulated/shuttle/wall/dark{
+	dir = 6;
+	icon_state = "diagonalWall3"
+	},
+/area/syndicate_mothership{
+	name = "\improper Ninja Base"
+	})
+"aWQ" = (
+/obj/structure/table/rack,
+/obj/item/weapon/storage/toolbox/syndicate,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/syndicate_mothership{
+	name = "\improper Ninja Base"
+	})
+"aWR" = (
+/turf/space,
+/turf/simulated/shuttle/wall/dark{
+	dir = 4;
+	icon_state = "diagonalWall3"
+	},
+/area/syndicate_mothership{
+	name = "\improper Ninja Base"
+	})
 
 (1,1,1) = {"
 aaa
@@ -61748,7 +61785,7 @@ aaM
 aaM
 aaM
 ahq
-aki
+aWO
 akj
 akF
 akK
@@ -62263,7 +62300,7 @@ aaM
 aaM
 ahq
 akk
-aky
+aWQ
 aky
 aky
 akW
@@ -62776,7 +62813,7 @@ aaM
 aaM
 aaM
 ahq
-aki
+aWP
 akj
 akF
 akK
@@ -62784,7 +62821,7 @@ akK
 akZ
 akj
 akj
-aki
+aWR
 ahq
 aaM
 aaM