Merge branch 'master' into vampires

.github/guides/VISUALS.md

@@ -406,6 +406,9 @@ There are a few snowflake layers that can be used to accomplish niche goals, alo
 
 Floating layers will float "up" the chain of things they're being drawn onto, until they find a real layer. They'll then offset off of that.
 
+Adding `TOPDOWN_LAYER` (actual value `10000`) to another layer forces the appearance into topdown rendering, locally disabling [side map](#side_map-check-the-main-page-too).
+We can think of this as applying to planes, since we don't want it interlaying with other non topdown objects.
+
 This allows us to keep relative layer differences while not needing to make all sources static. Often very useful.
 
 ## Planes

.github/workflows/ci_suite.yml

@@ -86,13 +86,17 @@ jobs:
         run: ':'
       - name: Run Grep Checks
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
-        run: bash tools/ci/check_grep.sh
+        run: |
+          bash tools/ci/check_grep.sh
+          bash massmeta/tools/massmeta_check_grep.sh # MASSMETA EDIT ADDITION - checking modular_meta code
       - name: Ticked File Enforcement
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: |
-          bash tools/massmeta_check_grep.sh # MASSMETA EDIT ADDITION - checking modular_meta code
           tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/tgstation_dme.json
           tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json
+          tools/bootstrap/python massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py < massmeta/tools/ticked_file_enforcement/schemas/modular_meta_defines.json # MASSMETA EDIT ADDITION - modular defines tick enforcement
+          tools/bootstrap/python massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py < massmeta/tools/ticked_file_enforcement/schemas/modular_meta_master.json # MASSMETA EDIT ADDITION - modular master tick enforcement
+          tools/bootstrap/python massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py < massmeta/tools/ticked_file_enforcement/schemas/modular_meta.json # MASSMETA EDIT ADDITION - modular tick enforcement
       - name: Check Define Sanity
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: tools/bootstrap/python -m define_sanity.check

.gitignore

@@ -8,10 +8,9 @@
 /tmp/**/*
 /cache/**/*
 
-#Ignore config folders.
+#Ignore byond config folder.
 /cfg/**/*
 
-
 #Ignore IDE files we don't need in the repo.
 /.vs/**/*
 /tgstation/FileContentIndex/**/*

README.md

@@ -10,7 +10,7 @@
 | Website                   | Link                                                                      |
 |---------------------------|---------------------------------------------------------------------------|
 | MassMeta Code             | [https://github.com/Huz2e/massmeta](https://github.com/Huz2e/massmeta)    |
-| Guide to Modularization   | [./massmeta/readme.md](./massmeta/readme.md)                              |
+| Guide to Modularization   | [./massmeta/modularization_guide.md](./massmeta/modularization_guide.md)  |
 | MassMeta Discord          | [https://discord.gg/massmeta](https://discord.gg/KBsjSv7Kh9)              |
 | MassMeta Wiki             | [https://massmeta.ru](https://massmeta.ru/w/index.php/Заглавная_страница) |
 | /TG/ Website              | [https://www.tgstation13.org](https://www.tgstation13.org)                |
@@ -43,7 +43,7 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th
 ## Contributors
 [Guides for Contributors](.github/CONTRIBUTING.md)
 
-[/tg/station HACKMD account(BLOCKED in RU)](https://hackmd.io/@tgstation) - Design documentation here
+[/tg/station HACKMD account (BLOCKED in RU)](https://hackmd.io/@tgstation) - Design documentation here
 
 ## LICENSE
 

_maps/RandomRuins/AnywhereRuins/golem_ship.dmm

@@ -686,7 +686,6 @@
 "Ro" = (
 /obj/structure/table/wood,
 /obj/item/bedsheet/rd/royal_cape{
-	layer = 3;
 	pixel_x = 5;
 	pixel_y = 9
 	},

_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm

@@ -188,7 +188,7 @@
 /turf/open/floor/iron,
 /area/ruin/bughabitat)
 "sr" = (
-/obj/machinery/plumbing/growing_vat,
+/obj/machinery/vatgrower,
 /turf/open/floor/iron,
 /area/ruin/bughabitat)
 "st" = (
@@ -322,14 +322,10 @@
 /area/ruin/bughabitat)
 "Ku" = (
 /obj/structure/table,
-/obj/item/construction/plumbing/research,
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "Ly" = (
 /obj/structure/table,
-/obj/item/stack/ducts/fifty{
-	amount = 23
-	},
 /mob/living/basic/butterfly,
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)

_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm

@@ -175,11 +175,11 @@
 /area/ruin/smoking_room/room)
 "E" = (
 /obj/item/trash/shrimp_chips,
-/obj/item/clothing/mask/cigarette/rollie/trippy{
+/obj/item/cigarette/rollie/trippy{
 	pixel_x = 3;
 	pixel_y = -1
 	},
-/obj/item/clothing/mask/cigarette/rollie/trippy{
+/obj/item/cigarette/rollie/trippy{
 	pixel_x = 3;
 	pixel_y = 5
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm

@@ -373,9 +373,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
-/turf/open/floor/plating/snowed{
-	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
-	},
+/turf/open/floor/plating/snowed/standard_air,
 /area/ruin/comms_agent)
 "uk" = (
 /obj/structure/cable,
@@ -761,9 +759,7 @@
 /obj/structure/cable,
 /obj/item/cultivator/rake,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating/snowed{
-	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
-	},
+/turf/open/floor/plating/snowed/standard_air,
 /area/ruin/comms_agent)
 "Ll" = (
 /obj/effect/mapping_helpers/broken_floor,
@@ -867,9 +863,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
-/turf/open/floor/plating/snowed{
-	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
-	},
+/turf/open/floor/plating/snowed/standard_air,
 /area/ruin/comms_agent)
 "NJ" = (
 /obj/item/storage/medkit/regular,
@@ -892,9 +886,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating/snowed{
-	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
-	},
+/turf/open/floor/plating/snowed/standard_air,
 /area/ruin/comms_agent)
 "OB" = (
 /turf/open/lava/plasma/ice_moon,