Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Adds event maps with placeholders, SNZ-210 & GM Tug docking" #2595

Closed
wants to merge 1 commit into from
Closed

Revert "Adds event maps with placeholders, SNZ-210 & GM Tug docking" #2595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maps/event/sfv_arbiter/sfv_arbiter.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
/area/map_template/sfv_arbiter)
"qt" = (
/obj/paint/black,
/obj/machinery/vending/medical,
/obj/machinery/vending/medical/torch,
/turf/simulated/wall/titanium,
/area/map_template/sfv_arbiter)
"qv" = (
Expand Down
4 changes: 2 additions & 2 deletions maps/random_ruins/exoplanet_ruins/crashed_shuttle/crashed_shuttle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"BT" = (/obj/item/stack/material/rods,/turf/template_noop,/area/map_template/crashed_shuttle/crash)
"Ds" = (/obj/decal/cleanable/liquid_fuel,/obj/structure/railing/mapped{dir = 8; icon_state = "railing0-1"},/obj/machinery/atmospherics/pipe/simple/visible/fuel{dir = 6},/obj/random/tool,/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"DB" = (/obj/structure/girder/displaced,/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{id_tag = "graysontug_shuttle_pump"},/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Ep" = (/obj/machinery/door/airlock/external{id_tag = "graysontugrear_shuttle_outer"; frequency = 1380},/obj/machinery/access_button/airlock_exterior{frequency = 1380; master_tag = "graysontugrear_shuttle"; pixel_x = -25},/obj/shuttle_landmark/graysontug/start,/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Ep" = (/obj/machinery/door/airlock/external{id_tag = "graysontugrear_shuttle_outer"; frequency = 1380},/obj/machinery/access_button/airlock_exterior{frequency = 1380; master_tag = "graysontugrear_shuttle"; pixel_x = -25},/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"EF" = (/obj/machinery/atmospherics/unary/engine{dir = 1},/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Fx" = (/obj/item/material/shard,/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/table/steel,/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Go" = (/obj/item/stack/material/rods,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
Expand All @@ -60,7 +60,7 @@
"JQ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/external{id_tag = "graysontug_shuttle_inner"; frequency = 1380},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"JU" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Kv" = (/obj/decal/cleanable/liquid_fuel,/obj/machinery/atmospherics/pipe/simple/visible/red,/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Lp" = (/obj/structure/bed/chair/shuttle/blue{dir = 1; icon_state = "shuttle_chair_preview"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/overmap/visitable/ship/landable/graysontug,/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Lp" = (/obj/structure/bed/chair/shuttle/blue{dir = 1; icon_state = "shuttle_chair_preview"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/overmap/visitable/ship/landable/graysontug,/obj/shuttle_landmark/graysontug/start,/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Oc" = (/obj/paint/sun,/turf/simulated/wall/titanium,/area/map_template/crashed_shuttle/graysontug)
"OY" = (/obj/machinery/computer/ship/helm{dir = 8},/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
"Pa" = (/obj/item/material/shard,/obj/structure/firedoor_assembly,/turf/simulated/floor/plating,/area/map_template/crashed_shuttle/graysontug)
Expand Down
4 changes: 2 additions & 2 deletions maps/random_ruins/exoplanet_ruins/transshipment/transshipment.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"aN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/map_template/transshipment/warehouse)
"aV" = (/obj/machinery/door/blast/shutters/open{dir = 4; name = "Container Flaps"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/map_template/transshipment/cabin_crate)
"aY" = (/turf/template_noop,/area/template_noop)
"bf" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/obj/machinery/door/airlock/external{id_tag = "oldsnz_shuttle_outer"; frequency = 1380},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/shuttle_landmark/old_snz/start,/turf/simulated/floor/tiled/techfloor/grid,/area/map_template/transshipment/old_snz)
"bf" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/obj/machinery/door/airlock/external{id_tag = "oldsnz_shuttle_outer"; frequency = 1380},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor/grid,/area/map_template/transshipment/old_snz)
"bj" = (/obj/floor_decal/industrial/warning/dust,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/exoplanet/concrete,/area/map_template/transshipment/airstrip)
"bl" = (/obj/decal/cleanable/generic,/obj/structure/barricade/spike,/turf/simulated/floor/exoplanet/concrete,/area/map_template/transshipment/airstrip)
"bK" = (/obj/machinery/sleeper{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/map_template/transshipment/old_snz)
Expand Down Expand Up @@ -270,7 +270,7 @@
"SD" = (/obj/floor_decal/industrial/warning/dust{dir = 8},/turf/simulated/floor/exoplanet/concrete,/area/map_template/transshipment/airstrip)
"SK" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24; locked = 0},/turf/simulated/floor/tiled/techmaint,/area/map_template/transshipment/warehouse)
"SX" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/map_template/transshipment/warehouse)
"Ta" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1},/obj/machinery/door/airlock/external{id_tag = "oldsnz_shuttle_outer"; frequency = 1380},/obj/machinery/access_button/airlock_exterior{frequency = 1380; master_tag = "oldsnz_shuttle"; pixel_x = -27; pixel_y = 7},/obj/overmap/visitable/ship/landable/old_snz,/turf/simulated/floor/tiled/techfloor/grid,/area/map_template/transshipment/old_snz)
"Ta" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1},/obj/machinery/door/airlock/external{id_tag = "oldsnz_shuttle_outer"; frequency = 1380},/obj/machinery/access_button/airlock_exterior{frequency = 1380; master_tag = "oldsnz_shuttle"; pixel_x = -27; pixel_y = 7},/obj/shuttle_landmark/old_snz/start,/obj/overmap/visitable/ship/landable/old_snz,/turf/simulated/floor/tiled/techfloor/grid,/area/map_template/transshipment/old_snz)
"Tc" = (/obj/random/tech_supply,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/lino,/area/map_template/transshipment/cabin_crate)
"Ti" = (/obj/machinery/floodlight,/turf/simulated/floor/tiled/techmaint,/area/map_template/transshipment/warehouse)
"To" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/storage/firstaid/surgery,/obj/item/stack/nanopaste,/obj/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/map_template/transshipment/old_snz)
Expand Down
5 changes: 1 addition & 4 deletions maps/sierra/sierra.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,7 @@
#include "../away/mininghome/mininghome.dm"
#include "../away/scavver/scavver_gantry.dm"
#include "../away/abandoned_hotel/abandoned_hotel.dm"
#include "../event/iccgn_ship/icgnv_hound.dm"
#include "../event/sfv_arbiter/sfv_arbiter.dm"
#include "../event/placeholders/placeholders.dm"
#include "../event/empty/empty.dm"
// #include "../event/iccgn_ship/icgnv_hound.dm" // SIERRA TODO: Пофиксить или удалить

#include "../bluespace_interlude/bluespace_interlude.dm"
#include "../bluespace_interlude/bluespace_interlude.dmm"
Expand Down
12 changes: 4 additions & 8 deletions maps/sierra/sierra_overmap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,10 @@
"Mule" = list("nav_merchant_out"), //../mods/maps/liberia/_map_liberia.dme shuttle,
"Reaper Gunboat" = list("nav_reaper_dock"), //../mods/maps/sentinel/_map_sentinel.dme shuttle,
"SNZ Speedboat" = list("nav_snz_dock"), //../../mods/maps/farfleet/_map_farfleet.dme shuttle,
"SSV-S" = list("nav_deck4_skrellshuttle"), //away/skrellscoutship.dm shuttle,
"Skrellian Scout" = list("nav_deck4_skrellscout"), //away/skrellscoutship.dm ship,
"Alien Interceptor" = list("nav_deck4_vox_raider"), //maps/antag_spawn/vox/voxraider.dm shuttle,
"Rescue" = list("nav_ert_dock"), //maps/antag_spawn/ert/ert.dm shuttle,
"SFV Arbiter" = list("nav_deck4_event_dock"), //maps/event/sfv_arbiter/sfv_arbiter.dm shuttle,
"ICGNV Hound" = list("nav_deck4_event_dock"), //maps/event/iccgn_ship/icgnv_hound.dm shuttle,
"SNZ-210 Personnel Carrier" = list("nav_deck4_skrellscout"), //maps/random_ruins/exoplanet_ruins/transshipment/transshipment.dm shuttle,
"GM Tug" = list("nav_merchant_out") //maps/random_ruins/exoplanet_ruins/crashed_shuttle/crashed_shuttle.dm shuttle
"Skrellian Shuttle" = list("nav_deck3_skrellshuttle"), //away/skrellscoutship.dm shuttle,
"Skrellian Scout" = list("nav_deck1_skrellscout"), //away/skrellscoutship.dm shuttle,
"Alien Interceptor" = list("nav_deck1_vox_raider"), //maps/antag_spawn/vox/voxraider.dm shuttle,
"Rescue" = list("nav_ert_dock") //maps/antag_spawn/ert/ert.dm shuttle
)

initial_generic_waypoints = list(
Expand Down
19 changes: 7 additions & 12 deletions maps/sierra/sierra_shuttles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,22 +492,17 @@ SIERRA_ESCAPE_POD(11)
name = "In transit"
landmark_tag = "nav_transit_blueriver"

/obj/shuttle_landmark/sierra/deck4/vox_raider
/obj/shuttle_landmark/sierra/deck1/vox_raider
name = "Fourth Deck Starboard Dock"
landmark_tag = "nav_deck4_vox_raider"
landmark_tag = "nav_deck1_vox_raider"
docking_controller = "admin_shuttle_dock"

/obj/shuttle_landmark/sierra/deck4/skrellshuttle
name = "Fourth Deck Starboard Dock"
landmark_tag = "nav_deck4_skrellshuttle"
docking_controller = "admin_shuttle_dock"

/obj/shuttle_landmark/sierra/deck4/event
name = "Fourth Deck Starboard Dock"
landmark_tag = "nav_deck4_event_dock"
/obj/shuttle_landmark/sierra/deck3/skrellshuttle
name = "Third Deck Starboard Dock"
landmark_tag = "nav_deck3_skrellshuttle"
docking_controller = "admin_shuttle_dock"

/obj/shuttle_landmark/sierra/deck4/skrellscout
/obj/shuttle_landmark/sierra/deck1/skrellscout
name = "Fourth Deck Auxillary Dock"
landmark_tag = "nav_deck4_skrellscout"
landmark_tag = "nav_deck1_skrellscout"
docking_controller = "rescue_shuttle_dock_airlock"
12 changes: 4 additions & 8 deletions maps/sierra/z1-z5_sierra.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55380,10 +55380,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/storage/eva)
"iip" = (
/obj/shuttle_landmark/sierra/deck4/event,
/turf/space,
/area/space)
"iir" = (
/obj/floor_decal/techfloor{
dir = 8
Expand Down Expand Up @@ -58151,7 +58147,7 @@
/turf/simulated/floor/tiled/dark/monotile,
/area/bridge/meeting_room)
"iFg" = (
/obj/shuttle_landmark/sierra/deck4/vox_raider,
/obj/shuttle_landmark/sierra/deck1/vox_raider,
/turf/space,
/area/space)
"iFo" = (
Expand Down Expand Up @@ -160146,8 +160142,8 @@
name = "Docking Port Airlock"
},
/obj/machinery/shield_diffuser,
/obj/shuttle_landmark/sierra/deck3/skrellshuttle,
/obj/floor_decal/industrial/hatch/yellow,
/obj/shuttle_landmark/sierra/deck4/skrellshuttle,
/turf/simulated/floor/tiled/techfloor/grid,
/area/hallway/primary/fourthdeck/center)
"xIl" = (
Expand Down Expand Up @@ -162956,7 +162952,7 @@
/area/hallway/primary/seconddeck/center)
"ycx" = (
/obj/shuttle_landmark/ert/dock,
/obj/shuttle_landmark/sierra/deck4/skrellscout,
/obj/shuttle_landmark/sierra/deck1/skrellscout,
/turf/space,
/area/space)
"ycK" = (
Expand Down Expand Up @@ -179833,7 +179829,7 @@ wJN
wJN
wJN
wJN
iip
wJN
ccL
xIk
eVJ
Expand Down