From a52bf01b6f07e970f028f0a1b0171a58fe348be2 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 5 Jul 2024 07:09:43 +0200
Subject: [PATCH] [MIRROR] Various minor fixes to bounty hunter shuttles
 (#28634)

* Various minor fixes to bounty hunter shuttles (#84611)

## About The Pull Request
Another continuation of fixing shuttle issues such as bad offsets on the
camera console, ships not fitting in the camera console's view and ships
flying the wrong way

<details>
  <summary>Full changes</summary>

- Fixed incorrect camera offsets on the following: hunter_space_cop.dmm,
hunter_russian.dmm, hunter_bounty.dmm, hunter_psyker.dmm,
hunter_mi13_foodtruck.dmm
- Fixed the following shuttles flying in unexpected directions:
hunter_space_cop.dmm, hunter_russian.dmm, hunter_bounty.dmm,
hunter_psyker.dmm
- Increased view_range on Psyker hunters' navigation console so the
entire ship is in the console's view

</details>

## Why It's Good For The Game
Shuttles should fly in their intended direction and the ship should be
centred in the camera view and fit the whole ship.

## Changelog
:cl:
qol: Increased view_range on the Psyker Bounty Hunters' Shuttle
navigation console.
fix: Fixed the shuttle navigation console camera eye being incorrectly
offset on: the SpacePol van, the Russian bounty hunters, the default
bounty hunters, the Psyker bounty hunters, and the MI13 Foodtruck.
fix: Fixed the SpacePol van, Russian bounty hunters, default bounty
hunters, and Psyker bounty hunters' shuttles all flying in incorrect
directions.
/:cl:

* Various minor fixes to bounty hunter shuttles

---------

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
---
 _maps/shuttles/hunter_bounty.dmm         | 8 ++++++--
 _maps/shuttles/hunter_mi13_foodtruck.dmm | 4 ++--
 _maps/shuttles/hunter_psyker.dmm         | 8 ++++++--
 _maps/shuttles/hunter_russian.dmm        | 8 +++++---
 _maps/shuttles/hunter_space_cop.dmm      | 6 ++++--
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm
index 3087fa376fe..ba752de932b 100644
--- a/_maps/shuttles/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter_bounty.dmm
@@ -149,7 +149,9 @@
 /area/shuttle/hunter)
 "I" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
-	dir = 8
+	dir = 8;
+	y_offset = 6;
+	x_offset = 3
 	},
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
@@ -232,7 +234,9 @@
 	movement_force = list("KNOCKDOWN"=0,"THROW"=0);
 	name = "hunter shuttle";
 	rechargeTime = 1800;
-	shuttle_id = "huntership"
+	shuttle_id = "huntership";
+	port_direction = 4;
+	preferred_direction = 4
 	},
 /obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/access/all/hunter,
diff --git a/_maps/shuttles/hunter_mi13_foodtruck.dmm b/_maps/shuttles/hunter_mi13_foodtruck.dmm
index 9b42fab671f..5fe7324e8e8 100644
--- a/_maps/shuttles/hunter_mi13_foodtruck.dmm
+++ b/_maps/shuttles/hunter_mi13_foodtruck.dmm
@@ -509,8 +509,8 @@
 /area/shuttle/hunter/mi13_foodtruck)
 "Ak" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
-	x_offset = -6;
-	y_offset = -7
+	x_offset = 6;
+	y_offset = 1
 	},
 /obj/structure/cable/layer1,
 /turf/open/floor/circuit/red/off,
diff --git a/_maps/shuttles/hunter_psyker.dmm b/_maps/shuttles/hunter_psyker.dmm
index e4b8ed54478..980bb552122 100644
--- a/_maps/shuttles/hunter_psyker.dmm
+++ b/_maps/shuttles/hunter_psyker.dmm
@@ -180,7 +180,9 @@
 	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
 	name = "hunter shuttle";
 	rechargeTime = 1800;
-	shuttle_id = "huntership"
+	shuttle_id = "huntership";
+	port_direction = 8;
+	preferred_direction = 8
 	},
 /turf/open/floor/catwalk_floor,
 /area/shuttle/hunter)
@@ -395,7 +397,9 @@
 /area/shuttle/hunter)
 "tT" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter/psyker{
-	dir = 4
+	dir = 4;
+	view_range = 12;
+	y_offset = 12
 	},
 /obj/effect/turf_decal/box/white,
 /turf/open/floor/iron/dark/textured,
diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm
index 214705cfb17..3f3f24fee57 100644
--- a/_maps/shuttles/hunter_russian.dmm
+++ b/_maps/shuttles/hunter_russian.dmm
@@ -686,7 +686,9 @@
 	movement_force = list("KNOCKDOWN"=0,"THROW"=0);
 	name = "hunter shuttle";
 	rechargeTime = 1800;
-	shuttle_id = "huntership"
+	shuttle_id = "huntership";
+	port_direction = 4;
+	preferred_direction = 4
 	},
 /obj/docking_port/stationary{
 	dwidth = 11;
@@ -724,8 +726,8 @@
 "Zu" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
 	dir = 8;
-	x_offset = 0;
-	y_offset = 3
+	x_offset = -2;
+	y_offset = 6
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/plastitanium/red,
diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter_space_cop.dmm
index 50e2093174d..a215ff70916 100644
--- a/_maps/shuttles/hunter_space_cop.dmm
+++ b/_maps/shuttles/hunter_space_cop.dmm
@@ -3,7 +3,7 @@
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
 	dir = 8;
 	view_range = 7;
-	x_offset = 6
+	x_offset = 5
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/hunter)
@@ -125,7 +125,9 @@
 	dir = 4;
 	name = "hunter shuttle";
 	rechargeTime = 1800;
-	shuttle_id = "huntership"
+	shuttle_id = "huntership";
+	port_direction = 2;
+	preferred_direction = 4
 	},
 /obj/machinery/door/poddoor/shutters{
 	id = "Interpolship"