From 8bec073a1bee248c55888769ff25555b47f410e4 Mon Sep 17 00:00:00 2001
From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com>
Date: Sat, 28 Sep 2024 01:11:18 +0200
Subject: [PATCH 1/4] Adds a fax machine to the Dwayne. (#3402)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request


![obraz](https://github.com/user-attachments/assets/79430ae8-1e33-4d11-8dd5-1d687790a261)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
- Communication with the outpost is fun.
- NT is like, THE tcomm company, even if the ship is meant to be their
civ market garbage, it should still get one.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Added a fax machine to the Dwayne-class.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 _maps/shuttles/independent/independent_dwayne.dmm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index a0383e507ec1..d1cc698c0c92 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_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" = (

From 86659425ecc9a1577a068115034051b623dd4881 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 27 Sep 2024 18:22:03 -0500
Subject: [PATCH 2/4] Automatic changelog generation for PR #3402 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3402.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-3402.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3402.yml b/html/changelogs/AutoChangeLog-pr-3402.yml
new file mode 100644
index 000000000000..a19f7367125f
--- /dev/null
+++ b/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

From c830d5f6ea455267f1a087d475e42be0716013a0 Mon Sep 17 00:00:00 2001
From: Theos <theubernyan@gmail.com>
Date: Fri, 27 Sep 2024 19:48:33 -0400
Subject: [PATCH 3/4] Fixes some stuff with legion infections (#3450)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

homeless skulls no longer complain about not being fed

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: legion skulls will no longer check if they should rise up and
consume their owner if they are ownerless
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

Signed-off-by: Theos <theubernyan@gmail.com>
---
 .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index b7ca291a5be4..bd9133ffce20 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/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)

From 771b608b4f0113906e003a05e99dad207589534b Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 27 Sep 2024 18:59:30 -0500
Subject: [PATCH 4/4] Automatic changelog generation for PR #3450 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3450.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-3450.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3450.yml b/html/changelogs/AutoChangeLog-pr-3450.yml
new file mode 100644
index 000000000000..0e16d8aa9f70
--- /dev/null
+++ b/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