Merge pull request #132 from Ossa88/wyvern-fix

Wyvern Corrections
PentestSS13 · Feb 19, 2025 · 240b7d0 · 240b7d0
2 parents 563eab5 + 3fc8420
commit 240b7d0
Showing 1 changed file with 27 additions and 68 deletions.
diff --git a/_maps/shuttles/independent/independent_wyvern.dmm b/_maps/shuttles/independent/independent_wyvern.dmm
@@ -214,7 +214,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/obj/structure/cable,
 /turf/open/floor/hangar/plasteel,
 /area/ship/engineering/engine)
 "cS" = (
@@ -620,7 +619,6 @@
 "ie" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/item/circuitboard/mecha/ripley,
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
 /area/ship/maintenance/fore)
@@ -671,18 +669,13 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -20;
 	pixel_y = 12
 	},
+/obj/structure/cable,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "iC" = (
@@ -1064,9 +1057,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/structure/catwalk/over,
 /obj/structure/fireaxecabinet{
 	pixel_y = 26
@@ -1449,8 +1439,6 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/airlock/maintenance{
 	name = "Starboard Thrusters"
 	},
@@ -2414,8 +2402,8 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/machinery/computer/cargo,
 /obj/item/radio/intercom/directional/north,
+/obj/machinery/computer/cargo/express,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ao" = (
@@ -2456,10 +2444,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light/small/directional/west,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "AQ" = (
@@ -2641,9 +2629,6 @@
 /obj/structure/cable{
 	icon_state = "4-10"
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
@@ -2709,9 +2694,6 @@
 /obj/structure/window/spawner/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/construction)
-"Ei" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/maintenance/central)
 "Em" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
@@ -2767,20 +2749,18 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/maintenance/central)
+/area/ship/engineering/engine)
 "ES" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Fe" = (
@@ -3108,9 +3088,6 @@
 "Iq" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security)
-"Ir" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/maintenance/central)
 "Iw" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -3806,7 +3783,6 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/structure/cable,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Ry" = (
@@ -4209,9 +4185,6 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Vn" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
 /obj/structure/cable{
 	icon_state = "0-5"
 	},
@@ -4226,11 +4199,13 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Vq" = (
@@ -4344,19 +4319,6 @@
 /obj/item/clothing/head/helmet,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
-"WH" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/maintenance/central)
 "WM" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4436,18 +4398,15 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
 "XV" = (
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 10
 	},
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/hangar/plasteel,
 /area/ship/engineering/engine)
 "Yo" = (
@@ -4854,9 +4813,9 @@ BZ
 fn
 ge
 gn
-Ei
-WH
-Ei
+Su
+EQ
+Su
 Ly
 Ly
 Ly
@@ -4888,9 +4847,9 @@ vR
 Jb
 ge
 FJ
-Ei
-WH
-Ei
+Su
+EQ
+Su
 Ly
 Ly
 Ly
@@ -4922,9 +4881,9 @@ HD
 Ij
 ge
 CA
-Ei
+Su
 EQ
-Ei
+Su
 Ly
 Ly
 Ly
@@ -4956,9 +4915,9 @@ wk
 sV
 ge
 da
-Ei
-WH
-Ir
+Su
+EQ
+vO
 Ly
 Ly
 Ly