From 9b4c1ef761274511f03aa1d2d1d0bd5dd22c5cc9 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Fri, 11 Oct 2024 12:00:04 -0500 Subject: [PATCH 1/2] manateestation --- _maps/_basemap.dm | 2 +- _maps/asteroidstation.dm | 1 - _maps/manateestation.dm | 1 + _maps/{asteroidstation.json => manateestation.json} | 6 +++--- .../ManateeStation.dmm} | 0 config/maps.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 _maps/asteroidstation.dm create mode 100644 _maps/manateestation.dm rename _maps/{asteroidstation.json => manateestation.json} (53%) rename _maps/map_files/{AsteroidStation/AsteroidStation.dmm => ManateeStation/ManateeStation.dmm} (100%) diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index 48b96c8948f7..834555340e6c 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -9,7 +9,7 @@ #include "map_files\YogStation\Yogstation.dmm" #include "map_files\IceMeta\IceMeta.dmm" #include "map_files\GaxStation\GaxStation.dmm" - #include "map_files\AsteroidStation\AsteroidStation.dmm" + #include "map_files\ManateeStation\ManateeStation.dmm" #include "map_files\DonutStation\DonutStation.dmm" #ifdef TRAVISBUILDING #include "templates.dm" diff --git a/_maps/asteroidstation.dm b/_maps/asteroidstation.dm deleted file mode 100644 index a42370be2879..000000000000 --- a/_maps/asteroidstation.dm +++ /dev/null @@ -1 +0,0 @@ -#define FORCE_MAP "asteroidstation" diff --git a/_maps/manateestation.dm b/_maps/manateestation.dm new file mode 100644 index 000000000000..cb1f8044de7c --- /dev/null +++ b/_maps/manateestation.dm @@ -0,0 +1 @@ +#define FORCE_MAP "manateestation" diff --git a/_maps/asteroidstation.json b/_maps/manateestation.json similarity index 53% rename from _maps/asteroidstation.json rename to _maps/manateestation.json index 74416c468a12..d8b0eb50346d 100644 --- a/_maps/asteroidstation.json +++ b/_maps/manateestation.json @@ -1,7 +1,7 @@ { - "map_name": "[BETA] AsteroidStation", - "map_path": "map_files/AsteroidStation", - "map_file": "AsteroidStation.dmm", + "map_name": "ManateeStation", + "map_path": "map_files/ManateeStation", + "map_file": "ManateeStation.dmm", "shuttles": { "cargo": "cargo_box", "ferry": "ferry_fancy", diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/ManateeStation/ManateeStation.dmm similarity index 100% rename from _maps/map_files/AsteroidStation/AsteroidStation.dmm rename to _maps/map_files/ManateeStation/ManateeStation.dmm diff --git a/config/maps.txt b/config/maps.txt index ffd38fe0c921..f8effe8b1556 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -30,7 +30,7 @@ map gaxstation votable endmap -map asteroidstation +map manateestation minplayers 40 votable endmap From 00df86577dcc0b377163068007fde4f383b1babd Mon Sep 17 00:00:00 2001 From: Byemoh Date: Mon, 14 Oct 2024 14:48:08 -0500 Subject: [PATCH 2/2] Update ManateeStation.dmm --- .../ManateeStation/ManateeStation.dmm | 236 ++++-------------- 1 file changed, 52 insertions(+), 184 deletions(-) diff --git a/_maps/map_files/ManateeStation/ManateeStation.dmm b/_maps/map_files/ManateeStation/ManateeStation.dmm index c6d3f9c2543f..14efb761b3cf 100644 --- a/_maps/map_files/ManateeStation/ManateeStation.dmm +++ b/_maps/map_files/ManateeStation/ManateeStation.dmm @@ -68,9 +68,7 @@ /turf/closed/wall, /area/quartermaster/qm) "aaD" = ( -/obj/machinery/airalarm/directional/south{ - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/south, /obj/structure/table, /obj/item/reagent_containers/glass/bottle/ethanol{ pixel_x = -5; @@ -182,9 +180,7 @@ /turf/open/floor/carpet, /area/crew_quarters/cryopods) "abM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "abP" = ( @@ -2616,7 +2612,6 @@ "axy" = ( /obj/structure/chair/comfy{ dir = 4; - icon_state = "comfychair"; tag = "" }, /obj/machinery/light/broken{ @@ -5928,9 +5923,7 @@ /turf/open/floor/plasteel, /area/engine/foyer) "bcH" = ( -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -8702,8 +8695,7 @@ /area/medical/sleeper) "cah" = ( /obj/machinery/camera{ - c_tag = "Theatre Stage"; - dir = 2 + c_tag = "Theatre Stage" }, /obj/item/radio/intercom{ dir = 8; @@ -11611,7 +11603,6 @@ /obj/structure/cable, /obj/machinery/power/apc{ areastring = "/area/medical/storage"; - dir = 2; name = "Medbay Storage APC"; pixel_y = -23 }, @@ -12067,8 +12058,7 @@ /obj/machinery/camera{ c_tag = "Medbay Treatment Center"; dir = 8; - network = list("ss13","medbay"); - pixel_x = 0 + network = list("ss13","medbay") }, /turf/open/floor/plasteel/dark, /area/medical/sleeper) @@ -12488,9 +12478,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "dfv" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/dark, /area/science/mixing) "dfz" = ( @@ -16067,7 +16055,6 @@ "ekL" = ( /obj/machinery/requests_console{ department = "Mining"; - departmentType = 0; name = "Mining RC"; pixel_x = 32; pixel_y = 29 @@ -16906,7 +16893,6 @@ "evS" = ( /obj/machinery/light, /obj/structure/tank_dispenser/oxygen{ - layer = 2.9; pixel_x = -1; pixel_y = 2 }, @@ -17598,7 +17584,6 @@ /obj/structure/cable, /obj/machinery/power/apc{ areastring = "/area/medical/storage/backroom"; - dir = 2; name = "Medical Backrooms APC"; pixel_y = -23 }, @@ -17989,9 +17974,7 @@ icon_state = "1-2"; tag = "" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, /area/medical/sleeper) "eNk" = ( @@ -18540,9 +18523,7 @@ /turf/open/floor/plasteel, /area/hydroponics) "eUU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, /area/engine/atmos/distro) "eVg" = ( @@ -18763,9 +18744,7 @@ }, /area/crew_quarters/bar) "eZj" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, @@ -21850,9 +21829,6 @@ /area/security/prison) "fYo" = ( /obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 2; - icon_state = "left"; name = "Kitchen Delivery" }, /obj/effect/turf_decal/delivery, @@ -22728,9 +22704,6 @@ /area/engine/atmos/distro) "gng" = ( /obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 2; - icon_state = "left"; name = "Bar Delivery" }, /obj/effect/turf_decal/delivery, @@ -24369,9 +24342,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gND" = ( @@ -27231,9 +27202,7 @@ /area/science/xenobiology) "hGo" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -27506,9 +27475,7 @@ /turf/open/floor/plasteel, /area/engine/atmos/hfr) "hKm" = ( -/obj/structure/table/glass{ - name = "glass table" - }, +/obj/structure/table/glass, /obj/machinery/cell_charger, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 @@ -27794,9 +27761,7 @@ /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "hOq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "hOL" = ( @@ -28823,9 +28788,7 @@ /area/bridge/meeting_room) "ihh" = ( /obj/structure/table/glass, -/obj/machinery/airalarm/directional/south{ - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/south, /obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 @@ -28948,9 +28911,7 @@ /turf/open/floor/plasteel/dark, /area/bridge) "ija" = ( -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -29867,8 +29828,7 @@ dir = 8 }, /obj/machinery/computer/atmos_sim{ - dir = 8; - mode = 1 + dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 6 @@ -31143,17 +31103,9 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/plasteel/dark, /area/bridge) -"iTl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "iTs" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -32372,8 +32324,7 @@ dir = 8 }, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /obj/machinery/door/airlock/security/glass{ name = "Transfer Chamber" @@ -32529,7 +32480,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/circuit/telecomms/server, @@ -36527,9 +36477,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "kxB" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/white, /area/science/mixing) "kxL" = ( @@ -37864,7 +37812,6 @@ /area/medical/medbay/aft) "kXj" = ( /obj/item/reagent_containers/food/snacks/fish/goldfish{ - bitecount = 0; length = 1; weight = 2 }, @@ -39560,12 +39507,6 @@ /obj/effect/turf_decal/trimline/green/warning/lower, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) -"lBg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/engine/atmos/hfr) "lBP" = ( /obj/machinery/conveyor{ id = "QMLoad" @@ -40693,8 +40634,7 @@ icon_state = "0-2" }, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -41001,9 +40941,7 @@ /area/maintenance/starboard/fore) "lYP" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -41623,9 +41561,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/structure/cable{ icon_state = "4-8" }, @@ -42189,7 +42125,6 @@ pixel_x = -4; pixel_y = 36 }, -/obj/machinery/pdapainter, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 9 }, @@ -44815,12 +44750,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, /area/hallway/primary/central) -"nda" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "ndb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44872,9 +44801,7 @@ /turf/open/floor/plating/asteroid, /area/space/nearstation) "ndK" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, @@ -46298,7 +46225,6 @@ dir = 4 }, /obj/machinery/defibrillator_mount/loaded{ - pixel_x = 0; pixel_y = -31 }, /turf/open/floor/plasteel/dark, @@ -47709,8 +47635,7 @@ dir = 4 }, /obj/machinery/door/poddoor/preopen{ - id = "cell3 blast"; - name = "blast door" + id = "cell3 blast" }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -48445,9 +48370,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "okt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, /area/medical/storage/backroom) "okv" = ( @@ -50269,7 +50192,6 @@ "oLK" = ( /obj/structure/chair/comfy{ dir = 4; - icon_state = "comfychair"; tag = "" }, /obj/machinery/light/broken, @@ -52496,8 +52418,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, /obj/machinery/computer/atmos_sim{ - dir = 1; - mode = 1 + dir = 1 }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -52555,9 +52476,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, -/obj/machinery/airalarm/directional/west{ - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/white, /area/medical/sleeper) "puV" = ( @@ -54413,9 +54332,7 @@ /area/security/brig) "pXG" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -59047,8 +58964,7 @@ pixel_y = 1 }, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /turf/open/floor/plating, /area/security/execution/transfer) @@ -62259,9 +62175,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "sps" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, @@ -62437,9 +62351,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "srW" = ( @@ -62523,9 +62435,7 @@ /area/hallway/secondary/entry) "stF" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -63475,7 +63385,6 @@ pixel_y = 3 }, /obj/item/flashlight/lamp/green{ - light_on = 0; pixel_x = -6; pixel_y = 11 }, @@ -67351,6 +67260,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, +/obj/machinery/pdapainter, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "tPT" = ( @@ -68000,8 +67910,7 @@ "tYo" = ( /obj/structure/cable, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -68787,8 +68696,7 @@ icon_state = "1-2" }, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /turf/open/floor/plating, /area/security/execution/transfer) @@ -69412,8 +69320,7 @@ dir = 4 }, /obj/machinery/door/poddoor/preopen{ - id = "cell2 blast"; - name = "blast door" + id = "cell2 blast" }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -69650,9 +69557,7 @@ /area/security/execution/transfer) "uAH" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -71104,7 +71009,6 @@ }, /obj/machinery/vending/wallhypo{ dir = 1; - pixel_x = 0; pixel_y = -28 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, @@ -71135,9 +71039,7 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -71603,9 +71505,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port/aft) "vjp" = ( @@ -71727,9 +71627,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port/fore) "vlg" = ( @@ -75952,24 +75850,19 @@ icon_state = "0-4" }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_y = -27 }, /obj/item/radio/intercom{ - anyai = 1; - broadcasting = 0; freerange = 1; frequency = 1447; name = "Private Channel"; pixel_y = 20 }, /obj/item/radio/intercom{ - broadcasting = 0; freerange = 1; - listening = 1; name = "Common Channel"; pixel_y = -37 }, @@ -77062,8 +76955,7 @@ dir = 4 }, /obj/machinery/door/poddoor/preopen{ - id = "cell1 blast"; - name = "blast door" + id = "cell1 blast" }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -77450,7 +77342,6 @@ pixel_y = 5 }, /obj/item/pen/red{ - pixel_x = 0; pixel_y = 5 }, /turf/open/floor/carpet, @@ -77933,13 +77824,6 @@ /obj/structure/chair/stool/bar, /turf/open/floor/eighties, /area/maintenance/starboard/fore) -"xdI" = ( -/obj/effect/turf_decal/box/corners{ - dir = 1; - icon_state = "box_corners" - }, -/turf/open/floor/engine, -/area/science/xenobiology) "xdL" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -78335,9 +78219,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, /area/engine/atmos/pumproom) "xkS" = ( @@ -78818,7 +78700,6 @@ dir = 4 }, /obj/item/radio/intercom{ - anyai = 1; broadcasting = 1; frequency = 1423; listening = 0; @@ -78935,9 +78816,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xvF" = ( @@ -80413,15 +80292,6 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"xSH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xTc" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -80767,9 +80637,7 @@ /turf/open/floor/plating, /area/maintenance/port) "xYM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/central) "xYX" = ( @@ -98780,7 +98648,7 @@ aii aii aii aii -iTl +awU alR meo aoq @@ -104210,7 +104078,7 @@ uxp fFP oIN nsk -nda +iNl oQP jsE aQo @@ -110591,7 +110459,7 @@ gjq gjq gjq gjq -xSH +kPF ycw jbn aiZ @@ -112918,16 +112786,16 @@ okp vGq nFW adX -xdI +faj aFu xxt -xdI +faj aFu obD -xdI +faj aFu obD -xdI +faj aFu tdf aBD @@ -130680,7 +130548,7 @@ qIN tEi odT tEi -lBg +eBw uzL nxO hVs