Upstream 2026-07-01

.github/workflows/auto_changelog.yml

@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v7
+        with:
+          ref: ${{ github.base_ref }}
 
       - name: Generate App Token
         id: app-token-generation

.github/workflows/ci_suite.yml

@@ -1,6 +1,12 @@
 name: CI Suite
 
 on:
+  push:
+    branches:
+    - master
+    - 'project/**'
+    - 'gh-readonly-queue/master/**'
+    - 'gh-readonly-queue/project/**'
   pull_request:
     branches:
       - master

.github/workflows/gbp.yml

@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v7
+        with:
+          ref: ${{ github.base_ref }}
       - name: Run Auto Labeler
         uses: actions/github-script@v9
         with:
@@ -41,6 +43,8 @@ jobs:
       - name: Checkout
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: actions/checkout@v7
+        with:
+          ref: ${{ github.base_ref }}
       - name: Setup git
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |

_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm

@@ -1320,7 +1320,7 @@
 	},
 /area/ruin/pizzeria)
 "XB" = (
-/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/spawner/random/food_or_drink/keg,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "XS" = (

_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm

@@ -405,7 +405,7 @@
 /turf/open/misc/ice/icemoon,
 /area/icemoon/underground/explored)
 "Zd" = (
-/turf/closed/indestructible/rock/snow/ice/ore,
+/turf/closed/indestructible/rock/snow/ore,
 /area/icemoon/underground/explored)
 
 (1,1,1) = {"

_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm

@@ -47,7 +47,7 @@
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/underground/unexplored)
 "l" = (
-/turf/closed/indestructible/rock/snow/ice/ore,
+/turf/closed/indestructible/rock/snow/ore,
 /area/icemoon/underground/explored)
 "m" = (
 /obj/effect/decal/cleanable/blood,
@@ -161,7 +161,7 @@
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/underground/explored)
 "I" = (
-/turf/closed/indestructible/rock/snow/ice/ore,
+/turf/closed/indestructible/rock/snow/ore,
 /area/icemoon/underground/unexplored)
 "J" = (
 /obj/effect/turf_decal/weather/snow/corner{
@@ -238,7 +238,7 @@
 /area/icemoon/underground/explored)
 "S" = (
 /obj/structure/flora/grass/brown/style_random,
-/turf/closed/indestructible/rock/snow/ice/ore,
+/turf/closed/indestructible/rock/snow/ore,
 /area/icemoon/underground/explored)
 "T" = (
 /obj/structure/flora/rock/pile/icy/style_3,

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -455,7 +455,7 @@
 /turf/open/misc/beach/sand,
 /area/ruin/powered/beach)
 "oQ" = (
-/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/spawner/random/food_or_drink/keg,
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "oU" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm

@@ -43,7 +43,7 @@
 /turf/open/misc/asteroid/snow,
 /area/ruin/powered/snow_biodome)
 "al" = (
-/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/spawner/random/food_or_drink/keg,
 /turf/open/floor/plating,
 /area/ruin/powered/snow_biodome)
 "am" = (

_maps/RandomRuins/SpaceRuins/allamericandiner.dmm

@@ -375,7 +375,7 @@
 /turf/open/floor/iron/kitchen,
 /area/ruin/space/has_grav/allamericandiner)
 "rV" = (
-/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/spawner/random/food_or_drink/keg,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/allamericandiner)

_maps/RandomRuins/SpaceRuins/deepstorage.dmm

@@ -74,7 +74,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
-/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/spawner/random/food_or_drink/keg,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/deepstorage/kitchen)
 "as" = (

_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm

@@ -761,7 +761,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "Sb" = (
-/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/spawner/random/food_or_drink/keg,
 /obj/structure/spider/stickyweb,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)

_maps/RandomRuins/SpaceRuins/oldstation.dmm

@@ -523,6 +523,7 @@
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/structure/table,
 /obj/machinery/door/window/brigdoor/right/directional/east,
+/obj/item/circuitboard/computer/borgupload/no_lock,
 /turf/open/floor/iron/dark,
 /area/ruin/space/ancientstation/delta/ai)
 "cA" = (
@@ -6797,6 +6798,15 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/white/textured,
 /area/ruin/space/ancientstation/delta/proto)
+"MC" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/table,
+/obj/machinery/door/window/brigdoor/right/directional/east,
+/obj/item/circuitboard/computer/aiupload/no_lock,
+/turf/open/floor/iron/dark,
+/area/ruin/space/ancientstation/delta/ai)
 "MH" = (
 /obj/structure/girder/displaced,
 /turf/open/floor/plating/airless,
@@ -14366,7 +14376,7 @@ Wb
 NS
 dT
 nG
-cz
+MC
 cz
 ad
 ad

_maps/RandomRuins/SpaceRuins/russian_derelict.dmm

@@ -5594,6 +5594,8 @@
 	pixel_y = 6
 	},
 /obj/item/circuitboard/machine/protolathe/offstation,
+/obj/item/circuitboard/computer/borgupload/no_lock,
+/obj/item/circuitboard/computer/aiupload/no_lock,
 /turf/open/floor/circuit/red/off,
 /area/ruin/space/ks13/ai/corridor)
 "LM" = (

_maps/RandomRuins/SpaceRuins/waystation.dmm

@@ -309,7 +309,7 @@
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/cargobay)
 "fU" = (
-/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/spawner/random/food_or_drink/keg,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/waystation/kitchen)
 "gf" = (