Merge branch 'Huz2e:master' into protobox

Huz2e · Jul 6, 2024 · 30d78f6 · 30d78f6
2 parents 05600ba + 29bbb4d
commit 30d78f6
Show file tree

Hide file tree

Showing 346 changed files with 26,340 additions and 24,224 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.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

diff --git a/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm b/_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
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -549,9 +549,7 @@
 /turf/open/misc/beach/sand,
 /area/ruin/powered/beach)
 "rU" = (
-/obj/item/reagent_containers/condiment/enzyme{
-	layer = 5
-	},
+/obj/item/reagent_containers/condiment/enzyme,
 /obj/item/reagent_containers/cup/beaker{
 	pixel_x = 5
 	},
@@ -920,9 +918,7 @@
 /area/ruin/powered/beach)
 "GA" = (
 /obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north{
-	layer = 2.9
-	},
+/obj/structure/window/reinforced/spawner/directional/north,
 /obj/structure/chair/stool/directional/south,
 /obj/item/storage/backpack/duffelbag,
 /obj/item/clothing/under/shorts/red,

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
@@ -496,7 +496,6 @@
 /obj/structure/flora/rock/style_random,
 /obj/structure/cable,
 /obj/item/pickaxe{
-	layer = 2.5;
 	pixel_x = -8;
 	pixel_y = 5
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -29,7 +29,6 @@
 "ao" = (
 /obj/machinery/telecomms/server{
 	pixel_z = 12;
-	layer = 2.91;
 	name = "tgsv3";
 	desc = "It's, uh... pending an upgrade."
 	},
@@ -240,8 +239,7 @@
 /area/ruin/space)
 "ud" = (
 /obj/structure/fluff/bus/passable{
-	icon_state = "bottomdoor";
-	layer = 3
+	icon_state = "bottomdoor"
 	},
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
@@ -308,7 +306,6 @@
 	},
 /obj/machinery/telecomms/server{
 	pixel_z = 12;
-	layer = 2.91;
 	name = "tgsv3";
 	desc = "It's, uh... pending an upgrade."
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm
@@ -108,9 +108,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space)
 "A" = (
-/obj/structure/table/wood{
-	layer = 3.3
-	},
+/obj/structure/table/wood,
 /turf/open/floor/carpet/royalblack/airless,
 /area/ruin/space)
 "B" = (