From e2b24f9029201a9e0fbc29a7a85f6abca8c3bed3 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Fri, 21 Feb 2025 01:48:45 -0600 Subject: [PATCH] Maplinters Port & DMI Test Enable (#9105) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- .github/workflows/ci.yml | 16 +- 1Item_list.dmm | 81 +- 1SP_pods.dmm | 22 +- 1mapping_palette.dmm | 132 +- code/game/area/Space Station 13 areas.dm | 4 + code/game/turfs/simulated/floor_types.dm | 3 + icons/obj/pipes/large.dmi | Bin 8198 -> 0 bytes .../crate_lockers/closets/secure/security.dm | 2 +- .../maps/overmap/om_ships/bearcat.dmm | 401 +- .../maps/overmap/om_ships/curashuttle.dmm | 15 +- .../overmap/om_ships/cybershuttle-10x11.dmm | 23 +- .../maps/overmap/om_ships/gecko_sh.dmm | 1 - .../overmap/space_pois/abandonedzoo_50x50.dmm | 143 +- .../overmap/space_pois/asteroid4_60x60.dmm | 15 +- .../space_pois/blowntcommsat_53x56.dmm | 3 +- .../overmap/space_pois/clownmime_28x20.dmm | 57 +- .../maps/overmap/space_pois/debris1_60x60.dmm | 14 +- .../overmap/space_pois/deepstorage_85x67.dmm | 12 +- .../overmap/space_pois/derelict1_100x100.dmm | 77 +- .../overmap/space_pois/derelict2_20x20.dmm | 132 +- .../overmap/space_pois/derelict3_40x40.dmm | 7 +- .../overmap/space_pois/derelict4_40x40.dmm | 9 +- .../maps/overmap/space_pois/dj_31x28.dmm | 10 +- .../maps/overmap/space_pois/druglab_32x32.dmm | 7 +- .../space_pois/intactemptyship_30x25.dmm | 26 +- .../overmap/space_pois/oldstation_80x45.dmm | 3 +- .../maps/overmap/space_pois/onehalf_60x20.dmm | 141 +- .../overmap/space_pois/spacebar_40x40.dmm | 20 +- .../space_pois/spaceseveneleven_45x45.dmm | 3 +- .../space_pois/syndiecakesfactory_40x40.dmm | 36 +- .../overmap/space_pois/syndiedepot_57x49.dmm | 3 +- .../space_pois/turretedoutpost_23x19.dmm | 3 +- .../maps/overmap/space_pois/ussp_84x90.dmm | 1125 +- .../overmap/space_pois/whiteship_55x30.dmm | 9 +- .../overmap/space_pois/wizardcrash_20x35.dmm | 2 - .../maps/relic_base/backup/relicbase-1.dmm | 1657 - .../maps/relic_base/backup/relicbase-7.dmm | 1892 - .../maps/relic_base/relicbase-10.dmm | 176 +- .../maps/relic_base/relicbase-12.dmm | 68 +- .../maps/relic_base/relicbase-13.dmm | 212 +- modular_chomp/maps/relic_base/relicbase-2.dmm | 7181 +- modular_chomp/maps/relic_base/relicbase-3.dmm | 332 +- .../maps/relic_base/relicbase_areas.dm | 73 + .../submaps/asteroid_belt/broken_o2_gen.dmm | 322 +- .../asteroid_belt/corrupt_hound_bay.dmm | 235 +- .../submaps/asteroid_belt/crashed_shuttle.dmm | 216 +- .../asteroid_belt/frost_spider_nest.dmm | 176 +- .../submaps/asteroid_belt/hard_cave.dmm | 56 +- .../submaps/asteroid_belt/infection_pod.dmm | 82 +- .../submaps/asteroid_belt/inferno.dmm | 91 +- .../submaps/asteroid_belt/large_cave.dmm | 716 +- .../submaps/asteroid_belt/mimicry.dmm | 76 +- .../asteroid_belt/mysterious_cavern.dmm | 505 +- .../submaps/asteroid_belt/normal_cave.dmm | 146 +- .../submaps/asteroid_belt/pressure_seal.dmm | 66 +- .../submaps/asteroid_belt/space_cave.dmm | 121 +- .../relic_base/submaps/gateway/carpfarm.dmm | 20915 +++- .../relic_base/submaps/gateway/darkrps.dmm | 248 +- .../submaps/gateway/hiddeneclipse.dmm | 124 +- .../submaps/gateway/maddnesslab.dmm | 98 +- .../relic_base/submaps/gateway/snowfield.dmm | 22350 +++- .../maps/relic_base/submaps/sc_belt_miner.dmm | 68484 +++++++++++- .../maps/soluna_nexus/soluna_nexus-1.dmm | 47 +- .../maps/soluna_nexus/soluna_nexus-2.dmm | 141 +- .../maps/soluna_nexus/soluna_nexus-3.dmm | 392 +- .../maps/soluna_nexus/soluna_nexus-6.dmm | 59 +- .../maps/soluna_nexus/soluna_nexus-7.dmm | 95 +- .../maps/soluna_nexus/soluna_nexus-8.dmm | 1670 +- .../planets/kara/aerostat/aerostat.dmm | 30 +- .../backup/northern_star_mine.dmm | 87544 ---------------- .../kara/northern_star/northern_star_mine.dmm | 1619 +- .../overmap/planets/tyr/tyr.dmm | 1041 - .../maps/southern_cross/southern_cross-1.dmm | 12 +- .../maps/southern_cross/southern_cross-2.dmm | 239 +- .../maps/southern_cross/southern_cross-4.dmm | 892 +- .../maps/southern_cross/southern_cross-5.dmm | 3 +- .../maps/southern_cross/southern_cross-7.dmm | 2 +- .../maps/southern_cross/southern_cross-8.dmm | 328 +- .../maps/southern_cross/southern_cross-9.dmm | 1532 +- .../southern_cross/southern_cross_areas.dm | 4 +- .../submaps/gateway/darkrps.dmm | 248 +- .../submaps/gateway/hiddeneclipse.dmm | 124 +- .../submaps/gateway/maddnesslab.dmm | 8 +- .../submaps/gateway/snowfield.dmm | 146 +- .../southern_cross/submaps/sc_belt_miner.dmm | 21 +- .../southern_cross/engine_singulo.dmm | 24 +- .../southern_cross/engine_tesla.dmm | 3 +- .../submaps/shelters/BroadcastingPod-11x9.dmm | 4 +- .../shelters/CrashedInfestedShip-56x25.dmm | 4 +- .../submaps/shelters/DemonPoolV2-43x28.dmm | 2 +- .../maps/submaps/shelters/HellCave-40x25.dmm | 2 +- .../maps/submaps/shelters/HydroCave-40x40.dmm | 48 +- .../submaps/shelters/LargeAlienShip-57x25.dmm | 77 +- .../maps/submaps/shelters/Logcabin-19x9.dmm | 59 +- .../maps/submaps/shelters/MercShip-57x25.dmm | 77 +- .../submaps/shelters/PizzaParlor-18x19.dmm | 33 +- .../submaps/shelters/SurvivalMedical-9x9.dmm | 1 - .../submaps/shelters/SurvivalQuarters-9x9.dmm | 4 +- .../submaps/shelters/SurvivalSecurity-9x9.dmm | 2 +- .../surface_submaps/plains/otieshelter.dmm | 1 - .../surface_submaps/valley/Redshuttledown.dmm | 139 +- .../valley/eclipsemountain.dmm | 6 +- .../surface_submaps/valley/piratevessel.dmm | 9 +- .../surface_submaps/valley/piratevox.dmm | 14 +- .../surface_submaps/valley/settlement.dmm | 8 +- .../wilderness/AbandonedLab.dmm | 629 +- .../wilderness/Blackshuttledown.dmm | 141 +- .../wilderness/Blueshuttledown.dmm | 152 +- .../surface_submaps/wilderness/Chapel.dmm | 24 +- .../surface_submaps/wilderness/PirateLake.dmm | 1874 +- .../surface_submaps/wilderness/Rockybase.dmm | 108 +- .../wilderness/RockybaseAlt.dmm | 111 +- .../wilderness/VolcanicFissure.dmm | 1308 +- .../wilderness/bountyhunters.dmm | 41 +- .../wilderness/bountyhunters2.dmm | 40 +- .../wilderness/otieshelter.dmm | 1 - .../wilderness/wilderness_areas.dm | 1 + .../maps/virgo_minitest/virgo_minitest-1.dmm | 18 +- .../virgo_minitest-sector-2.dmm | 3 +- .../maps/virtual_reality/constructVR.dmm | 791 +- tools/UpdatePaths/Scripts/9105_area_edits.txt | 28 + tools/UpdatePaths/Scripts/9105_cable_dirs.txt | 31 + tools/UpdatePaths/__main__.py | 5 +- tools/ci/validate_files.sh | 16 + tools/maplint/README.md | 132 + tools/maplint/lints/area_varedits.yml | 3 + tools/maplint/lints/banned_items.yml | 2 + tools/maplint/lints/base_turf.yml | 2 + tools/maplint/lints/cable_dir_varedits.yml | 5 + tools/maplint/lints/invaid_dir.yml | 15 + tools/maplint/lints/merge_conflict_marker.yml | 5 + tools/maplint/lints/multiple_airlocks.yml | 3 + tools/maplint/lints/multiple_area.yml | 3 + tools/maplint/lints/multiple_beds.yml | 3 + tools/maplint/lints/multiple_firelocks.yml | 3 + tools/maplint/lints/multiple_girders.yml | 3 + tools/maplint/lints/multiple_grilles.yml | 3 + tools/maplint/lints/multiple_lattice.yml | 3 + tools/maplint/lints/multiple_machinery.yml | 4 + tools/maplint/lints/multiple_stairs.yml | 4 + tools/maplint/lints/multiple_tables.yml | 3 + tools/maplint/lints/multiple_turf.yml | 3 + tools/maplint/lints/multiple_windows.yml | 4 + tools/maplint/lints/pixel_varedits.yml | 6 + tools/maplint/lints/stray_item.yml | 3 + tools/maplint/lints/wall_stacking.yml | 5 + .../maplint/source/__init__.py | 0 tools/maplint/source/__main__.py | 167 + tools/maplint/source/common.py | 36 + tools/maplint/source/dmm.py | 195 + tools/maplint/source/error.py | 41 + tools/maplint/source/lint.py | 354 + tools/mapmerge2/dmm.py | 19 +- tools/mapmerge2/dmm_test.py | 94 +- tools/mapmerge2/fixup.py | 86 +- tools/mapmerge2/frontend.py | 2 +- tools/mapmerge2/mapmerge.py | 7 +- tools/mapmerge2/merge_driver.py | 3 +- tools/requirements.txt | 2 +- 159 files changed, 123885 insertions(+), 108549 deletions(-) delete mode 100644 icons/obj/pipes/large.dmi delete mode 100644 modular_chomp/maps/relic_base/backup/relicbase-1.dmm delete mode 100644 modular_chomp/maps/relic_base/backup/relicbase-7.dmm delete mode 100644 modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/backup/northern_star_mine.dmm create mode 100644 tools/UpdatePaths/Scripts/9105_area_edits.txt create mode 100644 tools/UpdatePaths/Scripts/9105_cable_dirs.txt create mode 100644 tools/maplint/README.md create mode 100644 tools/maplint/lints/area_varedits.yml create mode 100644 tools/maplint/lints/banned_items.yml create mode 100644 tools/maplint/lints/base_turf.yml create mode 100644 tools/maplint/lints/cable_dir_varedits.yml create mode 100644 tools/maplint/lints/invaid_dir.yml create mode 100644 tools/maplint/lints/merge_conflict_marker.yml create mode 100644 tools/maplint/lints/multiple_airlocks.yml create mode 100644 tools/maplint/lints/multiple_area.yml create mode 100644 tools/maplint/lints/multiple_beds.yml create mode 100644 tools/maplint/lints/multiple_firelocks.yml create mode 100644 tools/maplint/lints/multiple_girders.yml create mode 100644 tools/maplint/lints/multiple_grilles.yml create mode 100644 tools/maplint/lints/multiple_lattice.yml create mode 100644 tools/maplint/lints/multiple_machinery.yml create mode 100644 tools/maplint/lints/multiple_stairs.yml create mode 100644 tools/maplint/lints/multiple_tables.yml create mode 100644 tools/maplint/lints/multiple_turf.yml create mode 100644 tools/maplint/lints/multiple_windows.yml create mode 100644 tools/maplint/lints/pixel_varedits.yml create mode 100644 tools/maplint/lints/stray_item.yml create mode 100644 tools/maplint/lints/wall_stacking.yml rename icons/obj/gate.dmi => tools/maplint/source/__init__.py (100%) create mode 100644 tools/maplint/source/__main__.py create mode 100644 tools/maplint/source/common.py create mode 100644 tools/maplint/source/dmm.py create mode 100644 tools/maplint/source/error.py create mode 100644 tools/maplint/source/lint.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0ed360d82..9231c58bca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,8 @@ jobs: cancel-in-progress: true steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 # Caches - name: Ensure +x on CI directory run: | @@ -70,14 +72,16 @@ jobs: bash tools/ci/install_spaceman_dmm.sh dreamchecker bash tools/ci/install_spaceman_dmm.sh dmm-tools tools/bootstrap/python -c '' - - name: Run Tests - run: | - tools/ci/validate_files.sh + - name: Run Validation Tests + run: bash tools/ci/validate_files.sh - name: Run Define Sanity Checks run: tools/bootstrap/python -m define_sanity.check - - name: Run DreamChecker - shell: bash - run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh + - name: Run DMI Tests + run: tools/bootstrap/python -m dmi.test + - name: Run Map Checks + run: | + tools/bootstrap/python -m tools.maplint.source + tools/bootstrap/python -m mapmerge2.dmm_test - name: Run TGUI Checks run: tools/build/build --ci lint tgui-test - name: Run Nanomap Checks diff --git a/1Item_list.dmm b/1Item_list.dmm index 73b1013573..15a60a76e8 100644 --- a/1Item_list.dmm +++ b/1Item_list.dmm @@ -42122,12 +42122,6 @@ icon_state = "vault" }, /area/survivalpod) -"mpy" = ( -/obj/item/magnetic_ammo/pistol, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "mpz" = ( /obj/item/clothing/accessory/collar/azura, /turf/simulated/fitness{ @@ -55135,9 +55129,7 @@ }, /area/survivalpod) "qef" = ( -/obj/item/reagent_containers/glass/beaker/stopperedbottle{ - desc = s - }, +/obj/item/reagent_containers/glass/beaker/stopperedbottle, /turf/simulated/fitness{ icon_state = "vault" }, @@ -57637,12 +57629,6 @@ icon_state = "vault" }, /area/survivalpod) -"qSE" = ( -/obj/item/disk/body_record, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "qSK" = ( /obj/item/reagent_containers/glass/beaker/vial/microcillin, /turf/simulated/fitness{ @@ -63532,9 +63518,7 @@ /turf/simulated/floor/atoll, /area/survivalpod) "sGg" = ( -/obj/item/storage/vore_egg/human{ - desc = s - }, +/obj/item/storage/vore_egg/human, /turf/simulated/fitness{ icon_state = "vault" }, @@ -68870,12 +68854,6 @@ icon_state = "vault" }, /area/survivalpod) -"ujN" = ( -/obj/item/flag, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "ujS" = ( /obj/item/implant/reagent_generator/eldi, /turf/simulated/fitness{ @@ -69744,12 +69722,6 @@ icon_state = "vault" }, /area/survivalpod) -"uxH" = ( -/obj/item/stamp, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "uxK" = ( /obj/structure/sign/levels/science/robotics, /turf/simulated/fitness{ @@ -73587,12 +73559,6 @@ icon_state = "vault" }, /area/survivalpod) -"vDD" = ( -/obj/item/disk/body_record, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "vDI" = ( /obj/structure/ship_munition/disperser_charge/mining, /turf/simulated/fitness{ @@ -74670,12 +74636,6 @@ icon_state = "vault" }, /area/survivalpod) -"vTa" = ( -/obj/item/camera_bug, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "vTc" = ( /obj/item/rig/zero/equipped, /turf/simulated/fitness{ @@ -76304,12 +76264,6 @@ icon_state = "vault" }, /area/survivalpod) -"wqM" = ( -/obj/item/disk/body_record, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "wqR" = ( /obj/item/clothing/suit/storage/qm, /turf/simulated/fitness{ @@ -76680,12 +76634,6 @@ icon_state = "vault" }, /area/survivalpod) -"wvD" = ( -/obj/item/clothing/mask/gas, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "wvQ" = ( /obj/vehicle/train/security/trolley, /turf/simulated/fitness{ @@ -81191,12 +81139,6 @@ icon_state = "vault" }, /area/survivalpod) -"xKQ" = ( -/obj/item/dnainjector/set_trait/remotetalk/disable, -/turf/simulated/fitness{ - icon_state = "vault" - }, -/area/survivalpod) "xKR" = ( /obj/item/clothing/under/primitive, /turf/simulated/fitness{ @@ -81263,7 +81205,6 @@ /area/survivalpod) "xLZ" = ( /mob/living/simple_mob/vore/alienanimals/space_ghost{ - desc = s; ai_holder_type = null }, /turf/simulated/floor/atoll, @@ -103643,7 +103584,7 @@ lFO dXm suK bop -wvD +rlD ubX bpf vpF @@ -110638,7 +110579,7 @@ dNa elf hbd dsl -vTa +aNs kIm kle wOB @@ -111201,15 +111142,15 @@ uGP kIg bbG kwU -ujN +hvM jxS dyO fUB htY kDC -vDD -wqM -qSE +dar +dar +dar nvT kKr lmi @@ -113088,7 +113029,7 @@ vuh wgu fko xDX -xKQ +rYL uSj uMw wCK @@ -116709,7 +116650,7 @@ bLM aNX pjj atx -mpy +atx mQD rAZ cDo @@ -117095,7 +117036,7 @@ brz (170,1,1) = {" brz vOT -uxH +sCz vOT jRg hwZ diff --git a/1SP_pods.dmm b/1SP_pods.dmm index a62015da88..289bebced8 100644 --- a/1SP_pods.dmm +++ b/1SP_pods.dmm @@ -1467,14 +1467,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/survivalpod/superpose/CultShip) -"bbP" = ( -/obj/structure/hull_corner{ - dir = 4 - }, -/obj/structure/lattice, -/obj/structure/lattice, -/turf/template_noop, -/area/template_noop) "bcf" = ( /obj/structure/table/standard, /obj/machinery/reagentgrinder, @@ -24594,7 +24586,7 @@ /area/survivalpod/superpose/LoneHome) "qaP" = ( /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/survivalpod/superpose/HellCave) "qaS" = ( @@ -32498,7 +32490,7 @@ /area/survivalpod/superpose/GrandLibrary) "whZ" = ( /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/template_noop) "wiQ" = ( @@ -33409,12 +33401,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/survivalpod/superpose/CrashedInfestedShip) -"wMJ" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/survivalpod) "wMK" = ( /obj/structure/shuttle/engine/propulsion{ dir = 1 @@ -39778,7 +39764,7 @@ wWX uHE wWX uHE -bbP +rug pIr pIr pIr @@ -54119,7 +54105,7 @@ jTF mtA ktQ fsy -wMJ +oKt qkX gjM eMp diff --git a/1mapping_palette.dmm b/1mapping_palette.dmm index 4eb6c85fd9..924037e244 100644 --- a/1mapping_palette.dmm +++ b/1mapping_palette.dmm @@ -1377,7 +1377,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, @@ -2990,7 +2990,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, @@ -3190,7 +3190,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "ckB" = ( @@ -3265,12 +3265,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "cnI" = ( @@ -3362,7 +3362,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "cry" = ( @@ -3766,12 +3766,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "cBP" = ( @@ -8392,7 +8392,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "fSx" = ( @@ -8929,12 +8929,12 @@ /area/space) "glz" = ( /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "glT" = ( @@ -9059,7 +9059,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "gqk" = ( @@ -10138,7 +10138,7 @@ once = 0 }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "gYa" = ( @@ -10338,7 +10338,7 @@ /obj/effect/map_effect/interval/sound_emitter/geiger/high, /obj/effect/map_effect/interval/sound_emitter/thunder, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "heD" = ( @@ -10873,7 +10873,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, @@ -11431,12 +11431,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "hPw" = ( @@ -11810,7 +11810,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "ibO" = ( @@ -11867,7 +11867,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "ieF" = ( @@ -12145,7 +12145,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, @@ -13083,7 +13083,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, @@ -14760,7 +14760,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "kaP" = ( @@ -15303,12 +15303,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "knl" = ( @@ -18116,7 +18116,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "mjW" = ( @@ -18916,7 +18916,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "mAJ" = ( @@ -19456,12 +19456,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "mRF" = ( @@ -20382,7 +20382,7 @@ /area/space) "nCu" = ( /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "nCJ" = ( @@ -21585,12 +21585,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "ovB" = ( @@ -21948,7 +21948,7 @@ once = 0 }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "oHU" = ( @@ -22156,12 +22156,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "oLZ" = ( @@ -22817,7 +22817,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, @@ -22884,7 +22884,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "pmu" = ( @@ -23963,12 +23963,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "pYp" = ( @@ -24051,7 +24051,7 @@ portal_id = 20 }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "qcn" = ( @@ -24481,7 +24481,7 @@ invisibility = 99 }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "qqu" = ( @@ -25009,7 +25009,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "qHF" = ( @@ -25046,7 +25046,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "qIh" = ( @@ -25699,7 +25699,7 @@ /area/space) "rcM" = ( /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, @@ -25716,7 +25716,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "rcS" = ( @@ -25776,7 +25776,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "reE" = ( @@ -26263,7 +26263,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, @@ -26346,7 +26346,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "rwk" = ( @@ -27132,12 +27132,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "sbA" = ( @@ -31015,7 +31015,7 @@ /area/space) "uzS" = ( /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, @@ -31032,7 +31032,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "uAv" = ( @@ -31075,7 +31075,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, @@ -31167,7 +31167,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, @@ -33160,7 +33160,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "vZv" = ( @@ -33176,12 +33176,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "wab" = ( @@ -33973,12 +33973,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "wEc" = ( @@ -34083,12 +34083,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "wHO" = ( @@ -34351,12 +34351,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb/dark{ - color = #8A0808; + color = "#8A0808"; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "wPR" = ( @@ -34682,12 +34682,12 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "xec" = ( @@ -35612,7 +35612,7 @@ name = "Veil of sanity" }, /turf/simulated/floor/flesh/colour{ - color = red + color = "red" }, /area/space) "xIq" = ( @@ -35818,7 +35818,7 @@ name = "Veil of sanity" }, /obj/effect/spider/stickyweb{ - color = #8A0808; + color = "#8A0808"; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress" }, diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 8feee1d2be..fa26d85186 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -2141,6 +2141,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Derelict EVA Storage" icon_state = "eva" +/area/derelict/eva/annex + name = "Derelict Annex" + icon_state = "eva" + /area/derelict/ship name = "\improper Abandoned Ship" icon_state = "yellow" diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 3886603556..dd52c4387a 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -99,6 +99,9 @@ I.plane = PLANE_LIGHTING antilight_cache["[diag]"] = I + if(takes_underlays) + underlay_update() + /turf/simulated/shuttle/Destroy() landed_holder = null return ..() diff --git a/icons/obj/pipes/large.dmi b/icons/obj/pipes/large.dmi deleted file mode 100644 index 77fb29e4dea61003a8992c2c58dc6f4e119d0340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8198 zcmeHM%}*Og6rcSHE}_9thY&&{7bR6K#S%6fWNxN0kx)gH1`b>*C2#>0Dw00{5i5zT zR7fq2atJ=OPD;-7z#%6eDk{+vL5iYsiB$0i^wJ)x%6;$6?0lGYun9?}hF#nHX8dM$ z=J$5r`^_6SH!^HRSh-wgjHObkv9Ym$tp8#sb||y| z1P5Udho#cY0VA}s%JsN9DuaAf(r*3C1+5P2NoU0Bup*Wfv+&nyhc8~ODE@>P?ck~)F@C_?!J|pEV!5I8hhh|aI7YadZl5SB{_UCA(|dcwDTBs#ea_1kdH=6 z@kjZoVt(rU(|FgfiNgA==F;l)qm^P$ZgTYU$@b^asq|U&6f{G?}KI(g?m#s zxY~fX`O@Es`O4t%b%pZBxuPd^X(*YC^aU1QefqR&yAyN*eKYMocMF=3 zG1yU*zvYu4d6oWnC}ae?S{^Pbou$(1aGq-CYW2H08WvXA(WKqA3{R@54(fh&v zzx!n5H`LMZ%d|0=vOX7Wj{4knOafHvyb6Q3ER{^NNYJP;lduNgsrN;{d`=Q5mz|3W zaI*o(wXV`6elo*80Iid(GI_>1?RLA}&S`$yXYd3b5O2v{kNq6S@Gsk?lRj&PiuT6& zfDPffiVr{(fJ5*B5u1q{@INRL)YMUw!%ztdk_<>aJ^(ZNo28ne=K#3Cpx?g}>j921 zgaWdILI2@sVd}<4;-cR_!i&*G68a%X0c#la;p2S~l`H@S%dkd<9VKhjO9q;dAjxSW zU!s$^02u?g8F2xlAR*-7hU)MJs%y~?HPwhf)d0-UZB9c27y`jX^j-T8!ccBIvR6xde}Q~D$tHJLQnx7k|7EK6-ZOP9;$ggggmYfIukW? zcK0KwfTqvytM{+T?}7?oOs454-Jl#59y%@PtCm5{;?;Rs20 z5%CGBHxg%cDTQR;)F7w_MeR_kW?FY5_nuve=75E6W;i1yYRdCflqVS(7%D*WBn@ek zyC_^mW}7Ola^Yjld$mA11!!#>RH{5#qOcNgwiVtP!26>BZ;p&*9orjklQPOu$fFP3 z^{r&NjJy~aRS{}62oq&Rz^n1TTe$MzVr{(dudhsRB*u}l_5ydELLr0PwF~lwy(n~G zS_{=4VIs07-VRIlv0w!WsB1?rP&;vC{f<{kesLIW0gQ&DZ7Twa_&j1A!T~(5|tFuCW;3-3>x4++5ZDrDvo@W=Wc?+8t5G9sOBo z;1$bh%wSyOt7zN+St;f(iR1>s%zc*F7zu&-TJDDcW_Xq_uuejG25$kT_5$zKJ%3@y$Q$-L8dN2Y6R?#-3ZZ?+^g}jFH05}