Merge branch 'themostextreme' of https://github.com/Nerev4r/DopplerShift

into themostextreme # Conflicts: # code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm # code/__DEFINES/tools.dm # code/modules/fishing/fishing_rod.dm # code/modules/mod/mod_core.dm # modular_doppler/modular_cosmetics/code/neck/collar.dm
DopplerShift13 · Sep 22, 2024 · 5a51d1a · 5a51d1a
2 parents f1dfb49 + 85eb1f9
commit 5a51d1a
Show file tree

Hide file tree

Showing 899 changed files with 5,293 additions and 9,794 deletions.
diff --git a/.github/guides/STANDARDS.md b/.github/guides/STANDARDS.md
@@ -513,30 +513,6 @@ The following is a list of procs, and their safe replacements.
 * Move away from something, taking turf density into account `walk_away()` -> `SSmove_manager.move_away()`
 * Move to a random place nearby. NOT random walk `walk_rand()` -> `SSmove_manager.move_rand()` is random walk, `SSmove_manager.move_to_rand()` is walk to a random place
 
-### Avoid pointer use
-
-BYOND has a variable type called pointers, which allow you to reference a variable rather then its value. As an example of how this works:
-
-```
-var/pointed_at = "text"
-var/value = pointed_at // copies the VALUE of pointed at
-var/reference = &pointed_at // points at pointed_at itself
-
-// so we can retain a reference even if pointed_at changes
-pointed_at = "text AGAIN"
-world << (*reference) // Deref to get the value, outputs "text AGAIN"
-
-// or modify the var remotely
-*reference = "text a THIRD TIME"
-world << pointed_at // outputs "text a THIRD TIME"
-```
-
-The problem with this is twofold.
-- First: if you use a pointer to reference a var on a datum, it is essentially as if you held an invisible reference to that datum. This risks hard deletes in very unclear ways that cannot be tested for.
-- Second: People don't like, understand how pointers work? They mix them up with classical C pointers, when they're more like `std::shared_ptr`. This leads to code that just doesn't work properly, or is hard to follow without first getting your mind around it. It also risks hiding what code does in dumb ways because pointers don't have unique types.
-
-For these reasons and with the hope of avoiding pointers entering general use, be very careful using them, if you use them at all.
-
 ### BYOND hellspawn
 
 What follows is documentation of inconsistent or strange behavior found in our engine, BYOND.

diff --git a/.github/workflows/auto_changelog.yml b/.github/workflows/auto_changelog.yml
@@ -28,7 +28,7 @@ jobs:
         APP_ID: ${{ secrets.APP_ID }}
 
     - name: Run auto changelog
-      uses: actions/github-script@v7
+      uses: actions/github-script@v6
       with:
         script: |
           const { processAutoChangelog } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoChangelog.js')

diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -100,7 +100,6 @@ jobs:
         run: |
           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 tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/modular_doppler.json # DOPPLER EDIT ADDITION
       - name: Check Define Sanity
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: tools/bootstrap/python -m define_sanity.check
@@ -286,12 +285,9 @@ jobs:
           max-required-client-version: ${{needs.collect_data.outputs.max_required_byond_client}}
 
   completion_gate: # Serves as a non-moving target for branch rulesets
-    if: always() && !cancelled()
     name: Completion Gate
     needs: [ test_windows, compare_screenshots, compile_all_maps, run_linters ]
     runs-on: ubuntu-latest
     steps:
-      - name: Decide whether the needed jobs succeeded or failed
-        uses: re-actors/alls-green@release/v1
-        with:
-          jobs: ${{ toJSON(needs) }}
+      - name: Mandatory Empty Step
+        run: exit 0
diff --git a/.github/workflows/remove_guide_comments.yml b/.github/workflows/remove_guide_comments.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Remove guide comments
-      uses: actions/github-script@v7
+      uses: actions/github-script@v6
       with:
         script: |
           const { removeGuideComments } = await import('${{ github.workspace }}/tools/pull_request_hooks/removeGuideComments.js')

diff --git a/.github/workflows/rerun_flaky_tests.yml b/.github/workflows/rerun_flaky_tests.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Rerun flaky tests
-      uses: actions/github-script@v7
+      uses: actions/github-script@v6
       with:
         script: |
           const { rerunFlakyTests } = await import('${{ github.workspace }}/tools/pull_request_hooks/rerunFlakyTests.js')
