Merge remote-tracking branch 'upstream/master' into one-year-too-late

.github/CODEOWNERS

@@ -24,9 +24,9 @@
 /code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
 /code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
 /code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
-/code/modules/projectiles @FalloutFalcon
+/code/modules/projectiles/ @FalloutFalcon
 /code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
-/code/modules/unit_tests/icons @FalloutFalcon
+/code/modules/unit_tests/icons/ @FalloutFalcon
 
 # MarkSuckerberg
 

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM beestation/byond:515.1616 as base
+FROM beestation/byond:515.1633 as base
 
 # Install the tools needed to compile our rust dependencies
 FROM base as rust-build
@@ -12,8 +12,8 @@ RUN dpkg --add-architecture i386 \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     curl ca-certificates gcc-multilib \
-    g++-multilib libc6-i386 zlib1g-dev:i386 \
-    libssl-dev:i386 pkg-config:i386 git \
+    clang g++-multilib libc6-i386 \
+    zlib1g-dev:i386 pkg-config:i386 git \
     && /bin/bash -c "source dependencies.sh \
     && curl https://sh.rustup.rs | sh -s -- -y -t i686-unknown-linux-gnu --no-modify-path --profile minimal --default-toolchain \$RUST_VERSION" \
     && rm -rf /var/lib/apt/lists/*
@@ -25,7 +25,7 @@ RUN git init \
     && /bin/bash -c "source dependencies.sh \
     && git fetch --depth 1 origin \$RUST_G_VERSION" \
     && git checkout FETCH_HEAD \
-    && cargo build --release --all-features --target i686-unknown-linux-gnu
+    && cargo build --release --target i686-unknown-linux-gnu
 
 # Build auxmos
 FROM rust-build as auxmos
@@ -34,7 +34,7 @@ RUN git init \
     && git remote add origin \$AUXMOS_REPO \
     && git fetch --depth 1 origin \$AUXMOS_VERSION" \
     && git checkout FETCH_HEAD \
-    && cargo rustc --target=i686-unknown-linux-gnu --release --features all_reaction_hooks,katmos -- -C target-cpu=native
+    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"
 
 # Install nodejs which is required to deploy Shiptest
 FROM base as node

_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm

@@ -128,7 +128,6 @@
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
 	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
-	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)

_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm

@@ -891,7 +891,6 @@
 "zb" = (
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
 	loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon);
-	crusher_loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/crusher_trophy/miner_eye,/obj/item/keycard/gatedrop/lavacanyon)
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/overmap_encounter/planetoid/cave/explored)

code/datums/components/crafting/recipes/tribal.dm

@@ -12,16 +12,16 @@
 	time = 35
 	reqs = list(/obj/item/stack/sheet/bone = 2,
 				/obj/item/stack/sheet/sinew = 3,
-				/obj/item/crusher_trophy/wolf_ear = 2,
-				/obj/item/crusher_trophy/fang = 1)
+				/obj/item/mob_trophy/wolf_ear = 2,
+				/obj/item/mob_trophy/fang = 1)
 	category = CAT_PRIMAL
 
 /datum/crafting_recipe/bonecodpiece
 	name = "Skull Codpiece"
 	result = /obj/item/clothing/accessory/skullcodpiece
 	time = 20
 	reqs = list(/obj/item/stack/sheet/bone = 2,
-				/obj/item/crusher_trophy/legion_skull = 1,
+				/obj/item/mob_trophy/legion_skull = 1,
 				/obj/item/stack/sheet/animalhide/goliath_hide = 1)
 	category = CAT_PRIMAL
 

code/modules/cargo/exports/lavaland.dm

@@ -58,40 +58,40 @@
 						/obj/item/guardiancreator/miner/choose,//this is basically the most valulable mining loot so good luck getting a miner to part ways
 						/obj/item/gun/magic/staff/spellblade,
 						)
-
+/*
 /datum/export/lavaland/trophycommon
 	cost = 1500
 	unit_name = "common hunting trophy"
-	export_types = list(/obj/item/crusher_trophy/legion_skull,
-						/obj/item/crusher_trophy/wolf_ear,
-						/obj/item/crusher_trophy/bear_paw,
-						/obj/item/crusher_trophy/goliath_tentacle,
-						/obj/item/crusher_trophy/watcher_wing)
+	export_types = list(/obj/item/mob_trophy/legion_skull,
+						/obj/item/mob_trophy/wolf_ear,
+						/obj/item/mob_trophy/bear_paw,
+						/obj/item/mob_trophy/goliath_tentacle,
+						/obj/item/mob_trophy/watcher_wing)
 
 /datum/export/lavaland/trophyrare
 	cost = 5000
 	unit_name = "rare hunting trophy"
-	export_types = list(/obj/item/crusher_trophy/dwarf_skull,
-						/obj/item/crusher_trophy/fang,
-						/obj/item/crusher_trophy/war_paw,
-						/obj/item/crusher_trophy/elder_tentacle,
-						/obj/item/crusher_trophy/ice_crystal,
-						/obj/item/crusher_trophy/magma_wing,
-						/obj/item/crusher_trophy/tail_spike,
-						/obj/item/crusher_trophy/ice_wing)
+	export_types = list(/obj/item/mob_trophy/dwarf_skull,
+						/obj/item/mob_trophy/fang,
+						/obj/item/mob_trophy/war_paw,
+						/obj/item/mob_trophy/elder_tentacle,
+						/obj/item/mob_trophy/ice_crystal,
+						/obj/item/mob_trophy/magma_wing,
+						/obj/item/mob_trophy/tail_spike,
+						/obj/item/mob_trophy/ice_wing)
 
 /datum/export/lavaland/trophymega
 	cost = 10000
 	unit_name = "big game hunting trophy"
-	export_types = list(/obj/item/crusher_trophy/legionnaire_spine,
-						/obj/item/crusher_trophy/ash_spike,
-						/obj/item/crusher_trophy/demon_claws,
-						/obj/item/crusher_trophy/broodmother_tongue,
-						/obj/item/crusher_trophy/ice_block_talisman,
-						/obj/item/crusher_trophy/king_goat,
-						/obj/item/crusher_trophy/miner_eye,
-						/obj/item/crusher_trophy/vortex_talisman,
-						/obj/item/crusher_trophy/blaster_tubes)
+	export_types = list(/obj/item/mob_trophy/legionnaire_spine,
+						/obj/item/mob_trophy/ash_spike,
+						/obj/item/mob_trophy/demon_claws,
+						/obj/item/mob_trophy/broodmother_tongue,
+						/obj/item/mob_trophy/ice_block_talisman,
+						/obj/item/mob_trophy/miner_eye,
+						/obj/item/mob_trophy/vortex_talisman,
+						/obj/item/mob_trophy/blaster_tubes)
+*/
 
 /datum/export/lavaland/megafauna/total_printout(datum/export_report/ex, notes = TRUE) //in the unlikely case a miner feels like selling megafauna loot
 	. = ..()