From 1a94726bdccdf9c76bc4d3e047aef989be79e017 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Sat, 21 Oct 2017 03:44:47 -0500
Subject: [PATCH] [MIRROR] Fixes conflicting IDs on ruined whiteship (#3525)

* Fixes conflicting IDs

* Fixes conflicting IDs on ruined whiteship
---
 _maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm     | 10 +++++-----
 code/modules/ruins/spaceruin_code/whiteshipruin_box.dm |  8 ++++++++
 tgstation.dme                                          |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 code/modules/ruins/spaceruin_code/whiteshipruin_box.dm

diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
index 896ff716fc..4644cf808a 100644
--- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
+++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
@@ -52,7 +52,7 @@
 /area/ruin/space/has_grav/whiteship/box)
 "ak" = (
 /obj/machinery/computer/pod{
-	id = "oldship_gun"
+	id = "oldship_ruin_gun"
 	},
 /turf/open/floor/mineral/titanium,
 /area/ruin/space/has_grav/whiteship/box)
@@ -77,13 +77,13 @@
 /obj/machinery/mass_driver{
 	dir = 4;
 	icon_state = "mass_driver";
-	id = "oldship_gun"
+	id = "oldship_ruin_gun"
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/whiteship/box)
 "aq" = (
 /obj/machinery/door/poddoor{
-	id = "oldship_gun";
+	id = "oldship_ruin_gun";
 	name = "pod bay door"
 	},
 /turf/open/floor/plating,
@@ -128,7 +128,7 @@
 /turf/open/floor/mineral/titanium,
 /area/ruin/space/has_grav/whiteship/box)
 "ax" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/ruin{
 	view_range = 18
 	},
 /turf/open/floor/mineral/titanium,
@@ -211,7 +211,7 @@
 /turf/open/floor/mineral/titanium,
 /area/ruin/space/has_grav/whiteship/box)
 "aM" = (
-/obj/machinery/computer/shuttle/white_ship,
+/obj/machinery/computer/shuttle/white_ship/ruin,
 /turf/open/floor/mineral/titanium,
 /area/ruin/space/has_grav/whiteship/box)
 "aN" = (
diff --git a/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm b/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm
new file mode 100644
index 0000000000..56b572b11a
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm
@@ -0,0 +1,8 @@
+///////////	ruined whiteship
+
+/obj/machinery/computer/shuttle/white_ship/ruin
+	shuttleId = "whiteship_ruin"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/ruin
+	shuttleId = "whiteship_ruin"
+
diff --git a/tgstation.dme b/tgstation.dme
index a656ffb187..6c81456840 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2169,6 +2169,7 @@
 #include "code\modules\ruins\spaceruin_code\originalcontent.dm"
 #include "code\modules\ruins\spaceruin_code\spacehotel.dm"
 #include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
+#include "code\modules\ruins\spaceruin_code\whiteshipruin_box.dm"
 #include "code\modules\security_levels\keycard_authentication.dm"
 #include "code\modules\security_levels\security_levels.dm"
 #include "code\modules\server_tools\st_commands.dm"