diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index 73571bc684..c002e66d53 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -89,7 +89,7 @@
 /turf/open/floor/pod/dark,
 /area/shuttle/pirate)
 "aj" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
 /area/shuttle/pirate)
 "ak" = (
 /obj/machinery/airalarm/all_access{
@@ -464,19 +464,19 @@
 /turf/open/floor/plating,
 /area/shuttle/pirate)
 "aQ" = (
-/obj/machinery/porta_turret/syndicate/energy{
+/obj/machinery/porta_turret/syndicate/energy/pirate{
 	dir = 1;
 	faction = list("pirate");
 	icon_state = "standard_lethal"
 	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
 /area/shuttle/pirate)
 "aR" = (
-/obj/machinery/porta_turret/syndicate/energy{
+/obj/machinery/porta_turret/syndicate/energy/pirate{
 	faction = list("pirate");
 	icon_state = "standard_lethal"
 	},
-/turf/closed/wall/mineral/plastitanium/pirate,
+/turf/closed/wall/r_wall/syndicate/pirate,
 /area/shuttle/pirate)
 "aS" = (
 /obj/effect/turf_decal/stripes/line,
@@ -485,7 +485,7 @@
 /area/shuttle/pirate)
 "aU" = (
 /obj/structure/sign/departments/engineering,
-/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
 /area/shuttle/pirate)
 "aV" = (
 /obj/effect/mob_spawn/human/pirate{
@@ -890,12 +890,12 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/pirate)
 "df" = (
-/obj/machinery/porta_turret/syndicate/energy{
+/obj/machinery/porta_turret/syndicate/energy/pirate{
 	dir = 4;
 	faction = list("pirate");
 	icon_state = "standard_lethal"
 	},
-/turf/closed/wall/mineral/plastitanium/pirate,
+/turf/closed/wall/r_wall/syndicate/pirate,
 /area/shuttle/pirate)
 "dy" = (
 /obj/structure/chair/wood/normal,
@@ -1014,7 +1014,7 @@
 /turf/open/floor/plasteel,
 /area/shuttle/pirate)
 "fW" = (
-/turf/closed/wall/mineral/plastitanium/pirate,
+/turf/closed/wall/r_wall/syndicate/pirate,
 /area/shuttle/pirate)
 "fY" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -1082,12 +1082,12 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/shuttle/pirate)
 "wR" = (
-/obj/machinery/porta_turret/syndicate/energy{
+/obj/machinery/porta_turret/syndicate/energy/pirate{
 	dir = 8;
 	faction = list("pirate");
 	icon_state = "standard_lethal"
 	},
-/turf/closed/wall/mineral/plastitanium/pirate,
+/turf/closed/wall/r_wall/syndicate/pirate,
 /area/shuttle/pirate)
 "yi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index b68d6ceead..53f2afd227 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -27,7 +27,7 @@
 
 	max_integrity = 160		//the turret's health
 	integrity_failure = 80
-	armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+	armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
 
 	var/locked = TRUE			//if the turret's behaviour control access is locked
 	var/controllock = FALSE		//if the turret responds to control panels
@@ -687,9 +687,6 @@
 	lethal_projectile = /obj/item/projectile/beam/laser
 	lethal_projectile_sound = 'sound/weapons/laser.ogg'
 	desc = "An energy blaster auto-turret. Use a welder to fix."
-	explosion_block = 50
-	max_integrity = 260
-	integrity_failure = 20
 
 
 /obj/machinery/porta_turret/syndicate/energy/heavy
@@ -703,6 +700,10 @@
 	lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
 	desc = "An energy blaster auto-turret."
 
+/obj/machinery/porta_turret/syndicate/energy/pirate
+	max_integrity = 260
+	integrity_failure = 20
+
 
 /obj/machinery/porta_turret/syndicate/setup()
 	return
diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm
index 71615083b6..8910e69a69 100644
--- a/code/game/objects/effects/spawners/structure.dm
+++ b/code/game/objects/effects/spawners/structure.dm
@@ -166,8 +166,6 @@ again.
 //plastitanium pirate window
 
 /obj/effect/spawner/structure/window/plastitanium/pirate
-	explosion_block = 50
-	spawn_list = list(/obj/structure/grille, /obj/structure/window/plastitanium/pirate)
 
 //ice window
 
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 08d013d4da..d4925c8604 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -598,7 +598,7 @@
 //pirate ship windows
 /obj/structure/window/plastitanium/pirate
 	desc = "Yarr this window be explosion proof!"
-	explosion_block = 50
+	explosion_block = 30
 
 /obj/structure/window/plastitanium/pirate/unanchored
 	anchored = FALSE
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index ae25ec2d33..b04f4f0aa0 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -302,20 +302,4 @@
 
 /turf/closed/wall/mineral/plastitanium/copyTurf(turf/T)
 	. = ..()
-	T.transform = transform
-
-/////////////////////Pirate Plastitanium walls/////////////////////
-
-/turf/closed/wall/mineral/plastitanium/pirate
-	desc = "Yarr just try to blow this to smithereens!"
-	explosion_block = 50
-	canSmoothWith = list(/turf/closed/wall/mineral/plastitanium/pirate, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/plastitanium/pirate, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
-
-/turf/closed/wall/mineral/plastitanium/nodiagonal/pirate/
-	explosion_block = 50
-
-/turf/closed/wall/mineral/plastitanium/nosmooth/pirate/
-	explosion_block = 50
-
-/turf/closed/wall/mineral/plastitanium/overspace/pirate/
-	explosion_block = 50
\ No newline at end of file
+	T.transform = transform
\ No newline at end of file
diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm
index 8eab4c34fe..e75c518ed3 100644
--- a/code/game/turfs/simulated/wall/reinf_walls.dm
+++ b/code/game/turfs/simulated/wall/reinf_walls.dm
@@ -258,3 +258,25 @@
 /turf/closed/wall/r_wall/syndicate/overspace
 	icon_state = "map-overspace"
 	fixed_underlay = list("space"=1)
+
+/////////////////////Pirate Ship walls/////////////////////
+
+/turf/closed/wall/r_wall/syndicate/pirate
+	desc = "Yarr just try to blow this to smithereens!"
+	explosion_block = 30
+	canSmoothWith = list(/turf/closed/wall/r_wall/syndicate/pirate, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/plastitanium/pirate, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
+
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal/
+	smooth = SMOOTH_MORE
+	icon_state = "map-shuttle_nd"
+	explosion_block = 30
+
+/turf/closed/wall/r_wall/syndicate/pirate/nosmooth/
+	icon = 'icons/turf/shuttle.dmi'
+	icon_state = "wall"
+	explosion_block = 30
+
+/turf/closed/wall/r_wall/syndicate/pirate/overspace/
+	icon_state = "map-overspace"
+	fixed_underlay = list("space"=1)
+	explosion_block = 30