Merge pull request #54 from Artemchik542/upstream-2

Upstream 15.02.26

Author: Bruh-24

.github/workflows/ci_suite.yml

@@ -33,23 +33,20 @@ jobs:
     uses: ./.github/workflows/collect_data.yml
 
   compile_all_maps:
-    if: needs.collect_data.outputs.game_changes == 'true'
     name: Compile Maps
     needs: collect_data
     uses: ./.github/workflows/compile_all_maps.yml
     with:
       max_required_byond_client: ${{ needs.collect_data.outputs.max_required_byond_client }}
 
   setup_build_artifacts:
-    if: needs.collect_data.outputs.game_changes == 'true'
     name: Setup build artifacts
     needs: collect_data
     uses: ./.github/workflows/setup_build_artifacts.yml
     with:
       build_versions: ${{ needs.collect_data.outputs.required_build_versions }}
 
   run_all_tests:
-    if: needs.collect_data.outputs.game_changes == 'true'
     name: Integration Tests
     needs: [collect_data, setup_build_artifacts]
     uses: ./.github/workflows/perform_regular_version_tests.yml
@@ -58,7 +55,7 @@ jobs:
       max_required_byond_client: ${{ needs.collect_data.outputs.max_required_byond_client }}
 
   run_alternate_tests:
-    if: (needs.collect_data.outputs.game_changes == 'true') && (needs.collect_data.outputs.alternate_tests != '[]')
+    if: needs.collect_data.outputs.alternate_tests != '[]'
     name: Alternate Tests
     needs: [collect_data, setup_build_artifacts]
     uses: ./.github/workflows/perform_alternate_version_tests.yml
@@ -88,4 +85,4 @@ jobs:
         uses: re-actors/alls-green@release/v1
         with:
           jobs: ${{ toJSON(needs) }}
-          allowed-skips: compare_screenshots,compile_all_maps,run_all_tests,run_alternate_tests
+          allowed-skips: compare_screenshots

.github/workflows/collect_data.yml

@@ -15,9 +15,6 @@ on:
       required_build_versions:
         description: "Build versions that need to be precompiled"
         value: ${{ jobs.collect_data.outputs.required_build_versions }}
-      game_changes:
-        description: "Whether game files were changed"
-        value: ${{ jobs.collect_data.outputs.game_changes }}
 
 jobs:
   collect_data:
@@ -28,7 +25,6 @@ jobs:
       alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }}
       max_required_byond_client: ${{ steps.max_required_byond_client.outputs.max_required_byond_client }}
       required_build_versions: ${{ steps.setup_required_build_versions.outputs.required_build_versions }}
-      game_changes: ${{ steps.find_game_changes.outputs.all_changed_files != '' }}
 
     steps:
       - uses: actions/checkout@v6
@@ -70,13 +66,3 @@ jobs:
             ($alternate + $default) | map({major, minor}) | unique
           ')
           echo "required_build_versions=$REQUIRED_BUILD_VERSIONS" >> $GITHUB_OUTPUT
-
-      - name: Find game changes
-        id: find_game_changes
-        uses: tj-actions/changed-files@v47
-        with:
-          fetch_depth: 0
-          files_ignore: |
-            **/*.md
-            html/**
-            tgui/**

.github/workflows/compile_changelogs.yml

@@ -2,7 +2,7 @@ name: Compile changelogs
 
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 0 * * 1"
   workflow_dispatch:
 
 jobs:

.vscode/settings.json

@@ -14,7 +14,7 @@
 		"editor.formatOnSave": true,
 		"editor.rulers": [80]
 	},
-	"[yaml][markdown][html][scss][github-actions-workflow]": {
+	"[yaml][markdown][html][scss]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true,
 		"editor.rulers": [80]

_maps/RandomRuins/LavaRuins/lavaland_battle_site.dmm

@@ -105,10 +105,6 @@
 /obj/item/stack/sheet/sinew,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"L" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
 "M" = (
 /obj/structure/statue/bone/skull,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
@@ -253,7 +249,7 @@ I
 G
 G
 q
-L
+x
 G
 s
 g

_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm

@@ -361,6 +361,7 @@
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 1
 	},
+/obj/structure/tank_holder/extinguisher,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/seedvault)
 "bf" = (

_maps/RandomZLevels/heretic.dmm

@@ -5808,9 +5808,6 @@
 /obj/effect/spawner/random/food_or_drink/seed_rare,
 /turf/open/misc/grass/jungle/station,
 /area/awaymission/beach/heretic)
-"EH" = (
-/turf/open/floor/pod/light,
-/area/awaymission/beach/heretic)
 "EI" = (
 /turf/open/water/beach,
 /area/awaymission/caves/heretic_laboratory_clean)
@@ -42214,7 +42211,7 @@ wf
 wf
 wf
 bb
-EH
+BV
 gT
 wf
 wf

_maps/catwalkstation.json

@@ -20,5 +20,6 @@
 			"Baseturf": "/turf/open/openspace/airless",
 			"Linkage": "Cross"
 		}
-	]
+	],
+	"bonus_weakpoints": 1
 }

_maps/deltastation.json

@@ -14,5 +14,6 @@
 		"Cook": {
 			"additional_cqc_areas": ["/area/station/service/cafeteria"]
 		}
-	}
+	},
+	"bonus_weakpoints": 2
 }

_maps/icebox.json

@@ -59,5 +59,6 @@
 		"Cook": {
 			"additional_cqc_areas": ["/area/station/service/bar/atrium"]
 		}
-	}
+	},
+	"bonus_weakpoints": 2
 }