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 0f08ba66cdf..b0e5f903cdc 100644 Binary files a/icons/turf/smooth/generic_shuttle.dmi and b/icons/turf/smooth/generic_shuttle.dmi differ 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