Merge upstream 19.02.2026

.github/workflows/ci_suite.yml

@@ -26,7 +26,6 @@ jobs:
         run: exit 0
 
   run_linters:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Run Linters
     needs: start_gate
     runs-on: ubuntu-22.04
@@ -130,7 +129,6 @@ jobs:
           ./DMCompiler_linux-x64/DMCompiler shiptest.dme --suppress-unimplemented --define=CIBUILDING | bash tools/ci/annotate_od.sh
 
   compile_all_maps:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Compile Maps
     needs: start_gate
     runs-on: ubuntu-latest
@@ -155,7 +153,6 @@ jobs:
           tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS -DFULL_INIT
 
   run_all_tests:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Integration Tests
     needs: start_gate
     strategy:

_maps/RandomRuins/BeachRuins/beach_gunsmith.dmm

@@ -3677,10 +3677,7 @@
 /turf/open/floor/concrete/tiles,
 /area/ruin/beach/gunsmith)
 "Mb" = (
-/obj/item/gun/energy/plasmacutter{
-	pixel_x = -16;
-	pixel_y = 11
-	},
+/obj/item/plasmacutter,
 /obj/effect/decal/cleanable/oil/slippery,
 /mob/living/simple_animal/hostile/human/ramzi/civilian{
 	wander = 0

_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

@@ -3813,7 +3813,7 @@
 	req_access = list(150,10);
 	populate = 0
 	},
-/obj/item/gun/energy/plasmacutter,
+/obj/item/plasmacutter,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/storage/belt/utility/syndicate,
 /obj/item/clothing/under/syndicate/gec,

_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm

@@ -1236,7 +1236,7 @@
 	pixel_x = 6;
 	pixel_y = 5
 	},
-/obj/item/storage/box/ammo/a357{
+/obj/item/ammo_box/a357{
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/dark,