From 1391c90fa14389747270ebd04737372f37e41e53 Mon Sep 17 00:00:00 2001
From: alberyk <alberyk.alberyk@gmail.com>
Date: Sun, 16 Jan 2022 15:07:06 -0300
Subject: [PATCH] shuttles

---
 code/game/turfs/simulated/shuttle_turfs.dm   |   7 ++
 code/modules/materials/materials.dm          |   1 -
 icons/turf/smooth/generic_shuttle.dmi        | Bin 2460 -> 1877 bytes
 maps/sccv_horizon/placeholder-1_deck_1.dmm   |  16 ++---
 maps/sccv_horizon/placeholder-3_deck_3.dmm   |   7 +-
 maps/sccv_horizon/placeholder-4_centcomm.dmm |  69 ++++++++++++++-----
 6 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/code/game/turfs/simulated/shuttle_turfs.dm b/code/game/turfs/simulated/shuttle_turfs.dm
index 619a5898f1d..01d57ec3966 100644
--- a/code/game/turfs/simulated/shuttle_turfs.dm
+++ b/code/game/turfs/simulated/shuttle_turfs.dm
@@ -195,6 +195,13 @@
 /turf/simulated/wall/shuttle/space_ship/cardinal
 	smooth = SMOOTH_MORE
 
+/turf/simulated/wall/shuttle/space_ship/mercenary
+	color = "#5b5b5b"
+
+/turf/simulated/wall/shuttle/space_ship/mercenary/cardinal
+	smooth = SMOOTH_MORE
+	color = "#5b5b5b"
+
 //--Unique Shuttles--//
 
 /turf/simulated/wall/shuttle/unique
diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index 6b42033b2a6..56f77fa69e3 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -988,7 +988,6 @@
 	name = MATERIAL_SHUTTLE
 	display_name = "spaceship alloy"
 	stack_type = null
-	icon_colour = "#6C7364"
 	icon_base = "shuttle"
 	integrity = 1200
 	melting_point = 6000       // Hull plating.
diff --git a/icons/turf/smooth/generic_shuttle.dmi b/icons/turf/smooth/generic_shuttle.dmi
index 0f08ba66cdf77428fee52b635a2e9830301ba571..b0e5f903cdc737ac85adada46d4d01ec182801f8 100644
GIT binary patch
delta 1857
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

