cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Exodus StrongDMM Mapmerge (#10824)

Browse Source
This commit is contained in:
Geeves
2020-12-18 21:29:58 +01:00
committed by GitHub
parent 4cd8043d22
commit a61e0e7047
3 changed files with 100 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/exodus/exodus-2_centcomm.dmm
+11 -59
View File
@@ -2287,7 +2287,6 @@
"amm" = (
/obj/machinery/door/airlock/centcom{
name = "Barracks";
opacity = 1;
req_access = list(150)
},
/turf/unsimulated/floor{
@@ -2474,7 +2473,6 @@
"amI" = (
/obj/machinery/door/airlock/centcom{
name = "Kitchen";
opacity = 1;
req_access = list(150)
},
/turf/unsimulated/floor{
@@ -2897,8 +2895,7 @@
/area/antag/mercenary)
"anB" = (
/obj/machinery/door/airlock/centcom{
name = "Bathroom";
opacity = 1
name = "Bathroom"
},
/turf/unsimulated/floor{
icon_state = "freezerfloor"
@@ -2987,8 +2984,7 @@
/area/antag/mercenary)
"anK" = (
/obj/machinery/door/airlock/centcom{
name = "Suit Storage";
opacity = 1
name = "Suit Storage"
},
/turf/unsimulated/floor{
icon_state = "dark"
@@ -3580,8 +3576,7 @@
/area/shuttle/mercenary)
"aoR" = (
/obj/machinery/door/airlock/centcom{
name = "Hardsuit Storage";
opacity = 1
name = "Hardsuit Storage"
},
/turf/unsimulated/floor{
icon_state = "dark"
@@ -3763,7 +3758,6 @@
"apo" = (
/obj/machinery/door/airlock/centcom{
name = "General Access";
opacity = 1;
req_access = list(101)
},
/turf/simulated/floor/plating,
@@ -5522,7 +5516,6 @@
"avK" = (
/obj/machinery/door/airlock/centcom{
name = "Special Operations";
opacity = 1;
req_access = list(103)
},
/turf/unsimulated/floor{
@@ -5615,7 +5608,6 @@
"awo" = (
/obj/machinery/door/airlock/centcom{
name = "Armory Special Operations";
opacity = 1;
req_access = list(103)
},
/turf/unsimulated/floor{
@@ -5626,7 +5618,6 @@
"awp" = (
/obj/machinery/door/airlock/centcom{
name = "Engineering Special Operations";
opacity = 1;
req_access = list(103)
},
/turf/unsimulated/floor{
@@ -5682,7 +5673,6 @@
"awB" = (
/obj/machinery/door/airlock/centcom{
name = "Special Operations Command";
opacity = 1;
req_access = list(103)
},
/turf/unsimulated/floor{
@@ -5846,7 +5836,6 @@
"axf" = (
/obj/machinery/door/airlock/centcom{
name = "Medical Special Operations";
opacity = 1;
req_access = list(103)
},
/turf/unsimulated/floor{
@@ -5920,8 +5909,7 @@
/area/centcom/living)
"axr" = (
/obj/machinery/door/airlock/centcom{
name = "NMSS Odin CCIA Administration";
opacity = 1
name = "NMSS Odin CCIA Administration"
},
/turf/unsimulated/floor{
icon_state = "floor"
@@ -6342,8 +6330,7 @@
/area/centcom)
"ayx" = (
/obj/machinery/door/airlock/centcom{
name = "To: NSS Exodus Processing";
opacity = 1
name = "To: NSS Exodus Processing"
},
/turf/unsimulated/floor,
/area/centcom/living)
@@ -7053,8 +7040,7 @@
/area/centcom/creed)
"aAS" = (
/obj/machinery/door/airlock/centcom{
name = "NMSS Odin Sub-Deck";
opacity = 1
name = "NMSS Odin Sub-Deck"
},
/turf/unsimulated/floor{
icon_state = "bluefull"
@@ -7468,7 +7454,6 @@
"aCv" = (
/obj/machinery/door/airlock/centcom{
name = "Creed's Office";
opacity = 1;
req_access = list(108,109)
},
/obj/machinery/door/blast/regular{
@@ -7701,7 +7686,6 @@
"aDq" = (
/obj/machinery/door/airlock/centcom{
name = "Special Operations";
opacity = 1;
req_access = list(103)
},
/turf/unsimulated/floor{
@@ -8623,7 +8607,6 @@
"aGM" = (
/obj/machinery/door/airlock/centcom{
name = "General Access";
opacity = 1;
req_access = list(101)
},
/turf/unsimulated/floor{
@@ -10167,7 +10150,6 @@
"aLL" = (
/obj/machinery/door/airlock/centcom{
name = "Utility Closet";
opacity = 1;
req_access = list(109)
},
/obj/structure/sign/christmas/wreath,
@@ -10774,8 +10756,7 @@
/area/centcom/spawning)
"aNg" = (
/obj/machinery/door/airlock/centcom{
name = "Bluespace Artillery Deck";
opacity = 1
name = "Bluespace Artillery Deck"
},
/obj/machinery/door/blast/regular{
dir = 4;
@@ -10891,7 +10872,6 @@
"aNw" = (
/obj/machinery/door/airlock/centcom{
name = "Aurora II Prepatory Wing";
opacity = 1;
req_access = list(109)
},
/turf/unsimulated/floor{
@@ -11384,7 +11364,6 @@
"aOD" = (
/obj/machinery/door/airlock/centcom{
name = "Arrivals Processing";
opacity = 1;
req_access = list(101)
},
/turf/unsimulated/floor{
@@ -11411,8 +11390,7 @@
/area/centcom/holding)
"aOJ" = (
/obj/machinery/door/airlock/centcom{
name = "Bluespace Artillery Deck";
opacity = 1
name = "Bluespace Artillery Deck"
},
/obj/machinery/door/blast/regular{
dir = 4;
@@ -12268,7 +12246,6 @@
"aQI" = (
/obj/machinery/door/airlock/centcom{
name = "General Access";
opacity = 1;
req_access = list(101)
},
/obj/machinery/door/blast/regular{
@@ -13847,7 +13824,6 @@
"aUt" = (
/obj/machinery/door/airlock/centcom{
name = "Administration Shuttle";
opacity = 1;
req_access = list(108,109)
},
/obj/machinery/door/blast/regular{
@@ -13965,7 +13941,6 @@
"aUK" = (
/obj/machinery/door/airlock/centcom{
name = "Holding Cell";
opacity = 1;
req_access = list(101)
},
/obj/machinery/door/blast/regular{
@@ -14723,7 +14698,6 @@
"aWr" = (
/obj/machinery/door/airlock/centcom{
name = "Bridge";
opacity = 1;
req_access = list(109)
},
/turf/unsimulated/floor{
@@ -14754,7 +14728,6 @@
"aWv" = (
/obj/machinery/door/airlock/centcom{
name = "Communications Control";
opacity = 1;
req_access = list(104)
},
/turf/unsimulated/floor{
@@ -14793,8 +14766,7 @@
/area/centcom/ferry)
"aWz" = (
/obj/machinery/door/airlock/centcom{
name = "Interview Room";
opacity = 1
name = "Interview Room"
},
/turf/unsimulated/floor{
icon_state = "carpet"
@@ -14828,7 +14800,6 @@
"aWC" = (
/obj/machinery/door/airlock/centcom{
name = "Special Operations";
opacity = 1;
req_access = list(103)
},
/obj/machinery/door/blast/regular{
@@ -14911,7 +14882,6 @@
"aWM" = (
/obj/machinery/door/airlock/centcom{
name = "Teleporter Bay";
opacity = 1;
req_access = list(107)
},
/turf/unsimulated/floor{
@@ -15679,7 +15649,6 @@
"aYO" = (
/obj/machinery/door/airlock/centcom{
name = "Special Operations";
opacity = 1;
req_access = list(103)
},
/obj/machinery/door/blast/regular{
@@ -15856,7 +15825,6 @@
"aZi" = (
/obj/machinery/door/airlock/centcom{
name = "Research Facility";
opacity = 1;
req_access = list(104)
},
/turf/unsimulated/floor{
@@ -16463,7 +16431,6 @@
"crG" = (
/obj/machinery/door/airlock/centcom{
name = "Fore Checkpoint";
opacity = 1;
req_access = list(101)
},
/turf/unsimulated/floor{
@@ -16525,7 +16492,6 @@
id_tag = "CentComArrivalsForeDrAft";
locked = 1;
name = "Fore Checkpoint";
opacity = 1;
req_access = list(101)
},
/turf/unsimulated/floor{
@@ -16561,7 +16527,6 @@
"der" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome";
opacity = 1;
req_access = list(101)
},
/obj/machinery/door/blast/regular{
@@ -16829,7 +16794,6 @@
"evz" = (
/obj/machinery/door/airlock/centcom{
name = "Aft Checkpoint";
opacity = 1;
req_access = list(101)
},
/turf/unsimulated/floor{
@@ -16929,8 +16893,7 @@
/area/centcom/holding)
"eWW" = (
/obj/machinery/door/airlock/centcom{
name = "Traditional Vaurcesian Cuisine";
opacity = 1
name = "Traditional Vaurcesian Cuisine"
},
/turf/unsimulated/floor{
icon_state = "floor"
@@ -16979,7 +16942,6 @@
"fde" = (
/obj/machinery/door/airlock/centcom{
name = "IAC Regional Outpost A23";
opacity = 1;
req_access = list(109)
},
/turf/unsimulated/floor{
@@ -17962,7 +17924,6 @@
"iBj" = (
/obj/machinery/door/airlock/centcom{
name = "Romanovich Exploration Guild";
opacity = 1;
req_access = list(109)
},
/turf/unsimulated/floor{
@@ -18910,7 +18871,6 @@
"oIe" = (
/obj/machinery/door/airlock/centcom{
name = "General Access";
opacity = 1;
req_access = list(101)
},
/obj/machinery/door/blast/regular{
@@ -18924,7 +18884,6 @@
"oIB" = (
/obj/machinery/door/airlock/centcom{
name = "General Access";
opacity = 1;
req_access = list(101)
},
/turf/unsimulated/floor{
@@ -19212,8 +19171,7 @@
/area/centcom/spawning)
"qkB" = (
/obj/machinery/door/airlock/centcom{
name = "Real Fake Doors! and Co";
opacity = 1
name = "Real Fake Doors! and Co"
},
/turf/unsimulated/floor{
icon_state = "floor"
@@ -19498,7 +19456,6 @@
"rzt" = (
/obj/machinery/door/airlock/centcom{
name = "The Big Empty";
opacity = 1;
req_access = list(109)
},
/turf/unsimulated/floor{
@@ -19843,7 +19800,6 @@
id_tag = "CentComArrivalsAftDrAft";
locked = 1;
name = "Aft Checkpoint";
opacity = 1;
req_access = list(101)
},
/turf/unsimulated/floor{
@@ -19866,7 +19822,6 @@
"tBx" = (
/obj/machinery/door/airlock/centcom{
name = "General Access";
opacity = 1;
req_access = newlist()
},
/turf/unsimulated/floor{
@@ -20256,7 +20211,6 @@
"vdL" = (
/obj/machinery/door/airlock/centcom{
name = "Staff Only";
opacity = 1;
req_access = list(109)
},
/turf/unsimulated/floor{
@@ -20586,7 +20540,6 @@
"xcE" = (
/obj/machinery/door/airlock/centcom{
name = "Security Checkpoint";
opacity = 1;
req_access = list(109)
},
/turf/unsimulated/floor{
@@ -20686,7 +20639,6 @@
id_tag = "CentComArrivalsAftDrFore";
locked = 1;
name = "Aft Checkpoint";
opacity = 1;
req_access = list(101)
},
/turf/unsimulated/floor{
maps/exodus/exodus-3_telecomms.dmm
+80 -80
View File
@@ -22,8 +22,8 @@
/area/derelict/ship)
"al" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r";
dir = 4
dir = 4;
icon_state = "propulsion_r"
},
/turf/template_noop,
/area/derelict/ship)
@@ -148,8 +148,8 @@
/area/derelict/ship)
"aI" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l";
dir = 4
dir = 4;
icon_state = "propulsion_l"
},
/turf/template_noop,
/area/derelict/ship)
@@ -224,8 +224,8 @@
/area/derelict/ship)
"aT" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 8
dir = 8;
icon_state = "tube1"
},
/turf/simulated/floor/shuttle{
icon_state = "floor3"
@@ -465,8 +465,8 @@
pixel_x = -24
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/shuttle{
icon_state = "floor3"
@@ -607,8 +607,8 @@
/area/turret_protected/tcomsat)
"cl" = (
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc{
dir = 1;
@@ -1018,8 +1018,8 @@
dir = 6
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"ds" = (
@@ -1031,8 +1031,8 @@
dir = 4
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"dt" = (
@@ -1044,8 +1044,8 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"du" = (
@@ -1062,8 +1062,8 @@
dir = 4
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"dv" = (
@@ -1080,8 +1080,8 @@
dir = 4
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/tcommsat/computer)
"dw" = (
@@ -1206,8 +1206,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"dN" = (
@@ -1336,8 +1336,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/tcommsat/computer)
"dY" = (
@@ -1361,8 +1361,8 @@
dir = 8
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 6
@@ -1376,8 +1376,8 @@
dir = 1
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable{
d2 = 8;
@@ -1398,8 +1398,8 @@
},
/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable{
d2 = 8;
@@ -1417,8 +1417,8 @@
dir = 1
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable{
d2 = 8;
@@ -1467,8 +1467,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"eh" = (
@@ -1489,8 +1489,8 @@
dir = 5
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"ej" = (
@@ -1513,8 +1513,8 @@
/area/tcommsat/chamber)
"el" = (
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc{
dir = 1;
@@ -1650,8 +1650,8 @@
dir = 4
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"ev" = (
@@ -1716,8 +1716,8 @@
dir = 6
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"eC" = (
@@ -1790,8 +1790,8 @@
dir = 9
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"eL" = (
@@ -1892,8 +1892,8 @@
dir = 8
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"eV" = (
@@ -1957,8 +1957,8 @@
pixel_x = -32
},
/obj/machinery/light{
icon_state = "tube1";
dir = 8
dir = 8;
icon_state = "tube1"
},
/turf/simulated/floor/bluegrid{
name = "Mainframe Base";
@@ -2031,8 +2031,8 @@
},
/obj/structure/lattice,
/obj/machinery/light{
icon_state = "tube1";
dir = 8
dir = 8;
icon_state = "tube1"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -2047,8 +2047,8 @@
dir = 1
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"fo" = (
@@ -2060,8 +2060,8 @@
dir = 4
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"fp" = (
@@ -2246,9 +2246,9 @@
external_pressure_bound = 140;
external_pressure_bound_default = 140;
icon_state = "map_vent_out";
use_power = 1;
pressure_checks = 0;
pressure_checks_default = 0
pressure_checks_default = 0;
use_power = 1
},
/turf/simulated/floor/bluegrid{
name = "Mainframe Base";
@@ -2284,10 +2284,10 @@
initialize_directions = 1;
internal_pressure_bound = 4000;
internal_pressure_bound_default = 4000;
use_power = 1;
pressure_checks = 2;
pressure_checks_default = 2;
pump_direction = 0
pump_direction = 0;
use_power = 1
},
/turf/simulated/floor/bluegrid{
name = "Mainframe Base";
@@ -2334,8 +2334,8 @@
pixel_y = 24
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/obj/effect/floor_decal/industrial/warning{
dir = 9
@@ -2445,8 +2445,8 @@
dir = 5
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"gg" = (
@@ -2458,8 +2458,8 @@
dir = 4
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomfoyer)
"gh" = (
@@ -2504,8 +2504,8 @@
dir = 4
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomfoyer)
"gm" = (
@@ -2517,8 +2517,8 @@
dir = 9
},
/turf/simulated/floor/tiled{
icon_state = "vault";
dir = 5
dir = 5;
icon_state = "vault"
},
/area/turret_protected/tcomsat)
"gn" = (
@@ -2617,8 +2617,8 @@
},
/obj/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/plating,
/area/tcommsat/entrance)
@@ -2631,8 +2631,8 @@
mapped_in = 1
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/tiled,
/area/tcommsat/entrance)
@@ -2690,8 +2690,8 @@
name = "telecoms power monitoring"
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/sensor{
long_range = 1;
@@ -2930,14 +2930,14 @@
id_tag = "telecoms_pump"
},
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
tag_airpump = "telecoms_pump";
tag_exterior_door = "telecoms_outer";
frequency = 1381;
id_tag = "telecoms_airlock";
tag_interior_door = "telecoms_inner";
pixel_y = -25;
req_access = list(13);
tag_chamber_sensor = "telecoms_sensor"
tag_airpump = "telecoms_pump";
tag_chamber_sensor = "telecoms_sensor";
tag_exterior_door = "telecoms_outer";
tag_interior_door = "telecoms_inner"
},
/obj/machinery/airlock_sensor{
frequency = 1381;
@@ -3123,8 +3123,8 @@
/area/AIsattele)
"hH" = (
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/airless,
/area/AIsattele)
maps/exodus/exodus-4_derelict.dmm
+9 -9
View File
@@ -137,8 +137,8 @@
"aB" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
icon_state = "tube1";
dir = 1
dir = 1;
icon_state = "tube1"
},
/obj/item/stack/material/steel{
amount = 50
@@ -767,11 +767,11 @@
/area/constructionsite/atmospherics)
"cq" = (
/obj/machinery/computer/general_air_control/large_tank_control{
default_pressure_setting = 2000;
frequency = 1443;
input_tag = "d_air_in";
name = "Mixed Air Supply Control";
output_tag = "d_air_out";
default_pressure_setting = 2000;
sensors = list("d_air_sensor" = "Tank")
},
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -807,10 +807,10 @@
id_tag = "d_air_out";
internal_pressure_bound = 2000;
internal_pressure_bound_default = 2000;
use_power = 1;
pressure_checks = 2;
pressure_checks_default = 2;
pump_direction = 0
pump_direction = 0;
use_power = 1
},
/turf/simulated/floor/reinforced/airmix,
/area/constructionsite/atmospherics)
@@ -880,10 +880,10 @@
initialize_directions = 1;
internal_pressure_bound = 4000;
internal_pressure_bound_default = 4000;
use_power = 1;
pressure_checks = 2;
pressure_checks_default = 2;
pump_direction = 0
pump_direction = 0;
use_power = 1
},
/turf/simulated/floor/reinforced/oxygen,
/area/constructionsite/atmospherics)
@@ -955,10 +955,10 @@
initialize_directions = 1;
internal_pressure_bound = 4000;
internal_pressure_bound_default = 4000;
use_power = 1;
pressure_checks = 2;
pressure_checks_default = 2;
pump_direction = 0
pump_direction = 0;
use_power = 1
},
/turf/simulated/floor/reinforced/nitrogen,
/area/constructionsite/atmospherics)