Merge branch 'master' into final-valor-passover

_maps/shuttles/independent/independent_dwayne.dmm

@@ -886,12 +886,15 @@
 	dir = 1
 	},
 /obj/item/radio/weather_monitor{
-	pixel_x = 5;
+	pixel_x = 8;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/mug{
-	pixel_x = -8
+/obj/machinery/newscaster/directional/west,
+/obj/item/paper_bin{
+	pixel_x = -8;
+	pixel_y = 6
 	},
+/obj/item/pen/fountain,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "mR" = (
@@ -2686,9 +2689,8 @@
 "Oz" = (
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/corner/opaque/ntblue/half,
-/obj/machinery/newscaster/directional/west,
-/obj/item/megaphone/cargo{
-	pixel_y = 5
+/obj/machinery/fax/indie{
+	pixel_y = 7
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
@@ -2711,6 +2713,7 @@
 /obj/item/ammo_box/c38,
 /obj/item/ammo_box/c38,
 /obj/item/gun/ballistic/revolver/detective,
+/obj/item/megaphone/cargo,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "OP" = (

code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm

@@ -297,6 +297,8 @@
 
 /// track our timers and reagents
 /obj/item/organ/legion_skull/proc/skull_check()
+	if(!owner)
+		return
 	if(!malignance)
 		malignance = new()
 		malignance.infect(owner, FALSE)

html/changelogs/AutoChangeLog-pr-3402.yml

@@ -0,0 +1,4 @@
+author: Sadhorizon
+changes:
+  - {rscadd: Added a fax machine to the Dwayne-class.}
+delete-after: true

html/changelogs/AutoChangeLog-pr-3450.yml

@@ -0,0 +1,5 @@
+author: SomeguyManperson
+changes:
+  - {bugfix: legion skulls will no longer check if they should rise up and consume
+      their owner if they are ownerless}
+delete-after: true