delta 2445
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
LNkvXXu0mjfzt&`L

diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm
index 3e9830fd615..d6cfb330994 100644
--- a/maps/sccv_horizon/placeholder-1_deck_1.dmm
+++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm
@@ -101,7 +101,7 @@
 "aVg" = (/turf/simulated/floor/tiled/ramp{dir = 4},/area/maintenance/wing/port/deck1)
 "aVU" = (/obj/structure/cable/green{icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/substation/research_sublevel)
 "aWr" = (/obj/structure/lattice/catwalk/indoor/grate,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable/green{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/purple{dir = 5},/turf/simulated/floor/plating,/area/maintenance/engineering)
-"aWx" = (/obj/structure/window/shuttle/legion,/obj/structure/grille,/turf/simulated/floor/plating,/area/shuttle/escape_pod/pod1)
+"aWx" = (/obj/structure/grille,/obj/structure/window/shuttle/scc,/turf/simulated/floor/plating,/area/shuttle/escape_pod/pod1)
 "aWP" = (/turf/simulated/wall,/area/hangar/control)
 "aXe" = (/obj/structure/tank_wall{icon_state = "m-4"},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/plating,/area/engineering/atmos)
 "aXh" = (/obj/structure/cable/green{icon_state = "1-2"},/turf/simulated/wall,/area/hangar/auxiliary)
@@ -727,7 +727,7 @@
 "gkr" = (/obj/effect/floor_decal/corner/brown/full{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "gkE" = (/obj/effect/floor_decal/corner/black{dir = 10},/turf/simulated/floor/tiled,/area/hangar/intrepid)
 "gkL" = (/obj/structure/cable{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/lattice/catwalk/indoor/grate,/obj/structure/railing/mapped{dir = 4},/obj/structure/railing/mapped,/turf/simulated/floor/plating,/area/maintenance/cargo)
-"gkM" = (/turf/simulated/wall/shuttle/legion,/area/shuttle/escape_pod/pod1)
+"gkM" = (/turf/simulated/wall/shuttle/scc/cardinal,/area/shuttle/escape_pod/pod1)
 "gmL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/machinery/camera/network/security{c_tag = "Security - First Deck Checkpoin"; dir = 4},/turf/simulated/floor/tiled/dark,/area/security/checkpoint)
 "gnn" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor,/obj/structure/lattice/catwalk/indoor/grate,/obj/machinery/door/airlock/glass_command{name = "Pilot Room"; req_one_access = list(73)},/turf/simulated/floor/plating,/area/hangar/control)
 "gnP" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/machinery/atmospherics/binary/pump/high_power{layer = 2.8},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion)
@@ -959,7 +959,7 @@
 "ifE" = (/obj/machinery/door/blast/regular{id = "iso_c_purge"; is_critical = 1; name = "Exterior Blast Door"},/turf/simulated/floor/reinforced,/area/rnd/isolation_a)
 "ifJ" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor/plating,/area/hangar/intrepid)
 "ifK" = (/obj/structure/cable/green{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{icon_state = "1-8"},/obj/effect/floor_decal/corner/white/full,/turf/simulated/floor/tiled/white,/area/operations/upper)
-"ifU" = (/obj/structure/window/shuttle/legion,/obj/structure/grille,/turf/simulated/floor/plating,/area/shuttle/escape_pod/pod4)
+"ifU" = (/obj/structure/grille,/obj/structure/window/shuttle/scc,/turf/simulated/floor/plating,/area/shuttle/escape_pod/pod4)
 "ifX" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/plating,/area/maintenance/cargo)
 "igj" = (/obj/machinery/conveyor{dir = 1; id = "QMLoad"},/turf/simulated/floor/plating,/area/quartermaster/loading)
 "ihC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{icon_state = "1-2"},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/hangar/intrepid)
@@ -1734,7 +1734,7 @@
 "pnX" = (/turf/simulated/wall,/area/engineering/gravity_gen)
 "pnZ" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/maintenance/cargo)
 "pom" = (/turf/simulated/wall,/area/maintenance/research_port)
-"pos" = (/obj/structure/window/shuttle/legion,/obj/structure/grille,/turf/simulated/floor/plating,/area/shuttle/escape_pod/pod3)
+"pos" = (/obj/structure/grille,/obj/structure/window/shuttle/scc,/turf/simulated/floor/plating,/area/shuttle/escape_pod/pod3)
 "poO" = (/obj/machinery/light{dir = 4},/obj/structure/table/steel,/obj/item/storage/toolbox/electrical,/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/turf/simulated/floor/tiled/dark,/area/storage/eva)
 "ppj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable{icon_state = "2-8"},/obj/structure/lattice/catwalk/indoor/grate/damaged,/turf/simulated/floor/plating,/area/hangar/auxiliary)
 "ppu" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/tank_wall/oxygen{icon_state = "o2-8"},/turf/simulated/floor/plating,/area/engineering/atmos/air)
@@ -2114,7 +2114,7 @@
 "sxT" = (/obj/machinery/door/airlock/atmos,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled,/area/engineering/atmos/air)
 "sys" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/target_stake,/turf/simulated/floor/reinforced,/area/rnd/test_range)
 "syE" = (/obj/effect/floor_decal/corner_wide/purple{dir = 10},/obj/effect/floor_decal/corner_wide/purple{dir = 4},/obj/machinery/door/firedoor,/obj/structure/cable/green{icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/xenoarch_atrium)
-"syN" = (/turf/simulated/wall/shuttle/legion,/area/shuttle/escape_pod/pod2)
+"syN" = (/turf/simulated/wall/shuttle/scc/cardinal,/area/shuttle/escape_pod/pod2)
 "syS" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/guncabinet{name = "Emergency Weaponry"; req_access = list(73)},/obj/item/gun/energy/laser/shotgun/research,/turf/simulated/floor/tiled,/area/shuttle/intrepid)
 "szM" = (/turf/simulated/floor/reinforced{blocks_air = 1; density = 1; name = "thruster mount"},/area/engineering/atmos/propulsion/starboard)
 "sBd" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/railing/mapped,/obj/effect/floor_decal/spline/plain,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "0-4"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/turf/simulated/floor/plating,/area/maintenance/engineering)
@@ -2357,7 +2357,7 @@
 "uJP" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor,/obj/machinery/door/window/eastleft,/turf/simulated/floor/tiled/ramp{dir = 4},/area/hangar/intrepid)
 "uKh" = (/obj/machinery/atmospherics/binary/pump/high_power{dir = 8; layer = 2.8},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion)
 "uKu" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/tank_wall/carbon_dioxide,/obj/machinery/atmospherics/pipe/simple/visible/black,/turf/simulated/floor/airless,/area/engineering/atmos)
-"uKW" = (/obj/structure/window/shuttle/legion,/obj/structure/grille,/turf/simulated/floor/plating,/area/shuttle/escape_pod/pod2)
+"uKW" = (/obj/structure/grille,/obj/structure/window/shuttle/scc,/turf/simulated/floor/plating,/area/shuttle/escape_pod/pod2)
 "uKX" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/unary/engine{icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; icon_state = "me4"; item_state = null},/turf/simulated/floor/plating,/area/shuttle/intrepid)
 "uLM" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "uNg" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/effect/floor_decal/industrial/outline/grey,/obj/machinery/air_sensor{frequency = 1441; id_tag = "mixed_sensor"},/obj/effect/decal/fake_object/light_source/invisible,/turf/simulated/floor/reinforced/airless,/area/engineering/atmos)
@@ -2539,7 +2539,7 @@
 "wqf" = (/obj/effect/floor_decal/corner/brown{dir = 6},/turf/simulated/floor/tiled/dark,/area/hangar/intrepid)
 "wqj" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/cargo)
 "wqs" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_mining{name = "Workshop"; req_access = list(29)},/turf/simulated/floor/tiled/dark,/area/operations/storage)
-"wqR" = (/turf/simulated/wall/shuttle/legion,/area/shuttle/escape_pod/pod4)
+"wqR" = (/turf/simulated/wall/shuttle/scc/cardinal,/area/shuttle/escape_pod/pod4)
 "wrE" = (/obj/structure/cable/green{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/multi_tile/glass{name = "Hangar"},/obj/machinery/door/firedoor/multi_tile,/obj/machinery/door/blast/regular/open{dir = 8; id = "hangarlockdown"; name = "Hangar Lockdown"},/turf/simulated/floor/tiled,/area/hangar/intrepid)
 "wsA" = (/obj/structure/cable/green{icon_state = "4-8"},/obj/machinery/light/small/emergency,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/lattice/catwalk/indoor/grate,/turf/simulated/floor/plating,/area/maintenance/wing/port/deck1)
 "wsD" = (/obj/structure/stairs/west,/turf/simulated/floor/tiled/ramp{dir = 4},/area/quartermaster/storage)
@@ -2699,7 +2699,7 @@
 "xCn" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/machinery/firealarm/north,/turf/simulated/floor/tiled/dark,/area/storage/eva)
 "xCD" = (/obj/structure/cable/green{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/freezer_maint{name = "Morgue Maintenance"; req_one_access = list(12,66)},/turf/simulated/floor/tiled,/area/medical/emergency_storage)
 "xDI" = (/obj/structure/lattice/catwalk/indoor/grate/damaged,/turf/simulated/floor/plating,/area/maintenance/wing/port/deck1)
-"xDY" = (/turf/simulated/wall/shuttle/legion,/area/shuttle/escape_pod/pod3)
+"xDY" = (/turf/simulated/wall/shuttle/scc/cardinal,/area/shuttle/escape_pod/pod3)
 "xEb" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/machinery/atmospherics/binary/pump/high_power{layer = 2.8},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion/starboard)
 "xEd" = (/obj/machinery/conveyor{dir = 9; id = "mining_1"; layer = 2.9; reversed = 1},/turf/simulated/floor/plating,/area/outpost/mining_main/refinery)
 "xEu" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/northright,/turf/simulated/floor/plating,/area/maintenance/hangar/starboard)
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index a934b9a1bb0..e5539cb6b99 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -4499,6 +4499,7 @@
 /area/crew_quarters/lounge)
 "kN" = (
 /obj/machinery/light,
+/obj/machinery/deployable/barrier,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "kO" = (
@@ -7509,6 +7510,7 @@
 	dir = 8;
 	pixel_x = -24
 	},
+/obj/machinery/deployable/barrier,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "rY" = (
@@ -11013,7 +11015,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hop/xo)
 "Bg" = (
-/obj/machinery/anti_bluespace,
+/obj/machinery/deployable/barrier,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Bh" = (
@@ -11851,6 +11853,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/deployable/barrier,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Do" = (
@@ -12425,7 +12428,7 @@
 /turf/simulated/floor,
 /area/maintenance/vault)
 "EZ" = (
-/obj/structure/table/rack,
+/obj/machinery/anti_bluespace,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
 "Fa" = (
diff --git a/maps/sccv_horizon/placeholder-4_centcomm.dmm b/maps/sccv_horizon/placeholder-4_centcomm.dmm
index 60f65542d69..380121a2578 100644
--- a/maps/sccv_horizon/placeholder-4_centcomm.dmm
+++ b/maps/sccv_horizon/placeholder-4_centcomm.dmm
@@ -30612,7 +30612,7 @@
 /area/shuttle/mercenary)
 "bqv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/shuttle/mercenary)
 "bqy" = (
 /obj/structure/lattice,
@@ -33510,8 +33510,12 @@
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
 "bwZ" = (
-/obj/structure/window/shuttle,
-/obj/structure/grille,
+/obj/effect/map_effect/wingrille_spawn/reinforced,
+/obj/machinery/door/blast/regular/open{
+	dir = 4;
+	id = "raidercockpit";
+	name = "blast door"
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/skipjack)
 "bxd" = (
@@ -33589,7 +33593,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mercenary)
 "bxw" = (
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/shuttle/mercenary)
 "bxx" = (
 /obj/machinery/door/blast/odin/open{
@@ -35394,7 +35398,7 @@
 /turf/unsimulated/floor/plating,
 /area/shuttle/skipjack)
 "bEI" = (
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/shuttle/skipjack)
 "bER" = (
 /obj/structure/shuttle/engine/propulsion/burst/left,
@@ -38376,6 +38380,21 @@
 	name = "ocean"
 	},
 /area/centcom/shared_dream)
+"hRp" = (
+/obj/effect/map_effect/wingrille_spawn/reinforced,
+/obj/machinery/door/blast/regular/open{
+	dir = 2;
+	id = "raidercockpit";
+	name = "blast door"
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/skipjack)
+"lJo" = (
+/turf/simulated/wall/shuttle/space_ship/mercenary/cardinal,
+/area/shuttle/mercenary)
+"oKJ" = (
+/turf/simulated/wall/shuttle/space_ship/mercenary/cardinal,
+/area/shuttle/skipjack)
 "pTp" = (
 /obj/effect/shuttle_landmark/intrepid/transit,
 /turf/space/transit/south,
@@ -38384,6 +38403,20 @@
 /obj/effect/shuttle_landmark/mining/transit,
 /turf/space/transit/south,
 /area/template_noop)
+"rCy" = (
+/obj/effect/floor_decal/corner/red{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/remote/blast_door{
+	dir = 8;
+	id = "raidercockpit";
+	name = "blast door";
+	pixel_x = 25;
+	req_access = list(150)
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/skipjack)
 
 (1,1,1) = {"
 aab
@@ -44526,7 +44559,7 @@ bni
 bxw
 boS
 boS
-bxw
+lJo
 bxw
 bsf
 bsN
@@ -57646,9 +57679,9 @@ aaa
 aaa
 aaa
 bEI
-bEI
+oKJ
 bza
-bEI
+oKJ
 bBt
 bEI
 bEI
@@ -58154,9 +58187,9 @@ btj
 blU
 aaa
 bwZ
-bwZ
-bwZ
-bEI
+hRp
+hRp
+oKJ
 byo
 byU
 bEI
@@ -58670,7 +58703,7 @@ aaa
 bwZ
 bvX
 bwY
-bxO
+rCy
 byq
 bxO
 bzB
@@ -58925,9 +58958,9 @@ bjB
 bjB
 aaa
 bwZ
-bwZ
-bwZ
-bEI
+hRp
+hRp
+oKJ
 byr
 byV
 bEI
@@ -59445,7 +59478,7 @@ aaa
 aaa
 aaa
 bEI
-bEI
+oKJ
 bAw
 bEI
 bEI
@@ -59704,7 +59737,7 @@ aaa
 aaa
 bEI
 bAy
-bEI
+oKJ
 bBy
 bCk
 bCS
@@ -59959,7 +59992,7 @@ bEI
 bEI
 bEI
 bEI
-bEI
+oKJ
 bAz
 bBe
 bBz