@@ -24,7 +24,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Report flaky tests
-      uses: actions/github-script@v7
+      uses: actions/github-script@v6
       with:
         script: |
           const { reportFlakyTests } = await import('${{ github.workspace }}/tools/pull_request_hooks/rerunFlakyTests.js')

diff --git a/.github/workflows/show_screenshot_test_results.yml b/.github/workflows/show_screenshot_test_results.yml
@@ -34,7 +34,7 @@ jobs:
           npm install node-fetch
       - name: Show screenshot test results
         if: steps.secrets_set.outputs.SECRETS_ENABLED
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         env:
           FILE_HOUSE_KEY: ${{ secrets.ARTIFACTS_FILE_HOUSE_KEY }}
         with:

diff --git a/.github/workflows/test_merge_bot.yml b/.github/workflows/test_merge_bot.yml
@@ -32,7 +32,7 @@ jobs:
             npm install node-fetch
         - name: Check for test merges
           if: steps.secrets_set.outputs.GET_TEST_MERGES_URL
-          uses: actions/github-script@v7
+          uses: actions/github-script@v6
           env:
             GET_TEST_MERGES_URL: ${{ secrets.GET_TEST_MERGES_URL }}
           with:

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm
@@ -70,7 +70,7 @@
 /area/ruin/powered/icemoon_phone_booth)
 "W" = (
 /obj/machinery/vending/cigarette{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/plating/icemoon,

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm
@@ -538,7 +538,9 @@
 	},
 /area/ruin/pizzeria)
 "yP" = (
-/obj/machinery/vending/dinnerware,
+/obj/machinery/vending/dinnerware{
+	onstation = 0
+	},
 /obj/effect/turf_decal/tile/blue/opposingcorners{
 	dir = 1
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm
@@ -13,7 +13,7 @@
 /area/ruin/powered/lavaland_phone_booth)
 "k" = (
 /obj/machinery/vending/snack/green{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/plating/lavaland_atmos,
@@ -66,7 +66,7 @@
 /area/ruin/powered/lavaland_phone_booth)
 "W" = (
 /obj/machinery/vending/cigarette{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/plating/lavaland_atmos,

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -18,19 +18,19 @@
 "aj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/medical/syndicate,
+/obj/machinery/vending/medical/syndicate_access,
 /turf/open/floor/iron/white/side{
 	dir = 4
 	},
 /area/ruin/syndicate_lava_base/virology)
 "ak" = (
-/obj/machinery/vending/boozeomat/syndicate,
+/obj/machinery/vending/boozeomat/syndicate_access,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/syndicate_lava_base/bar)
 "al" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/medical/syndicate,
+/obj/machinery/vending/medical/syndicate_access,
 /turf/open/floor/iron/white,
 /area/ruin/syndicate_lava_base/medbay)
 "ap" = (

diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
@@ -613,7 +613,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "ct" = (
-/obj/machinery/vending/medical/syndicate/cybersun,
+/obj/machinery/vending/medical/syndicate_access/cybersun,
 /turf/open/floor/plastic,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "cu" = (

diff --git a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
@@ -139,7 +139,7 @@
 "bq" = (
 /obj/structure/cable/layer1,
 /obj/machinery/vending/sovietsoda{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/structure/sign/poster/contraband/clown/directional/east,
 /obj/machinery/duct,
@@ -527,7 +527,7 @@
 "dU" = (
 /obj/structure/cable/layer1,
 /obj/machinery/vending/cigarette/syndicate{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/duct,
 /obj/effect/mapping_helpers/broken_machine,
@@ -544,7 +544,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
 /obj/machinery/duct,
 /obj/machinery/vending/clothing{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/firealarm/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -1378,7 +1378,7 @@
 /area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
 "lT" = (
 /obj/machinery/vending/cola/black{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/duct,
 /obj/effect/mapping_helpers/broken_machine,
@@ -1866,7 +1866,7 @@
 /obj/structure/cable/layer1,
 /obj/machinery/duct,
 /obj/machinery/vending/assist{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/camera/xray/directional/west,
 /turf/open/floor/catwalk_floor/iron_smooth,
@@ -2475,7 +2475,7 @@
 /obj/structure/cable/layer1,
 /obj/machinery/duct,
 /obj/machinery/vending/cola/shamblers{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
@@ -4199,7 +4199,7 @@
 "KH" = (
 /obj/structure/cable/layer1,
 /obj/machinery/vending/donksnack{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/duct,
 /obj/machinery/camera/autoname/directional/west{
@@ -4516,7 +4516,7 @@
 "MO" = (
 /obj/machinery/duct,
 /obj/machinery/vending/snack{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
@@ -4616,7 +4616,7 @@
 "NY" = (
 /obj/structure/cable/layer1,
 /obj/machinery/vending/coffee{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/duct,
 /turf/open/floor/catwalk_floor/iron_smooth,
@@ -4755,7 +4755,7 @@
 "Pk" = (
 /obj/structure/cable/layer1,
 /obj/machinery/vending/tool{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/structure/sign/poster/contraband/donk_co/directional/west,
 /obj/machinery/duct,
@@ -4886,7 +4886,7 @@
 "QM" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
 /obj/machinery/vending/sovietsoda{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	pipe_color = "#FF7B00";
@@ -5415,7 +5415,7 @@
 /obj/structure/cable/layer1,
 /obj/machinery/duct,
 /obj/machinery/vending/medical{
-	all_products_free = 0;
+	onstation_override = 1;
 	name = "\improper CyberMed +"
 	},
 /turf/open/floor/catwalk_floor/iron_smooth,
@@ -5635,7 +5635,7 @@
 /area/ruin/space/has_grav/hauntedtradingpost/office)
 "Ww" = (
 /obj/machinery/vending/coffee{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/structure/cable/layer1,
 /obj/machinery/duct,
@@ -5712,7 +5712,7 @@
 "Xe" = (
 /obj/structure/cable/layer1,
 /obj/machinery/vending/cola/shamblers{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/duct,
 /obj/effect/overloader_trap,
@@ -5802,7 +5802,7 @@
 /area/ruin/space/has_grav/hauntedtradingpost/public)
 "XK" = (
 /obj/machinery/vending/donksnack{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/machinery/duct,
 /turf/open/floor/catwalk_floor/iron_smooth,

diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
@@ -690,7 +690,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/infested_frigate)
 "kw" = (
-/obj/machinery/vending/boozeomat/syndicate,
+/obj/machinery/vending/boozeomat/syndicate_access,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/infested_frigate)
 "kS" = (

diff --git a/_maps/RandomRuins/SpaceRuins/interdyne.dmm b/_maps/RandomRuins/SpaceRuins/interdyne.dmm
@@ -140,7 +140,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "fS" = (
-/obj/machinery/vending/medical/syndicate,
+/obj/machinery/vending/medical/syndicate_access,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "ga" = (

diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1645,7 +1645,9 @@
 /area/ruin/space/ancientstation/charlie/hall)
 "hr" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/dinnerware,
+/obj/machinery/vending/dinnerware{
+	onstation = 0
+	},
 /turf/open/floor/iron/cafeteria,
 /area/ruin/space/ancientstation/charlie/kitchen)
 "ht" = (
@@ -2366,7 +2368,9 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/coffee{
+	onstation = 0
+	},
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/dorms)
 "ku" = (
@@ -2740,7 +2744,9 @@
 /turf/open/floor/plating,
 /area/ruin/space/ancientstation/charlie/hall)
 "lU" = (
-/obj/machinery/vending/hydronutrients,
+/obj/machinery/vending/hydronutrients{
+	onstation = 0
+	},
 /obj/effect/turf_decal/tile/green/anticorner/contrasted,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hydro)

diff --git a/_maps/RandomRuins/SpaceRuins/phonebooth.dmm b/_maps/RandomRuins/SpaceRuins/phonebooth.dmm
@@ -13,7 +13,7 @@
 /area/ruin/space/has_grav/powered/space_phone_booth)
 "k" = (
 /obj/machinery/vending/snack/green{
-	all_products_free = 1
+	onstation_override = 1
 	},
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/plating/airless,
@@ -66,7 +66,7 @@
 /area/ruin/space/has_grav/powered/space_phone_booth)
 "W" = (
 /obj/machinery/vending/cigarette{
-	all_products_free = 0
+	onstation_override = 1
 	},
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/plating/airless,

diff --git a/_maps/RandomRuins/SpaceRuins/spinwardsmoothies.dmm b/_maps/RandomRuins/SpaceRuins/spinwardsmoothies.dmm
@@ -44,7 +44,9 @@
 	},
 /area/ruin/space/has_grav/spinwardsmoothies)
 "ti" = (
-/obj/machinery/vending/boozeomat,
+/obj/machinery/vending/boozeomat/all_access{
+	onstation = 0
+	},
 /turf/open/floor/wood/tile,
 /area/ruin/space/has_grav/spinwardsmoothies)
 "wv" = (