From 8553e890e509ac14f5f604ddaaa6d6906392fec9 Mon Sep 17 00:00:00 2001
From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Date: Sat, 10 Sep 2022 20:53:01 -0400
Subject: [PATCH] Fixes pirate ships being able to fly around (#69808)

Fixes pirate ships

I changed the dock ID from pirateship to pirate, but I forgot to change shuttle IDs for the ship's docking ports so they would work. The change was made so pirate ships loading in would replace eachother like it now does for emergency/arrival/cargo shuttles, as per https://github.com/tgstation/tgstation/pull/69516
---
 _maps/shuttles/hunter_bounty.dmm      | 2 +-
 _maps/shuttles/hunter_russian.dmm     | 2 +-
 _maps/shuttles/pirate_default.dmm     | 2 +-
 _maps/shuttles/pirate_dutchman.dmm    | 2 +-
 _maps/shuttles/pirate_silverscale.dmm | 2 +-
 code/modules/events/pirates.dm        | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm
index abb2753ec87..0b53877e1d9 100644
--- a/_maps/shuttles/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter_bounty.dmm
@@ -193,7 +193,7 @@
 /obj/docking_port/stationary{
 	dwidth = 11;
 	height = 16;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 17
 	},
diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm
index 5e001b3a4db..7125eeb3bdc 100644
--- a/_maps/shuttles/hunter_russian.dmm
+++ b/_maps/shuttles/hunter_russian.dmm
@@ -507,7 +507,7 @@
 /obj/docking_port/stationary{
 	dwidth = 11;
 	height = 16;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 17
 	},
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index 663521b169c..5c6e536613c 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -1083,7 +1083,7 @@
 /obj/docking_port/stationary{
 	dwidth = 11;
 	height = 16;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 17
 	},
diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm
index f275122cb36..8b65d3c186c 100644
--- a/_maps/shuttles/pirate_dutchman.dmm
+++ b/_maps/shuttles/pirate_dutchman.dmm
@@ -766,7 +766,7 @@
 	dir = 8;
 	dwidth = 11;
 	height = 16;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 17
 	},
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm
index 6aab870831e..14763a30676 100644
--- a/_maps/shuttles/pirate_silverscale.dmm
+++ b/_maps/shuttles/pirate_silverscale.dmm
@@ -516,7 +516,7 @@
 	dir = 4;
 	dwidth = 13;
 	height = 3;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 26
 	},
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index ced684a2952..590ef55f2f7 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -185,18 +185,18 @@
 
 /obj/machinery/computer/shuttle/pirate
 	name = "pirate shuttle console"
-	shuttleId = "pirateship"
+	shuttleId = "pirate"
 	icon_screen = "syndishuttle"
 	icon_keyboard = "syndie_key"
 	light_color = COLOR_SOFT_RED
-	possible_destinations = "pirateship_away;pirateship_home;pirateship_custom"
+	possible_destinations = "pirate_away;pirate_home;pirate_custom"
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate
 	name = "pirate shuttle navigation computer"
 	desc = "Used to designate a precise transit location for the pirate shuttle."
-	shuttleId = "pirateship"
+	shuttleId = "pirate"
 	lock_override = CAMERA_LOCK_STATION
-	shuttlePortId = "pirateship_custom"
+	shuttlePortId = "pirate_custom"
 	x_offset = 9
 	y_offset = 0
 	see_hidden = FALSE