diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index faf3b4b8cb3..2fa6c6f430f 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -323,3 +323,9 @@
 /obj/item/chair/wood/wings
 	icon_state = "wooden_chair_wings_toppled"
 	origin_type = /obj/structure/chair/wood/wings
+
+/obj/structure/chair/old
+	name = "strange chair"
+	desc = "You sit in this. Either by will or force. Looks REALLY uncomfortable."
+	icon_state = "chairold"
+	item_chair = null
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 8384ac130e1..9a24b5cb59e 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -11,6 +11,17 @@
 	explosion_block = 50
 	layer = TURF_LAYER + 0.05
 
+/turf/closed/indestructible/oldshuttle
+	name = "strange shuttle wall"
+	icon = 'icons/turf/shuttleold.dmi'
+	icon_state = "block"
+
+/turf/closed/indestructible/oldshuttle/corner
+	icon_state = "corner"
+
+
+
+
 /turf/closed/indestructible/splashscreen
 	name = "Space Station 13"
 	icon = 'icons/misc/fullscreen.dmi'
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index c8b395a0c84..0fad83071bb 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -106,3 +106,8 @@
 
 /turf/open/floor/noslip/MakeSlippery()
 	return
+
+/turf/open/floor/oldshuttle
+	icon = 'icons/turf/shuttleold.dmi'
+	icon_state = "floor"
+	floor_tile = /obj/item/stack/tile/plasteel
\ No newline at end of file
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 868c2204346..119b30287c9 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 44382c1f48e..3f0b5eb70c9 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index b1b422eb558..29fed5de145 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 58430a3543a..33cb50421a4 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 427b6b81017..1507564f679 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -14,7 +14,8 @@
 
 // BEGIN_INCLUDE
 #include "_maps\__MAP_DEFINES.dm"
-#include "_maps\tgstation2.dm"
+#include "_maps\bigmap.dm"
+#include "_maps\RandomRuins\LavaRuins\lavaland_surface_relicofthepast.dmm"
 #include "code\_compile_options.dm"
 #include "code\hub.dm"
 #include "code\world.dm"
@@ -1451,6 +1452,7 @@
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\bat.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm"
+#include "code\modules\mob\living\simple_animal\hostile\retaliate\spaceman.dm"
 #include "code\modules\mob\living\simple_animal\slime\death.dm"
 #include "code\modules\mob\living\simple_animal\slime\emote.dm"
 #include "code\modules\mob\living\simple_animal\slime\life.dm"