diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt index e7f26339e4ad..680140961166 100644 --- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt +++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt @@ -25,7 +25,7 @@ File Path = "_maps\shuttles\subshuttles\independant_pill.dmm" Name = "blackpill" Size = "1x3" -Purpose = "Supposedly an manned torpedo. What is this. Subtest?" +Purpose = "Supposedly a manned torpedo. What is this. Subtest?" File Path = "_maps\shuttles\subshuttles\independant_pill.dmm" Name = "Superpill" @@ -38,7 +38,6 @@ Size = "13x7" Purpose = "A Nanotrasen dropship, primarily used by Heron-Class carriers." File Path = "_maps\shuttles\subshuttles\nanotrasen_falcon.dmm" - Name = "Crux Dropship" Size = "12x7" Purpose = "A very common general-purpose transport Minutemen vessel." @@ -49,5 +48,13 @@ Size = "15x11" Purpose = "A CentCom internship ship, which is essentially a small office with thrusters." File Path = "_maps\shuttles\subshuttles\nanotrasen_ancon.dmm" +Name = "Anvil Dropship" +Size = "15x11" +Purpose = "A general-purpose, Inteq-made dropship." +File Path = "_maps\shuttles\subshuttles\inteq_anvil.dmm" +Name = "Runner Ambulance" +Size = "15x11" +Purpose = "An ambulance procured by Cybersun for use with smaller Trauma Teams." +File Path = "_maps\shuttles\subshuttles\syndicate_runner.dmm" diff --git a/_maps/shuttles/subshuttles/inteq_anvil.dmm b/_maps/shuttles/subshuttles/inteq_anvil.dmm new file mode 100644 index 000000000000..dae4a55486d2 --- /dev/null +++ b/_maps/shuttles/subshuttles/inteq_anvil.dmm @@ -0,0 +1,537 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"b" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/fax, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"c" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) +"d" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"e" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 8 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "1-6" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"g" = ( +/obj/machinery/power/smes/shuttle/precharged, +/obj/structure/cable, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"h" = ( +/obj/structure/cable{ + icon_state = "2-9" + }, +/obj/structure/cable{ + icon_state = "1-9" + }, +/obj/structure/cable{ + icon_state = "4-9" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"i" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"m" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/landmark/ert_shuttle_brief_spawn, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"n" = ( +/obj/structure/chair, +/obj/machinery/door/window/brigdoor/southright, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"o" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable/yellow, +/obj/machinery/light/directional/south, +/obj/item/stack/sheet/mineral/plasma/twenty, +/turf/open/floor/plating, +/area/ship/bridge) +"q" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"r" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/button/door{ + dir = 8; + pixel_x = 20; + pixel_y = 12; + id = "anvil_door" + }, +/obj/machinery/button/shieldwallgen{ + dir = 8; + pixel_x = 20; + pixel_y = 2; + id = "anvil_holo" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"t" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/light_switch{ + pixel_y = 22; + pixel_x = 11 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"u" = ( +/obj/machinery/door/poddoor{ + dir = 4; + id = "anvil_door" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "anvil_holo" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"v" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) +"w" = ( +/turf/template_noop, +/area/template_noop) +"x" = ( +/obj/machinery/porta_turret/ship/weak{ + faction = list("playerInteq","turret"); + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"y" = ( +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"z" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/window/reinforced, +/turf/open/floor/plating, +/area/ship/bridge) +"A" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/structure/chair/comfy/shuttle, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/turretid{ + pixel_y = 25 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"B" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_x = -1 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"D" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"E" = ( +/obj/structure/grille, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/external) +"F" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plating, +/area/ship/bridge) +"G" = ( +/obj/machinery/door/airlock/security{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"H" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/structure/chair/comfy/shuttle, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"I" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 1; + id = "anvil_holo" + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "anvil_door" + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"K" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"L" = ( +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/bridge) +"M" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"O" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"P" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/grille, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) +"Q" = ( +/obj/docking_port/mobile{ + dir = 8; + name = "anvil dock"; + preferred_direction = 4 + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "anvil_door" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"R" = ( +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"S" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"T" = ( +/obj/machinery/porta_turret/ship/weak{ + faction = list("playerInteq","turret") + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"U" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"W" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/grille, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) +"X" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/bridge) +"Y" = ( +/obj/machinery/computer/helm{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Z" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) + +(1,1,1) = {" +w +x +X +u +Q +I +X +T +w +"} +(2,1,1) = {" +c +i +F +e +O +K +o +i +v +"} +(3,1,1) = {" +P +E +g +r +h +y +z +E +W +"} +(4,1,1) = {" +w +i +i +i +G +i +i +i +w +"} +(5,1,1) = {" +w +i +n +D +m +D +b +i +w +"} +(6,1,1) = {" +w +i +X +t +Z +R +U +X +w +"} +(7,1,1) = {" +w +X +H +R +R +R +q +X +w +"} +(8,1,1) = {" +w +X +A +S +M +S +d +X +w +"} +(9,1,1) = {" +w +i +i +Y +B +a +i +i +w +"} +(10,1,1) = {" +w +w +i +L +L +L +i +w +w +"} diff --git a/_maps/shuttles/subshuttles/minutemen_crux.dmm b/_maps/shuttles/subshuttles/minutemen_crux.dmm index 414ec3b1e98c..3e32e2694bc6 100644 --- a/_maps/shuttles/subshuttles/minutemen_crux.dmm +++ b/_maps/shuttles/subshuttles/minutemen_crux.dmm @@ -42,6 +42,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, +/obj/effect/landmark/ert_shuttle_brief_spawn, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "f" = ( @@ -52,13 +53,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) "g" = ( /obj/docking_port/mobile{ dir = 8; name = "crux dock"; - port_direction = 2; preferred_direction = 8 }, /obj/machinery/door/poddoor{ @@ -73,6 +74,7 @@ }, /obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) "i" = ( @@ -80,6 +82,9 @@ /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "k" = ( @@ -132,6 +137,7 @@ pixel_x = -4; dir = 1 }, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) "u" = ( @@ -141,6 +147,7 @@ dir = 4 }, /obj/machinery/airalarm/directional/north, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) "v" = ( @@ -153,6 +160,9 @@ /obj/structure/cable{ icon_state = "5-8" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "w" = ( @@ -174,6 +184,12 @@ /obj/effect/turf_decal/industrial/caution{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/ship/bridge) "z" = ( @@ -186,6 +202,7 @@ }, /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/steeldecal/steel_decals6, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) "B" = ( @@ -230,6 +247,9 @@ /obj/structure/sign/minutemen{ pixel_y = 28 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel, /area/ship/bridge) "J" = ( @@ -299,6 +319,9 @@ /obj/effect/turf_decal/steeldecal/steel_decals9{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "Q" = ( @@ -343,6 +366,9 @@ /obj/structure/sign/minutemen{ pixel_y = -32 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/ship/bridge) "X" = ( @@ -367,6 +393,7 @@ /obj/machinery/firealarm/directional/south{ pixel_x = 7 }, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) diff --git a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm index e1ab5be3200a..4565f12416f6 100644 --- a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm +++ b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm @@ -23,6 +23,9 @@ /obj/machinery/door/airlock/external{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/bridge) "dw" = ( @@ -30,11 +33,13 @@ dir = 4 }, /obj/docking_port/mobile{ - dir = 4; + dir = 8; name = "ancon dock"; - port_direction = 2; preferred_direction = 4 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/bridge) "hj" = ( @@ -42,6 +47,9 @@ dir = 4 }, /obj/effect/turf_decal/siding/thinplating/light, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "jj" = ( @@ -74,6 +82,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/turf_decal/corner/opaque/green/half{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "nV" = ( @@ -86,6 +97,7 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 4 }, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/white, /area/ship/bridge) "pk" = ( @@ -98,15 +110,19 @@ /obj/structure/cable{ icon_state = "1-5" }, +/obj/machinery/light/directional/west, /turf/open/floor/plasteel/white, /area/ship/bridge) "te" = ( /obj/effect/turf_decal/corner/opaque/green/diagonal, /obj/effect/turf_decal/siding/thinplating/light, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "tk" = ( -/turf/open/space/basic, +/turf/template_noop, /area/template_noop) "ty" = ( /obj/effect/turf_decal/corner/opaque/green/diagonal{ @@ -115,6 +131,16 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 6 }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/light/directional/east, +/obj/machinery/light_switch{ + pixel_x = 12; + pixel_y = -19; + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "up" = ( @@ -179,7 +205,7 @@ /area/ship/bridge) "yp" = ( /obj/structure/grille, -/obj/structure/window/fulltile, +/obj/structure/window/reinforced/fulltile/shuttle, /turf/open/floor/plating, /area/ship/bridge) "zI" = ( @@ -221,6 +247,7 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 8 }, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/white, /area/ship/bridge) "DF" = ( @@ -230,6 +257,7 @@ /obj/structure/cable{ icon_state = "0-1" }, +/obj/effect/turf_decal/corner/opaque/green/half, /turf/open/floor/plasteel/white, /area/ship/bridge) "Fz" = ( @@ -246,6 +274,8 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 5 }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/directional/east, /turf/open/floor/plasteel/white, /area/ship/bridge) "IJ" = ( @@ -276,10 +306,10 @@ /turf/open/floor/wood, /area/ship/bridge) "LE" = ( -/turf/closed/wall, +/turf/closed/wall/mineral/titanium, /area/template_noop) "LV" = ( -/turf/closed/wall, +/turf/closed/wall/mineral/titanium, /area/ship/bridge) "MW" = ( /obj/structure/chair/office/light{ @@ -291,6 +321,7 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 8 }, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/white, /area/ship/bridge) "Nk" = ( @@ -300,12 +331,19 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/light/directional/west, /turf/open/floor/plasteel/white, /area/ship/bridge) "Om" = ( /obj/machinery/door/airlock/external/glass{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/bridge) "Rg" = ( @@ -321,6 +359,7 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 4 }, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/white, /area/ship/bridge) "Rz" = ( @@ -343,6 +382,7 @@ /obj/structure/chair/comfy{ dir = 4 }, +/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel, /area/ship/bridge) "Th" = ( @@ -364,6 +404,9 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 10 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "Vu" = ( @@ -385,6 +428,7 @@ /obj/effect/turf_decal/siding/thinplating/light{ dir = 1 }, +/obj/effect/landmark/ert_shuttle_brief_spawn, /turf/open/floor/plasteel/white, /area/ship/bridge) "Zr" = ( diff --git a/_maps/shuttles/subshuttles/syndicate_runner.dmm b/_maps/shuttles/subshuttles/syndicate_runner.dmm new file mode 100644 index 000000000000..5de542e296ff --- /dev/null +++ b/_maps/shuttles/subshuttles/syndicate_runner.dmm @@ -0,0 +1,635 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/machinery/power/smes/shuttle/precharged, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ship/bridge) +"ac" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"ae" = ( +/obj/structure/table/chem, +/obj/structure/sink/chem{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"af" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/engine/hull, +/area/ship/external) +"ah" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 4 + }, +/obj/machinery/holopad/emergency/medical, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"aj" = ( +/obj/machinery/power/shuttle/engine/electric/premium{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/hull, +/area/ship/external) +"ak" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_ccw{ + dir = 1; + pixel_y = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/corner, +/obj/machinery/power/terminal, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"al" = ( +/obj/structure/table/chem, +/obj/item/reagent_containers/glass/bottle/bicaridine{ + pixel_x = 7; + pixel_y = 14 + }, +/obj/item/reagent_containers/glass/bottle/antitoxin{ + pixel_x = -4; + pixel_y = 10 + }, +/obj/item/reagent_containers/glass/bottle/kelotane{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/reagent_containers/glass/bottle/dexalin{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"bz" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "runner_top_holo" + }, +/obj/machinery/door/poddoor{ + id = "runner_top_door" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"bG" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_cw{ + dir = 1 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ + dir = 8 + }, +/obj/machinery/button/shieldwallgen{ + dir = 1; + pixel_y = -20; + pixel_x = -12; + id = "runner_sub_holo" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/button/door{ + pixel_y = -21; + pixel_x = -1; + id = "runner_sub_door"; + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"bY" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"co" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, +/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"cF" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_ccw, +/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ + dir = 1 + }, +/obj/structure/closet/emcloset/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/button/shieldwallgen{ + pixel_y = 20; + pixel_x = -12; + id = "runner_top_holo" + }, +/obj/machinery/button/door{ + pixel_y = 21; + pixel_x = -1; + id = "runner_top_door" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"dB" = ( +/obj/machinery/door/poddoor{ + id = "runner_sub_door" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "runner_sub_holo" + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"fa" = ( +/obj/machinery/computer/crew/syndie{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"gi" = ( +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/structure/table/chem, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"gs" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"gA" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"hB" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"hJ" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"iR" = ( +/obj/machinery/stasis, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"ku" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"kM" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"lp" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_x = 4; + pixel_y = 9 + }, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 4; + pixel_y = -6 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/button/door{ + pixel_x = -9; + dir = 8; + pixel_y = 8; + id = "runner_bridge" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"nP" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, +/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"rR" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "runner_bridge" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"sl" = ( +/obj/machinery/door/poddoor{ + id = "runner_top_door" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "runner_top_holo" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"te" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/engine/hull, +/area/ship/external) +"wg" = ( +/obj/machinery/computer/helm{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"zS" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/warning, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"DP" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"DW" = ( +/obj/machinery/power/shuttle/engine/electric/premium{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/open/floor/engine/hull, +/area/ship/external) +"Or" = ( +/obj/docking_port/mobile{ + dir = 2; + name = "trauma team shuttle"; + port_direction = 8; + preferred_direction = 4 + }, +/obj/machinery/door/poddoor{ + id = "runner_sub_door" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "runner_sub_holo" + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Pq" = ( +/turf/template_noop, +/area/template_noop) +"PD" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"Rz" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/light_switch{ + pixel_y = 22; + pixel_x = 13 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"RO" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"SE" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 4 + }, +/obj/effect/landmark/ert_shuttle_brief_spawn, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Wx" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"ZN" = ( +/obj/machinery/stasis, +/obj/item/tank/internals/anesthetic{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/tank/internals/anesthetic{ + pixel_x = -8; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_y = -4; + pixel_x = 7 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"ZV" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_cw, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ + dir = 4 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) + +(1,1,1) = {" +Pq +Pq +PD +PD +PD +PD +PD +Pq +Pq +"} +(2,1,1) = {" +DW +PD +PD +gi +ae +al +PD +PD +aj +"} +(3,1,1) = {" +af +aa +ZV +Wx +bY +RO +ak +gs +te +"} +(4,1,1) = {" +Pq +bz +co +gA +SE +ku +zS +dB +Pq +"} +(5,1,1) = {" +Pq +sl +nP +ZN +kM +iR +zS +Or +Pq +"} +(6,1,1) = {" +Pq +PD +cF +hJ +ac +hB +bG +PD +Pq +"} +(7,1,1) = {" +Pq +PD +PD +Rz +ah +DP +PD +PD +Pq +"} +(8,1,1) = {" +Pq +Pq +PD +wg +lp +fa +PD +Pq +Pq +"} +(9,1,1) = {" +Pq +Pq +PD +rR +rR +rR +PD +Pq +Pq +"} diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 2c84f254cd6f..f3d3f6cc7b81 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -67,6 +67,7 @@ random_names = FALSE leader_experience = FALSE spawn_at_outpost = FALSE + ert_template = /datum/map_template/shuttle/subshuttles/ancon /datum/ert/centcom_official/New() mission = "Conduct a routine review of [station_name()]'s vessels." @@ -89,6 +90,7 @@ rename_team = "Horde of Interns" mission = "Assist in conflict resolution." polldesc = "an unpaid internship opportunity with Nanotrasen" + ert_template = /datum/map_template/shuttle/subshuttles/ancon /datum/ert/intern/unarmed roles = list(/datum/antagonist/ert/intern/unarmed) @@ -114,6 +116,7 @@ mission = "Carry out your contract." rename_team = "Generic Inteq Team" polldesc = "an Inteq emergency team" + ert_template = /datum/map_template/shuttle/subshuttles/anvil // SolGov @@ -148,6 +151,7 @@ rename_team = "Generic Minutemen Team" polldesc = "a Minutemen emergency team" random_names = TRUE + ert_template = /datum/map_template/shuttle/subshuttles/crux /datum/ert/minutemen/bard @@ -209,6 +213,7 @@ mission = "Assist CyberSun clients." rename_team = "Cybersun Medical Intervention Team" polldesc = "a Cybersun paramedic team" + ert_template = /datum/map_template/shuttle/subshuttles/runner // Frontiersmen /datum/ert/frontier @@ -235,7 +240,6 @@ roles = list(/datum/antagonist/ert/frontier, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer) rename_team = "Assault Frontiersmen Team" polldesc = "a well armed squad of pirates" - ert_template = /datum/map_template/shuttle/subshuttles/frontiersmen_gut /datum/ert/independent teamsize = 3 diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 2e632afe177d..7c0f0aeedf98 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -360,7 +360,6 @@ name = "Falcon Dropship" prefix = "NTSV" - /datum/map_template/shuttle/subshuttles/crux file_name = "minutemen_crux" name = "Crux Dropship" @@ -368,7 +367,7 @@ /datum/map_template/shuttle/subshuttles/ancon file_name = "nanotrasen_ancon" - name = "NanoTrasen Ancon-Class Command Ship" + name = "Nanotrasen Ancon-Class Command Ship" prefix = "NTSV" name_categories = list("GENERAL", "SPACE") @@ -377,4 +376,15 @@ name = "Gut Combat Freighter" prefix = "ISV" +/datum/map_template/shuttle/subshuttles/anvil + file_name = "inteq_anvil" + name = "Anvil-Class Dropship" + prefix = "IRMV" + name_categories = list("GENERAL", "SPACE") + +/datum/map_template/shuttle/subshuttles/runner + file_name = "syndicate_runner" + name = "Runner-Class Ambulance" + prefix = "CSSV" + name_categories = list("GENERAL", "SPACE") diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 6c303cddf060..e1f88a2626b2 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -323,7 +323,7 @@ ertemplate.random_names = prefs["random_names"]["value"] == "Yes" ertemplate.spawn_admin = prefs["spawn_admin"]["value"] == "Yes" ertemplate.use_custom_shuttle = prefs["use_custom_shuttle"]["value"] == "Yes" - ertemplate.spawn_at_outpost = prefs["use_custom_shuttle"]["value"] == "Yes" + ertemplate.spawn_at_outpost = prefs["spawn_at_outpost"]["value"] == "Yes" var/list/spawnpoints = GLOB.emergencyresponseteamspawn var/index = 0 @@ -341,11 +341,6 @@ to_chat(usr, span_warning("No applicants for ERT. Aborting spawn.")) return FALSE - if(ertemplate.spawn_at_outpost && !ertemplate.use_custom_shuttle) - if(!length(GLOB.emergencyresponseteam_outpostspawn)) - message_admins("No outpost spawns found!") - spawnpoints = GLOB.emergencyresponseteam_outpostspawn - if(ertemplate.use_custom_shuttle && ertemplate.ert_template) to_chat(usr, span_boldnotice("Attempting to spawn ERT custom shuttle, this may take a few seconds...")) @@ -356,7 +351,7 @@ if(length(SSovermap.outposts) > 1) var/temp_loc = input(usr, "Select outpost to spawn at") as null|anything in SSovermap.outposts if(!temp_loc) - message_admins("ERT Shuttle found no outpost to spawn at!") + message_admins("ERT found no outpost to spawn at!") return spawn_location = temp_loc else @@ -377,7 +372,7 @@ spawn_turfs += get_turf(spawner) if(!brief_spawn) - brief_spawn = locate(/obj/effect/landmark/ert_shuttle_brief_spawn) in shuttle_turfs + brief_spawn = locate(/obj/effect/landmark/ert_shuttle_brief_spawn) in ship_turfs if(!length(spawn_turfs)) stack_trace("ERT shuttle loaded but found no spawnpoints, placing the ERT at wherever inside the shuttle instead.") @@ -386,9 +381,14 @@ continue spawn_turfs += open_turf + if(!ertemplate.use_custom_shuttle && ertemplate.spawn_at_outpost) + if(!length(GLOB.emergencyresponseteam_outpostspawn)) + message_admins("No outpost spawns found!") + spawn_turfs = GLOB.emergencyresponseteam_outpostspawn + if(ertemplate.spawn_admin) if(isobserver(usr)) - var/mob/living/carbon/human/admin_officer = new (brief_spawn || spawn_turfs || spawnpoints[1]) + var/mob/living/carbon/human/admin_officer = new (brief_spawn || spawnpoints[1]) var/chosen_outfit = usr.client?.prefs?.brief_outfit usr.client.prefs.copy_to(admin_officer) admin_officer.equipOutfit(chosen_outfit)