Merge pull request #756 from Profakos/orb-update-2024-12-27

Orb update 2024 12 27
lizardqueenlexi · Dec 27, 2024 · 4bdcfc3 · 4bdcfc3
2 parents 6222be8 + b2aa9bf
commit 4bdcfc3
Show file tree

Hide file tree

Showing 759 changed files with 11,900 additions and 6,585 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -284,10 +284,11 @@ jobs:
   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 ]
+    needs: [ test_windows, compare_screenshots, compile_all_maps, run_all_tests, run_alternate_tests, 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) }}
+          allowed-skips: compare_screenshots
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
@@ -993,9 +993,6 @@
 /area/ruin/comms_agent)
 "UI" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/security/laptop/syndie{
-	dir = 1
-	},
 /obj/item/paper/monitorkey{
 	pixel_x = -15;
 	pixel_y = 7

diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -584,7 +584,7 @@
 	name = "dried blood trail"
 	},
 /mob/living/basic/creature{
-	desc = "Awh its so sm-OH GOD WHAT THE FUCK.";
+	desc = "Awh, it's so sm-OH GOD, WHAT THE FUCK.";
 	health = 25;
 	maxHealth = 25;
 	name = "hatchling";

diff --git a/_maps/RandomRuins/SpaceRuins/meatderelict.dmm b/_maps/RandomRuins/SpaceRuins/meatderelict.dmm
@@ -728,8 +728,8 @@
 /obj/effect/turf_decal/siding/purple{
 	dir = 1
 	},
-/obj/item/ammo_casing/a357/spent,
-/obj/item/ammo_casing/a357/spent,
+/obj/item/ammo_casing/c357/spent,
+/obj/item/ammo_casing/c357/spent,
 /turf/open/indestructible/white,
 /area/ruin/space/has_grav/powered/biooutpost)
 "oQ" = (
@@ -887,7 +887,7 @@
 /obj/effect/turf_decal/siding/purple{
 	dir = 1
 	},
-/obj/item/ammo_casing/a357/spent,
+/obj/item/ammo_casing/c357/spent,
 /turf/open/indestructible/white,
 /area/ruin/space/has_grav/powered/biooutpost)
 "rl" = (
@@ -1561,9 +1561,9 @@
 /turf/open/indestructible/plating,
 /area/ruin/space/has_grav/powered/biooutpost)
 "DC" = (
-/obj/item/ammo_casing/a357/spent,
-/obj/item/ammo_casing/a357/spent,
-/obj/item/ammo_casing/a357/spent,
+/obj/item/ammo_casing/c357/spent,
+/obj/item/ammo_casing/c357/spent,
+/obj/item/ammo_casing/c357/spent,
 /turf/open/indestructible/white,
 /area/ruin/space/has_grav/powered/biooutpost)
 "DJ" = (

diff --git a/_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm b/_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm
@@ -6,7 +6,7 @@
 /area/ruin)
 "dI" = (
 /obj/item/grown/bananapeel,
-/obj/item/ammo_casing/a357/spent{
+/obj/item/ammo_casing/c357/spent{
 	dir = 9;
 	pixel_x = -13;
 	pixel_y = 10
@@ -78,19 +78,19 @@
 	},
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/machinery/light/small/broken/directional/south,
-/obj/item/ammo_casing/a357/spent,
+/obj/item/ammo_casing/c357/spent,
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "uc" = (
 /obj/effect/decal/cleanable/blood/footprints{
 	dir = 4
 	},
-/obj/item/ammo_casing/a357/spent{
+/obj/item/ammo_casing/c357/spent{
 	pixel_x = -5;
 	dir = 5;
 	pixel_y = 6
 	},
-/obj/item/ammo_casing/a357/spent,
+/obj/item/ammo_casing/c357/spent,
 /obj/item/gps/spaceruin,
 /turf/open/floor/plating/airless,
 /area/ruin)
@@ -204,7 +204,7 @@
 /obj/effect/mob_spawn/corpse/human/clown,
 /obj/effect/decal/cleanable/blood/footprints,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/a357/spent,
+/obj/item/ammo_casing/c357/spent,
 /turf/open/floor/plating/airless,
 /area/ruin)
 "Ij" = (
@@ -253,7 +253,7 @@
 "Pq" = (
 /obj/machinery/light/broken/directional/north,
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/ammo_casing/a357/spent,
+/obj/item/ammo_casing/c357/spent,
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "Qb" = (

diff --git a/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm b/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm
@@ -210,8 +210,8 @@
 "nF" = (
 /obj/item/radio/intercom/directional/south,
 /obj/effect/decal/cleanable/blood/old,
-/obj/item/ammo_casing/a357/match,
-/obj/item/ammo_casing/a357/match{
+/obj/item/ammo_casing/c357/match,
+/obj/item/ammo_casing/c357/match{
 	pixel_y = -4;
 	pixel_x = -7
 	},
@@ -306,7 +306,7 @@
 /area/ruin/space/unpowered)
 "uS" = (
 /obj/machinery/newscaster/directional/south,
-/obj/item/ammo_casing/a357/match,
+/obj/item/ammo_casing/c357/match,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/unpowered)
 "vi" = (
@@ -425,7 +425,7 @@
 /turf/open/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/unpowered)
 "Cv" = (
-/obj/item/ammo_casing/a357/match,
+/obj/item/ammo_casing/c357/match,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/unpowered)
 "CC" = (

diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
@@ -5893,8 +5893,8 @@
 /turf/open/floor/plating,
 /area/ruin/space/ks13/science/ordnance)
 "Nk" = (
-/obj/effect/spawner/random/maintenance,
 /obj/structure/lattice,
+/obj/effect/spawner/random/maintenance/no_decals,
 /turf/template_noop,
 /area/space/nearstation)
 "Nl" = (