Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-24809

.github/workflows/autowiki.yml

@@ -30,9 +30,6 @@ jobs:
     - name: Install rust-g
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       run: |
-        sudo dpkg --add-architecture i386
-        sudo apt update || true
-        sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
         bash tools/ci/install_rust_g.sh
     - name: Compile and generate Autowiki files
       if: steps.secrets_set.outputs.SECRETS_ENABLED

.github/workflows/run_integration_tests.yml

@@ -18,7 +18,7 @@ on:
         type: string
 jobs:
   run_integration_tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     services:
       mysql:
         image: mysql:latest
@@ -43,9 +43,6 @@ jobs:
           mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
       - name: Install rust-g
         run: |
-          sudo dpkg --add-architecture i386
-          sudo apt update || true
-          sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
           bash tools/ci/install_rust_g.sh
       - name: Install auxlua
         run: |

_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_icewalker_lower.dmm

@@ -1873,6 +1873,7 @@
 /obj/item/seeds/tower{
 	pixel_y = -3
 	},
+/obj/item/seeds/glowshroom,
 /obj/item/seeds/poppy,
 /obj/item/seeds/reishi,
 /obj/item/seeds/reishi,

_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm

@@ -6,6 +6,11 @@
 /area/ruin)
 "dI" = (
 /obj/item/grown/bananapeel,
+/obj/item/ammo_casing/a357/spent{
+	dir = 9;
+	pixel_x = -13;
+	pixel_y = 10
+	},
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "ef" = (
@@ -71,20 +76,21 @@
 /obj/machinery/atmospherics/components/unary/passive_vent{
 	dir = 4
 	},
-/obj/item/ammo_casing/energy/c3dbullet{
-	pixel_y = 10;
-	pixel_x = 115;
-	dir = 9
-	},
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/machinery/light/small/broken/directional/south,
+/obj/item/ammo_casing/a357/spent,
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "uc" = (
-/obj/item/ammo_casing/energy/c3dbullet,
 /obj/effect/decal/cleanable/blood/footprints{
 	dir = 4
 	},
+/obj/item/ammo_casing/a357/spent{
+	pixel_x = -5;
+	dir = 5;
+	pixel_y = 6
+	},
+/obj/item/ammo_casing/a357/spent,
 /obj/item/gps/spaceruin,
 /turf/open/floor/plating/airless,
 /area/ruin)
@@ -139,11 +145,6 @@
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "Ar" = (
-/obj/item/ammo_casing/energy/c3dbullet{
-	dir = 5;
-	pixel_x = 59;
-	pixel_y = 6
-	},
 /obj/item/clothing/mask/gas/clown_hat{
 	pixel_y = 39
 	},
@@ -216,7 +217,6 @@
 /area/ruin)
 "JK" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber,
-/obj/item/ammo_casing/energy/c3dbullet,
 /obj/effect/decal/cleanable/blood/gibs/up,
 /turf/open/floor/plating/airless,
 /area/ruin)
@@ -252,8 +252,8 @@
 /area/ruin)
 "Pq" = (
 /obj/machinery/light/broken/directional/north,
-/obj/item/ammo_casing/energy/c3dbullet,
 /obj/structure/reagent_dispensers/watertank,
+/obj/item/ammo_casing/a357/spent,
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "Qb" = (
@@ -267,7 +267,6 @@
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
 "Vj" = (
-/obj/structure/grille,
 /obj/effect/spawner/structure/window/reinforced,
 /obj/effect/mapping_helpers/damaged_window,
 /obj/effect/decal/cleanable/blood/splatter/over_window,

_maps/map_files/Birdshot/birdshot.dmm

@@ -16109,7 +16109,7 @@
 /obj/structure/chair/office/light{
 	dir = 4
 	},
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -34717,7 +34717,7 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/newscaster/directional/north,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/parrot/poly,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "iDq" = (