diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm
index d008f36e29..68ab30478d 100644
--- a/code/game/area/areas/shuttles.dm
+++ b/code/game/area/areas/shuttles.dm
@@ -1,5 +1,6 @@
 
 //These are shuttle areas; all subtypes are only used as teleportation markers, they have no actual function beyond that.
+//Multi area shuttles are a thing now, use subtypes! ~ninjanomnom
 
 /area/shuttle
 	name = "Shuttle"
@@ -10,6 +11,33 @@
 	valid_territory = FALSE
 	icon_state = "shuttle"
 
+////////////////////////////Multi-area shuttles////////////////////////////
+
+////////////////////////////Syndicate infiltrator////////////////////////////
+
+/area/shuttle/syndicate
+	name = "Syndicate Infiltrator"
+	blob_allowed = FALSE
+
+/area/shuttle/syndicate/bridge
+	name = "Syndicate Infiltrator Control"
+
+/area/shuttle/syndicate/medical
+	name = "Syndicate Infiltrator Medbay"
+
+/area/shuttle/syndicate/armory
+	name = "Syndicate Infiltrator Armory"
+
+/area/shuttle/syndicate/eva
+	name = "Syndicate Infiltrator EVA"
+
+/area/shuttle/syndicate/hallway
+
+/area/shuttle/syndicate/airlock
+	name = "Syndicate Infiltrator Airlock"
+
+////////////////////////////Single-area shuttles////////////////////////////
+
 /area/shuttle/transit
 	name = "Hyperspace"
 	desc = "Weeeeee"
@@ -48,10 +76,6 @@
 	name = "Transport Shuttle"
 	blob_allowed = FALSE
 
-/area/shuttle/syndicate
-	name = "Syndicate Infiltrator"
-	blob_allowed = FALSE
-
 /area/shuttle/assault_pod
 	name = "Steel Rain"
 	blob_allowed = FALSE
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index b81aa7d4d8..460fc62bec 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -321,11 +321,12 @@
 /obj/structure/falsewall/plastitanium
 	name = "wall"
 	desc = "An evil wall of plasma and titanium."
-	icon = 'icons/turf/shuttle.dmi'
-	icon_state = "wall3"
+	icon = 'icons/turf/walls/plastitanium_wall.dmi'
+	icon_state = "shuttle"
 	mineral = /obj/item/stack/sheet/mineral/plastitanium
 	walltype = /turf/closed/wall/mineral/plastitanium
-	smooth = SMOOTH_FALSE
+	smooth = SMOOTH_MORE
+	canSmoothWith = list(/turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater)
 
 /obj/structure/falsewall/brass
 	name = "clockwork wall"
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 170a651315..59db363399 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -588,10 +588,10 @@
 	flags_1 = PREVENT_CLICK_UNDER_1
 	reinf = TRUE
 	heat_resistance = 1600
-	armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
+	armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
 	smooth = SMOOTH_TRUE
 	canSmoothWith = null
-	explosion_block = 1
+	explosion_block = 3
 	level = 3
 	glass_type = /obj/item/stack/sheet/rglass
 	glass_amount = 2
@@ -602,6 +602,26 @@
 /obj/structure/window/shuttle/tinted
 	opacity = TRUE
 
+/obj/structure/window/plastitanium
+	name = "plastitanium window"
+	desc = "An evil looking window of plasma and titanium."
+	icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
+	icon_state = "plastitanium_window"
+	dir = FULLTILE_WINDOW_DIR
+	max_integrity = 100
+	wtype = "shuttle"
+	fulltile = TRUE
+	flags_1 = PREVENT_CLICK_UNDER_1
+	reinf = TRUE
+	heat_resistance = 1600
+	armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
+	smooth = SMOOTH_TRUE
+	canSmoothWith = null
+	explosion_block = 3
+	level = 3
+	glass_type = /obj/item/stack/sheet/rglass
+	glass_amount = 2
+
 /obj/structure/window/reinforced/clockwork
 	name = "brass window"
 	desc = "A paper-thin pane of translucent yet reinforced brass."
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index 05d6de5ca6..6ae60a6e49 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -170,11 +170,14 @@
 	explosion_block = 3
 	canSmoothWith = list(/turf/closed/wall/mineral/abductor, /obj/structure/falsewall/abductor)
 
+/////////////////////Titanium walls/////////////////////
+
 /turf/closed/wall/mineral/titanium //has to use this path due to how building walls works
 	name = "wall"
 	desc = "A light-weight titanium wall used in shuttles."
 	icon = 'icons/turf/walls/shuttle_wall.dmi'
 	icon_state = "map-shuttle"
+	explosion_block = 3
 	flags_1 = CAN_BE_DIRTY_1 | CHECK_RICOCHET_1
 	sheet_type = /obj/item/stack/sheet/mineral/titanium
 	smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
@@ -230,14 +233,31 @@
 /turf/closed/wall/mineral/titanium/survival/pod
 	canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/shuttle, /obj/structure/shuttle/engine)
 
+/////////////////////Plastitanium walls/////////////////////
+
 /turf/closed/wall/mineral/plastitanium
 	name = "wall"
 	desc = "An evil wall of plasma and titanium."
-	icon = 'icons/turf/shuttle.dmi'
-	icon_state = "wall3"
+	icon = 'icons/turf/walls/plastitanium_wall.dmi'
+	icon_state = "map-shuttle"
+	explosion_block = 4
 	sheet_type = /obj/item/stack/sheet/mineral/plastitanium
+	smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
+	canSmoothWith = list(/turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/plastitanium, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
+
+/turf/closed/wall/mineral/plastitanium/nodiagonal
+	smooth = SMOOTH_MORE
+	icon_state = "map-shuttle_nd"
+
+/turf/closed/wall/mineral/plastitanium/nosmooth
+	icon = 'icons/turf/shuttle.dmi'
+	icon_state = "wall"
 	smooth = SMOOTH_FALSE
 
+/turf/closed/wall/mineral/plastitanium/overspace
+	icon_state = "map-overspace"
+	fixed_underlay = list("space"=1)
+
 //have to copypaste this code
 /turf/closed/wall/mineral/plastitanium/interior/copyTurf(turf/T)
 	if(T.type != type)
diff --git a/icons/obj/smooth_structures/plastitanium_window.dmi b/icons/obj/smooth_structures/plastitanium_window.dmi
new file mode 100644
index 0000000000..82ac030615
Binary files /dev/null and b/icons/obj/smooth_structures/plastitanium_window.dmi differ
diff --git a/icons/turf/walls/plastitanium_wall.dmi b/icons/turf/walls/plastitanium_wall.dmi
new file mode 100644
index 0000000000..3cd7332b6a
Binary files /dev/null and b/icons/turf/walls/plastitanium_wall.dmi differ