Merge branch 'master' into nifmind

Monkestation · Sep 17, 2024 · 0e6a3d9 · 0e6a3d9
2 parents 8c8727d + e858040
commit 0e6a3d9
Show file tree

Hide file tree

Showing 1,781 changed files with 114,163 additions and 75,466 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -90,6 +90,9 @@ jobs:
       - name: Check Define Sanity
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: tools/bootstrap/python -m define_sanity.check
+      - name: Check Trait Validity
+        if: steps.linter-setup.conclusion == 'success' && !cancelled()
+        run: tools/bootstrap/python -m trait_validity.check
       - name: Run DreamChecker
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         shell: bash

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
@@ -12,20 +12,20 @@
 /obj/item/clothing/shoes/bronze,
 /obj/item/clothing/head/costume/bronze,
 /turf/open/floor/bronze{
-	initial_gas_mix = "LAVALAND_ATMOS"
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/icemoon/surface)
 "m" = (
 /obj/item/nullrod/spear{
 	name = "empowered bronze spear"
 	},
 /turf/open/floor/bronze{
-	initial_gas_mix = "LAVALAND_ATMOS"
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/icemoon/surface)
 "o" = (
 /turf/open/floor/bronze{
-	initial_gas_mix = "LAVALAND_ATMOS"
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/icemoon/surface)
 "A" = (
@@ -66,7 +66,7 @@
 "L" = (
 /mob/living/simple_animal/hostile/megafauna/clockwork_defender,
 /turf/open/floor/bronze{
-	initial_gas_mix = "LAVALAND_ATMOS"
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/icemoon/surface)
 "M" = (
@@ -95,7 +95,7 @@
 	},
 /obj/item/pen,
 /turf/open/floor/bronze{
-	initial_gas_mix = "LAVALAND_ATMOS"
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/icemoon/surface)