Merge branch 'master' into intento

.github/guides/VISUALS.md

@@ -404,6 +404,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

@@ -74,6 +74,7 @@ jobs:
         run: |
           bash tools/ci/check_grep.sh
           bash skyrat/tools/skyrat_check_grep.sh # SKYRAT EDIT ADDITION - checking modular_skyrat code
+          bash modular_zzplurt/tools/ci/splurt_check_grep.sh # SPLURT EDIT ADDITION - checking modular_zzplurt code
       - name: Ticked File Enforcement
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: |

.github/workflows/compile_changelogs.yml

@@ -51,4 +51,4 @@ jobs:
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: ad-m/github-push-action@master
         with:
-          github_token: ${{ secrets.BUBBERBOT_PAT }}
+          github_token: ${{ secrets.BUBBERBOT_PAT || secrets.GITHUB_TOKEN}}

README.md

@@ -23,13 +23,11 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th
 ## Contribution Rules and Guidelines
 
 **1. Do Not Be A Dick**
-- The S.P.L.U.R.T. main repository is run by and contributed by volunteers. You are not entitled to our time and energy. We reserve the right to permanently remove anyone who does not show both our contributor's and maintainer's common decency.
+- The S.P.L.U.R.T. main repository is run by and contributed by volunteers. Please be considerate with the people who help maintain our codebase. We reserve the right to permanently remove anyone who does not show both our contributors and maintainers common decency.
 
 **2. Modularization Standards Will be Upheld**
 - This codebase is a active downstream to Bubberstation with frequent upstream merges.
-- Modularization must be strictly upheld for code stability. (Ask a maintainer if you have any questions!)
-- Basically, **try to edit Modular Splurt files first** Then ``//SPLURT EDIT`` comments on any core files (TG, Skyrat, or Bubberstation) for trackability.
-- This is a place for when more concrete guidelines are created.
+- Modularization is key to attain code stability, please read our [modularization guide](./modular_zzplurt/readme.md) for more information, or ask any of our maintainers in our discord.
 
 **3. The Licensing is Non-negotiable**
 - You are free to take, redistribute, modify, and readapt any code or commit found on this repository.
@@ -42,7 +40,7 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th
 - You are entitled to credit yourself with comments and you are entitled to waive the attribution requirement choosing not to be identified as the creator if you wish.
 - If you do not like how your assets were modified or used, it is required that the other person [remove the attribution information upon request](https://wiki.creativecommons.org/wiki/License_Versions#Licensors_may_request_removal_of_attribution).
 - Modifications or adaptions must disclose the source, the author, and [any changes you've made](https://wiki.creativecommons.org/wiki/License_Versions#Modifications_and_adaptations_must_be_indicated).
-- Goonstation code is incompatible with this codebase and will not be accepted.
+- Goonstation code is incompatible with this codebase due to its licensing.
 
 *Credit: [Goonstation contribution guidelines](https://hackmd.io/@goonstation/docs/%2F%40goonstation%2Fcontribute#What-if-I-change-my-mind-about-my-contributions-being-published)*
 

_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm

@@ -25,9 +25,8 @@
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/tank/air{
-	dir = 8;
-	piping_layer = 4
+/obj/machinery/atmospherics/components/tank/air/layer4{
+	dir = 8
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
 /turf/open/floor/plating/icemoon,

_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm

@@ -23,9 +23,8 @@
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/tank/air{
-	dir = 8;
-	piping_layer = 4
+/obj/machinery/atmospherics/components/tank/air/layer4{
+	dir = 8
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
 /turf/open/floor/plating/lavaland_atmos,

_maps/RandomRuins/SpaceRuins/phonebooth.dmm

@@ -23,9 +23,8 @@
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/tank/air{
-	dir = 8;
-	piping_layer = 4
+/obj/machinery/atmospherics/components/tank/air/layer4{
+	dir = 8
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
 /turf/open/floor/plating/airless,

_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm

@@ -18,6 +18,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"dj" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
+/turf/template_noop,
+/area/template_noop)
 "eL" = (
 /obj/machinery/portable_atmospherics/canister/freon{
 	name = "Coolant canister"
@@ -108,7 +113,7 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered)
 "iF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/template_noop,
 /area/template_noop)
 "ja" = (
@@ -148,7 +153,7 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered)
 "jL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/closed/wall/r_wall{
 	color = "#7a9ee0"
 	},
@@ -267,6 +272,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"oX" = (
+/obj/effect/decal/fakelattice/passthru,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
+/turf/closed/wall/mineral/titanium/spaceship/nodiagonal{
+	color = "#8ab1ec"
+	},
+/area/ruin/unpowered)
 "pw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -280,7 +292,7 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered)
 "qW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/closed/wall/mineral/titanium/spaceship/nodiagonal{
 	color = "#8ab1ec"
 	},
@@ -504,8 +516,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 4;
-	piping_layer = 1
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ruin/unpowered)
@@ -752,8 +763,7 @@
 	name = "Fuel canister"
 	},
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 4;
-	piping_layer = 1
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ruin/unpowered)
@@ -799,7 +809,7 @@
 /obj/machinery/power/shuttle_engine/heater{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/closed/wall/mineral/titanium/spaceship/nodiagonal{
 	color = "#8ab1ec"
 	},
@@ -1216,8 +1226,8 @@ hf
 fM
 Xr
 qW
-fo
-xP
+oX
+dj
 tz
 tz
 TW
@@ -1237,8 +1247,8 @@ MY
 KR
 Uw
 pD
-jL
-qW
+Xr
+tz
 iF
 qW
 tz

_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm

@@ -73,7 +73,7 @@
 /area/ruin/powered)
 "ej" = (
 /obj/item/assembly/signaler/anomaly/grav,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/plating/plasma,
 /area/template_noop)
 "eI" = (
@@ -625,8 +625,7 @@
 	name = "Fuel canister"
 	},
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8;
-	piping_layer = 1
+	dir = 8
 	},
 /turf/open/floor/plating/plasma,
 /area/template_noop)
@@ -652,7 +651,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/plating/plasma,
 /area/template_noop)
 "Gf" = (
@@ -765,7 +764,7 @@
 /turf/open/floor/plating/airless,
 /area/template_noop)
 "Lx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/plating/plasma,
 /area/template_noop)
 "LC" = (
@@ -969,7 +968,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/plating/plasma,
 /area/template_noop)
 "Uz" = (