From df98ce26308c5c41bb55e83f18470c9784192fde Mon Sep 17 00:00:00 2001
From: Paul Mullen <101871009+mullenpaul@users.noreply.github.com>
Date: Fri, 13 Oct 2023 20:46:33 +0100
Subject: [PATCH 01/18] added faction weapon spawns for uscm upp clf and pmc
 (#4635)

# About the pull request
Adds a bunch of faction specific weapon spawners in to the game to help
mappers.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

This makes mappers happy by letting them place more specific faction
based spawners.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: adds weapon spawners for USCM, CLF, PMC and UPP
/:cl:
---
 .../effects/spawners/faction_spawners.dm      | 197 ++++++++++++++++++
 colonialmarines.dme                           |   1 +
 2 files changed, 198 insertions(+)
 create mode 100644 code/game/objects/effects/spawners/faction_spawners.dm

diff --git a/code/game/objects/effects/spawners/faction_spawners.dm b/code/game/objects/effects/spawners/faction_spawners.dm
new file mode 100644
index 000000000000..2daf6392e5e7
--- /dev/null
+++ b/code/game/objects/effects/spawners/faction_spawners.dm
@@ -0,0 +1,197 @@
+/*
+ * USCM weapons
+ */
+/obj/effect/spawner/random/gun/uscm_primary
+	name = "USCM primary weapon spawner"
+	desc = "spawns USCM primary weapons"
+	mags_max = 2
+	mags_min = 1
+	guns = list(
+		/obj/item/weapon/gun/rifle/m41a = /obj/item/ammo_magazine/rifle,
+		/obj/item/weapon/gun/rifle/m41a/tactical = /obj/item/ammo_magazine/rifle,
+		/obj/item/weapon/gun/smg/m39 = /obj/item/ammo_magazine/smg/m39,
+		/obj/item/weapon/gun/smg/m39 = /obj/item/ammo_magazine/smg/m39,
+		/obj/item/weapon/gun/shotgun/pump = /datum/ammo/bullet/shotgun/buckshot
+	)
+
+/obj/effect/spawner/random/gun/uscm_primary/lowchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_rifle_20"
+
+/obj/effect/spawner/random/gun/uscm_primary/midchance
+	spawn_nothing_percentage = 50
+	icon_state = "loot_rifle_50"
+
+/obj/effect/spawner/random/gun/uscm_primary/highchance
+	spawn_nothing_percentage = 20
+	icon_state = "loot_rifle_80"
+
+/obj/effect/spawner/random/gun/uscm_secondary
+	name = "USCM secondary weapon spawner"
+	desc = "spawns USCM secondary weapons"
+	spawn_nothing_percentage = 0
+	mags_max = 2
+	mags_min = 1
+	guns = list(
+		/obj/item/weapon/gun/pistol/m4a3 = /obj/item/ammo_magazine/pistol,
+		/obj/item/weapon/gun/revolver/m44 = /obj/item/ammo_magazine/handful/revolver/marksman
+	)
+
+/obj/effect/spawner/random/gun/uscm_secondary/lowchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_pistol_20"
+
+/obj/effect/spawner/random/gun/uscm_secondary/midchance
+	spawn_nothing_percentage = 50
+	icon_state = "loot_pistol_50"
+
+/obj/effect/spawner/random/gun/uscm_secondary/highchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_pistol_80"
+
+
+/*
+ * UPP weapons
+ */
+/obj/effect/spawner/random/gun/upp_primary
+	name = "UPP primary weapon spawner"
+	desc = "spawns UPP primary weapons"
+	mags_max = 2
+	mags_min = 1
+	guns = list(
+		/obj/item/weapon/gun/smg/bizon/upp = /obj/item/ammo_magazine/smg/bizon,
+		/obj/item/weapon/gun/rifle/type71 = /obj/item/ammo_magazine/rifle/type71,
+		/obj/item/weapon/gun/rifle/type71/carbine = /obj/item/ammo_magazine/rifle/type71
+	)
+
+/obj/effect/spawner/random/gun/upp_primary/lowchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_rifle_20"
+
+/obj/effect/spawner/random/gun/upp_primary/midchance
+	spawn_nothing_percentage = 50
+	icon_state = "loot_rifle_50"
+
+/obj/effect/spawner/random/gun/upp_primary/highchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_rifle_80"
+
+/obj/effect/spawner/random/gun/upp_secondary
+	name = "UPP secondary weapon spawner"
+	desc = "spawns UPP secondary weapons"
+	mags_max = 2
+	mags_min = 1
+	guns = list(
+		/obj/item/weapon/gun/pistol/t73 = /obj/item/ammo_magazine/pistol/t73,
+		/obj/item/weapon/gun/pistol/np92 = /obj/item/ammo_magazine/pistol/np92,
+		/obj/item/weapon/gun/revolver/upp = /obj/item/ammo_magazine/revolver/upp
+	)
+
+/obj/effect/spawner/random/gun/upp_secondary/lowchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_pistol_20"
+
+/obj/effect/spawner/random/gun/upp_secondary/medchance
+	spawn_nothing_percentage = 50
+	icon_state = "loot_pistol_50"
+
+/obj/effect/spawner/random/gun/upp_secondary/highchance
+	spawn_nothing_percentage = 20
+	icon_state = "loot_pistol_80"
+/*
+ * PMC weapons
+ */
+/obj/effect/spawner/random/gun/pmc_primary
+	name = "PMC primary weapon spawner"
+	desc = "spawns PMC primary weapons"
+	mags_max = 2
+	mags_min = 1
+	guns = list(
+		/obj/item/weapon/gun/rifle/m41a/elite = /obj/item/ammo_magazine/rifle/ap,
+		/obj/item/weapon/gun/rifle/m41a/elite = /obj/item/ammo_magazine/rifle/extended,
+		/obj/item/weapon/gun/smg/m39/elite = /obj/item/ammo_magazine/smg/m39/ap,
+		/obj/item/weapon/gun/smg/m39/elite = /obj/item/ammo_magazine/smg/m39/extended,
+		/obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23/ap,
+		/obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23/extended
+	)
+
+/obj/effect/spawner/random/gun/pmc_primary/lowchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_rifle_20"
+
+/obj/effect/spawner/random/gun/pmc_primary/midchance
+	spawn_nothing_percentage = 50
+	icon_state = "loot_rifle_50"
+
+/obj/effect/spawner/random/gun/pmc_primary/highchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_rifle_80"
+
+/obj/effect/spawner/random/gun/pmc_secondary
+	name = "PMC secondary weapon spawner"
+	desc = "spawns PMC secondary weapons"
+	mags_max = 2
+	mags_min = 1
+	guns = list(
+		/obj/item/weapon/gun/pistol/vp78 = /obj/item/ammo_magazine/pistol/vp78,
+		/obj/item/weapon/gun/pistol/mod88 = /obj/item/ammo_magazine/pistol/mod88
+	)
+
+/obj/effect/spawner/random/gun/pmc_secondary/lowchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_pistol_20"
+
+/obj/effect/spawner/random/gun/pmc_secondary/medchance
+	spawn_nothing_percentage = 50
+	icon_state = "loot_pistol_50"
+
+/obj/effect/spawner/random/gun/pmc_secondary/highchance
+	spawn_nothing_percentage = 20
+	icon_state = "loot_pistol_80"
+
+/*
+ * CLF weapons
+ */
+/obj/effect/spawner/random/gun/clf_primary
+	name = "CLF primary weapon spawner"
+	desc = "spawns CLF primary weapons"
+	mags_max = 2
+	mags_min = 1
+	guns = list(
+		/obj/item/weapon/gun/rifle/m16 = /obj/item/ammo_magazine/rifle/m16,
+		/obj/item/weapon/gun/rifle/mar40/carbine = /obj/item/ammo_magazine/rifle/mar40
+	)
+
+/obj/effect/spawner/random/gun/clf_primary/lowchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_rifle_20"
+
+/obj/effect/spawner/random/gun/clf_primary/midchance
+	spawn_nothing_percentage = 50
+	icon_state = "loot_rifle_50"
+
+/obj/effect/spawner/random/gun/clf_primary/highchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_rifle_80"
+
+/obj/effect/spawner/random/gun/clf_secondary
+	name = "CLF secondary weapon spawner"
+	desc = "spawns CLF secondary weapons"
+	mags_max = 2
+	mags_min = 1
+	guns = list(
+		/obj/item/weapon/gun/pistol/kt42 = /obj/item/ammo_magazine/pistol/kt42,
+		/obj/item/weapon/gun/pistol/b92fs = /obj/item/ammo_magazine/pistol/b92fs
+	)
+
+/obj/effect/spawner/random/gun/clf_secondary/lowchance
+	spawn_nothing_percentage = 80
+	icon_state = "loot_pistol_20"
+
+/obj/effect/spawner/random/gun/clf_secondary/medchance
+	spawn_nothing_percentage = 50
+	icon_state = "loot_pistol_50"
+
+/obj/effect/spawner/random/gun/clf_secondary/highchance
+	spawn_nothing_percentage = 20
+	icon_state = "loot_pistol_80"
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 63140be5e458..e79c6c0585cb 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -970,6 +970,7 @@ s// DM Environment file for colonialmarines.dme.
 #include "code\game\objects\effects\landmarks\structure_spawners\setup_distress.dm"
 #include "code\game\objects\effects\landmarks\structure_spawners\structure_spawner.dm"
 #include "code\game\objects\effects\landmarks\structure_spawners\xvx_hive.dm"
+#include "code\game\objects\effects\spawners\faction_spawners.dm"
 #include "code\game\objects\effects\spawners\gibspawner.dm"
 #include "code\game\objects\effects\spawners\prop_gun_spawner.dm"
 #include "code\game\objects\effects\spawners\random.dm"

From 19985def29671805f94f7a438d4e99b8ad759eff Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 13 Oct 2023 20:59:25 +0100
Subject: [PATCH 02/18] Automatic changelog for PR #4635 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4635.yml b/html/changelogs/AutoChangeLog-pr-4635.yml
new file mode 100644
index 000000000000..b74bf73dfea1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4635.yml
@@ -0,0 +1,4 @@
+author: "mullenpaul"
+delete-after: True
+changes:
+  - rscadd: "adds weapon spawners for USCM, CLF, PMC and UPP"
\ No newline at end of file

From 20be6b24b1cee7201daa549240a83c8c089452e6 Mon Sep 17 00:00:00 2001
From: QuickLode <63271983+QuickLode@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:51:13 -0700
Subject: [PATCH 03/18] Solaris Ridge PMC Nightmare small changes (#4622)

# About the pull request
Small changes to solaris ridge pmc nightmare
- access stuff
- removes some pmc synth equipment , replaced with lesser equipment or
nothing
- colony supervisor has a guaranteed research grant


<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
PMC Survivor Synthetic has gear unequivical to a Survivor despite being
a nightmare, toning it down reduces the ceiling they can operate in.

Colony Supervisor should have an impact on research if they can survive,
because the role is extremely difficult to survive in and lacks any
means to defend themselves - relying on others to hopefully survive in
classic WY fashion. They're also the colony supervisor and asst mngr of
research meaning that they would have incentives for researchers.

Colony supervisor can now access his colony. LMFAO
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Colony Supervisor now has a guaranteed grant.
balance: nerfs PMC Synthetic's gear
fix: PMC Synthetic has corrected access(thx forest)
fix: Colony Supervisor can now have access to his own colony(LOL).
/:cl:
---
 .../crashlanding-offices_insert_bigred.dm     | 59 +++++++++++++++----
 code/modules/gear_presets/synths.dm           |  4 ++
 2 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm
index c5c85a0a7441..35a9b8e5eaba 100644
--- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm
+++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm
@@ -6,12 +6,26 @@
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 	assignment = "Weyland-Yutani PMC"
 	faction = FACTION_SURVIVOR
-	faction_group = list(FACTION_SURVIVOR)
+	faction_group = list(FACTION_WY, FACTION_SURVIVOR)
 	paygrade = "PMC-OP"
 	idtype = /obj/item/card/id/pmc
 	skills = /datum/skills/civilian/survivor/pmc
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
-	access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND)
+	access = list(
+		ACCESS_WY_GENERAL,
+		ACCESS_WY_COLONIAL,
+		ACCESS_WY_MEDICAL,
+		ACCESS_WY_SECURITY,
+		ACCESS_WY_RESEARCH,
+		ACCESS_WY_ARMORY,
+		ACCESS_CIVILIAN_PUBLIC,
+		ACCESS_CIVILIAN_RESEARCH,
+		ACCESS_CIVILIAN_ENGINEERING,
+		ACCESS_CIVILIAN_LOGISTICS,
+		ACCESS_CIVILIAN_BRIG,
+		ACCESS_CIVILIAN_MEDBAY,
+		ACCESS_CIVILIAN_COMMAND,
+	)
 
 /datum/equipment_preset/survivor/pmc/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR)
@@ -77,12 +91,17 @@
 	access = list(
 		ACCESS_WY_GENERAL,
 		ACCESS_WY_COLONIAL,
-		ACCESS_WY_LEADERSHIP,
+		ACCESS_WY_MEDICAL,
 		ACCESS_WY_SECURITY,
-		ACCESS_WY_EXEC,
 		ACCESS_WY_RESEARCH,
-		ACCESS_WY_ENGINEERING,
-		ACCESS_WY_MEDICAL,
+		ACCESS_WY_ARMORY,
+		ACCESS_CIVILIAN_PUBLIC,
+		ACCESS_CIVILIAN_RESEARCH,
+		ACCESS_CIVILIAN_ENGINEERING,
+		ACCESS_CIVILIAN_LOGISTICS,
+		ACCESS_CIVILIAN_BRIG,
+		ACCESS_CIVILIAN_MEDBAY,
+		ACCESS_CIVILIAN_COMMAND,
 		ACCESS_ILLEGAL_PIRATE,
 	)
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
@@ -95,11 +114,12 @@
 	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
 		add_ice_colony_survivor_equipment(new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/manager(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE)
 	add_pmc_survivor_weapon(new_human)
@@ -110,8 +130,22 @@
 /datum/equipment_preset/synth/survivor/pmc
 	name = "Survivor - Synthetic - PMC Support Synth"
 	faction = FACTION_SURVIVOR
-	faction_group = list(FACTION_SURVIVOR)
-	access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND)
+	faction_group = list(FACTION_WY, FACTION_SURVIVOR)
+	access = list(
+		ACCESS_WY_GENERAL,
+		ACCESS_WY_COLONIAL,
+		ACCESS_WY_MEDICAL,
+		ACCESS_WY_SECURITY,
+		ACCESS_WY_RESEARCH,
+		ACCESS_WY_ARMORY,
+		ACCESS_CIVILIAN_PUBLIC,
+		ACCESS_CIVILIAN_RESEARCH,
+		ACCESS_CIVILIAN_ENGINEERING,
+		ACCESS_CIVILIAN_LOGISTICS,
+		ACCESS_CIVILIAN_BRIG,
+		ACCESS_CIVILIAN_MEDBAY,
+		ACCESS_CIVILIAN_COMMAND,
+	)
 	idtype = /obj/item/card/id/pmc
 	assignment = JOB_PMC_SYNTH
 	rank = JOB_PMC_SYNTH
@@ -122,15 +156,16 @@
 
 /datum/equipment_preset/synth/survivor/pmc/load_gear(mob/living/carbon/human/new_human)
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY)
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY)
+		new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/scalpel/manager, WEAR_IN_ACCESSORY)
+		new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/weylandyutani, WEAR_IN_ACCESSORY)
+		new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY)
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET)
 		new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
 		new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET)
-		new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET)
 
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD)
 		new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR)
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/experimental_mesons, WEAR_EYES)
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE)
 
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
index dc5d3b7217c8..c686ae91bb78 100644
--- a/code/modules/gear_presets/synths.dm
+++ b/code/modules/gear_presets/synths.dm
@@ -143,6 +143,10 @@
 	. = ..()
 	access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civillians stuff + medbay stuff + engineering stuff + research
 
+/datum/equipment_preset/synth/survivor/pmc/New()
+	. = ..()
+	access = get_access(ACCESS_LIST_WY_PMC)
+
 /datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human)
 	for(var/equipment in equipment_to_spawn)
 		var/equipment_path = islist(equipment_to_spawn[equipment]) ? pick(equipment_to_spawn[equipment]) : equipment_to_spawn[equipment]

From 5c2b9cd49c752df7d009c64879308d11eda1371f Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 13 Oct 2023 21:16:00 +0100
Subject: [PATCH 04/18] Automatic changelog for PR #4622 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4622.yml b/html/changelogs/AutoChangeLog-pr-4622.yml
new file mode 100644
index 000000000000..8cadcfa7742a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4622.yml
@@ -0,0 +1,7 @@
+author: "QuickLode"
+delete-after: True
+changes:
+  - rscadd: "Colony Supervisor now has a guaranteed grant."
+  - balance: "nerfs PMC Synthetic's gear"
+  - bugfix: "PMC Synthetic has corrected access(thx forest)"
+  - bugfix: "Colony Supervisor can now have access to his own colony(LOL)."
\ No newline at end of file

From 2a14790fc99a06b815da1eda40e71a7656fc2142 Mon Sep 17 00:00:00 2001
From: riot <103988604+CapCamIII@users.noreply.github.com>
Date: Fri, 13 Oct 2023 14:57:31 -0500
Subject: [PATCH 05/18] fixes upp medic/sapper survivor paygrade (#4646)

# About the pull request

fixes the paygrade for UPP medic/sapper survivor because i forgot they
existed in the pr i made simplifying ranks

# Explain why it's good for the game

Korporal Medic "SURVIVOR FRAGGER" Guy says, "I wanna frag xenos" > UE3M
Medic "SURVIVOR FRAGGER" Guy says, "I wanna frag xenos"

# Testing Photographs and Procedure

Probably works I did not test this.

# Changelog
:cl:
fix: UPP Sapper/Medic survivor use their correct paygrade instead of
UE3M/UE3S
/:cl:
---
 .../survivors/trijent/crashlanding_upp_bar_insert_trijent.dm  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm
index 147e40a24314..5c662f50d8c7 100644
--- a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm
+++ b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm
@@ -64,7 +64,7 @@
 //crashlanding-upp-bar.dmm
 /datum/equipment_preset/survivor/upp/sapper
 	name = "Survivor - UPP Sapper"
-	paygrade = "UE3S"
+	paygrade = "UE3"
 	assignment = JOB_UPP_ENGI
 	rank = JOB_UPP_ENGI
 	skills = /datum/skills/military/survivor/upp_sapper
@@ -92,7 +92,7 @@
 //crashlanding-upp-bar.dmm
 /datum/equipment_preset/survivor/upp/medic
 	name = "Survivor - UPP Medic"
-	paygrade = "UE3M"
+	paygrade = "UE3"
 	assignment = JOB_UPP_MEDIC
 	rank = JOB_UPP_MEDIC
 	skills = /datum/skills/military/survivor/upp_medic

From dfb1f5bb2067929531bf3af8f365614a73411c92 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 13 Oct 2023 21:49:50 +0100
Subject: [PATCH 06/18] Automatic changelog for PR #4646 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4646.yml b/html/changelogs/AutoChangeLog-pr-4646.yml
new file mode 100644
index 000000000000..a546eb654cae
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4646.yml
@@ -0,0 +1,4 @@
+author: "CapCamIII"
+delete-after: True
+changes:
+  - bugfix: "UPP Sapper/Medic survivor use their correct paygrade instead of UE3M/UE3S"
\ No newline at end of file

From 1c62c62ea615a68093a5083d3d38e399f8886851 Mon Sep 17 00:00:00 2001
From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
Date: Fri, 13 Oct 2023 16:32:06 -0400
Subject: [PATCH 07/18] M39 arm brace stock disables when dropped (#4655)

# About the pull request

If you got delimbed while the brace was locked, the next person to equip
it gets it stuck on their hand
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
It should fix the gun accidentally getting stuck to peoples hands

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: M39 arm brace disables when dropped
/:cl:
---
 code/modules/projectiles/gun.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index e9ab9aecc3c2..9d16574aa9da 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -524,6 +524,10 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w
 	if(fire_delay_group && delay_left > 0)
 		LAZYSET(user.fire_delay_next_fire, src, world.time + delay_left)
 
+	for(var/obj/item/attachable/stock/smg/collapsible/brace/current_stock in contents) //SMG armbrace folds to stop it getting stuck on people
+		if(current_stock.stock_activated)
+			current_stock.activate_attachment(src, user, turn_off = TRUE)
+
 	unwield(user)
 	set_gun_user(null)
 

From 9dfb4bb3fb08b1c2c02908b5d7121931b6ee3be9 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 13 Oct 2023 22:13:50 +0100
Subject: [PATCH 08/18] Automatic changelog for PR #4655 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4655.yml b/html/changelogs/AutoChangeLog-pr-4655.yml
new file mode 100644
index 000000000000..3653446a6734
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4655.yml
@@ -0,0 +1,4 @@
+author: "BeagleGaming1"
+delete-after: True
+changes:
+  - bugfix: "M39 arm brace disables when dropped"
\ No newline at end of file

From 555a0a1d726e34b447596640e22176ff6f93caf9 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sat, 14 Oct 2023 01:06:20 +0000
Subject: [PATCH 09/18] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-4622.yml |  7 -------
 html/changelogs/AutoChangeLog-pr-4635.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4646.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4655.yml |  4 ----
 html/changelogs/archive/2023-10.yml       | 12 ++++++++++++
 5 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4622.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4635.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4646.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4655.yml

diff --git a/html/changelogs/AutoChangeLog-pr-4622.yml b/html/changelogs/AutoChangeLog-pr-4622.yml
deleted file mode 100644
index 8cadcfa7742a..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4622.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "QuickLode"
-delete-after: True
-changes:
-  - rscadd: "Colony Supervisor now has a guaranteed grant."
-  - balance: "nerfs PMC Synthetic's gear"
-  - bugfix: "PMC Synthetic has corrected access(thx forest)"
-  - bugfix: "Colony Supervisor can now have access to his own colony(LOL)."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4635.yml b/html/changelogs/AutoChangeLog-pr-4635.yml
deleted file mode 100644
index b74bf73dfea1..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4635.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "mullenpaul"
-delete-after: True
-changes:
-  - rscadd: "adds weapon spawners for USCM, CLF, PMC and UPP"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4646.yml b/html/changelogs/AutoChangeLog-pr-4646.yml
deleted file mode 100644
index a546eb654cae..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4646.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "CapCamIII"
-delete-after: True
-changes:
-  - bugfix: "UPP Sapper/Medic survivor use their correct paygrade instead of UE3M/UE3S"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4655.yml b/html/changelogs/AutoChangeLog-pr-4655.yml
deleted file mode 100644
index 3653446a6734..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4655.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BeagleGaming1"
-delete-after: True
-changes:
-  - bugfix: "M39 arm brace disables when dropped"
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml
index 88a569e7c326..aba66c07af8d 100644
--- a/html/changelogs/archive/2023-10.yml
+++ b/html/changelogs/archive/2023-10.yml
@@ -157,3 +157,15 @@
   Drathek:
   - refactor: Refactored camera code to be less blocking, use typechecks less often,
       and provide somewhat more fluid descriptions to photos.
+2023-10-14:
+  BeagleGaming1:
+  - bugfix: M39 arm brace disables when dropped
+  CapCamIII:
+  - bugfix: UPP Sapper/Medic survivor use their correct paygrade instead of UE3M/UE3S
+  QuickLode:
+  - rscadd: Colony Supervisor now has a guaranteed grant.
+  - balance: nerfs PMC Synthetic's gear
+  - bugfix: PMC Synthetic has corrected access(thx forest)
+  - bugfix: Colony Supervisor can now have access to his own colony(LOL).
+  mullenpaul:
+  - rscadd: adds weapon spawners for USCM, CLF, PMC and UPP

From 62e3eec3e7d9eab9c377179bed1d848f1f482d93 Mon Sep 17 00:00:00 2001
From: Drathek <76988376+Drulikar@users.noreply.github.com>
Date: Sat, 14 Oct 2023 10:40:25 -0700
Subject: [PATCH 10/18] Fix double options button (#4658)

# About the pull request

This PR simply prevents adding another Options button on your stat panel
if there already is one. Occurs if you open multiple clients, or I guess
now enter from lobby.

# Explain why it's good for the game

We only need one options button, it just looks funny.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: Drathek
ui: Fixed a duplicate Options button
/:cl:
---
 html/statbrowser.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/statbrowser.js b/html/statbrowser.js
index 78eb7d4e5716..83709e9e92f0 100644
--- a/html/statbrowser.js
+++ b/html/statbrowser.js
@@ -1036,6 +1036,9 @@ Byond.subscribeTo("remove_mc", remove_mc);
 Byond.subscribeTo("add_verb_list", add_verb_list);
 
 function createOptionsButton() {
+	if (document.getElementById("options")) {
+		return;
+	}
 	var button = document.createElement("BUTTON");
 	button.onclick = function () {
 		openOptionsMenu();

From d269f7c30183093221bb3a28326bb88739d21bc5 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 14 Oct 2023 18:48:45 +0100
Subject: [PATCH 11/18] Automatic changelog for PR #4658 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4658.yml b/html/changelogs/AutoChangeLog-pr-4658.yml
new file mode 100644
index 000000000000..572143c1d17c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4658.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - ui: "Fixed a duplicate Options button"
\ No newline at end of file

From b4c26fb2d7bc139a6252820ea5d205a67c33cda2 Mon Sep 17 00:00:00 2001
From: Lalipar <22782815+Lalipar@users.noreply.github.com>
Date: Sun, 15 Oct 2023 04:42:07 +1100
Subject: [PATCH 12/18] Better functionality for fax panel (#4656)

# About the pull request

Better functionality for fax panel

# Explain why it's good for the game

Easier to keep track of faxes and fax replies


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

:cl:
qol: Readable time for when a fax was sent in fax panel
qol: Adds ckey/character name for faxes in fax panel
qol: Adds fax subject to fax panel
fix: Added CMB faxes to Fax Panel
/:cl:
---
 code/game/machinery/fax_machine.dm   | 12 ++++++------
 code/modules/admin/tabs/event_tab.dm |  2 +-
 code/modules/admin/topic/topic.dm    | 17 ++++++++---------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm
index ff26ce802b08..7bbc86681eb1 100644
--- a/code/game/machinery/fax_machine.dm
+++ b/code/game/machinery/fax_machine.dm
@@ -324,22 +324,22 @@ var/list/alldepartments = list()
 
 	switch(target_department)
 		if(DEPARTMENT_HC)
-			GLOB.USCMFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.USCMFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_PROVOST)
-			GLOB.ProvostFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.ProvostFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_CMB)
-			GLOB.CMBFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.CMBFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_WY)
-			GLOB.WYFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.WYFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_PRESS)
-			GLOB.PressFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.PressFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		else
-			GLOB.GeneralFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\[view message at [world.timeofday]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.GeneralFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 
 	msg_admin += SPAN_STAFF_IC("Receiving fax via secure connection ... <a href='?FaxView=\ref[faxcontents]'>view message</a>")
diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm
index a5975bb02274..6ba329109902 100644
--- a/code/modules/admin/tabs/event_tab.dm
+++ b/code/modules/admin/tabs/event_tab.dm
@@ -322,7 +322,7 @@
 	if(!admin_holder)
 		return
 
-	var/list/options = list("Weyland-Yutani", "High Command", "Provost", "Press", "Other", "Cancel")
+	var/list/options = list("Weyland-Yutani", "High Command", "Provost", "Press", "CMB", "Other", "Cancel")
 	var/answer = tgui_input_list(src, "Which kind of faxes would you like to see?", "Faxes", options)
 	switch(answer)
 		if("Weyland-Yutani")
diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm
index 31f99870fe43..191b292ab95b 100644
--- a/code/modules/admin/topic/topic.dm
+++ b/code/modules/admin/topic/topic.dm
@@ -1310,11 +1310,10 @@
 		if(send_choice != "Send")
 			return
 		GLOB.fax_contents += fax_message // save a copy
-
-		GLOB.USCMFaxes.Add("<a href='?FaxView=\ref[fax_message]'>\[view reply at [world.timeofday]\]</a>")
-
 		var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null
 
+		GLOB.USCMFaxes.Add("<a href='?FaxView=\ref[fax_message]'>\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]</a>")
+
 		var/msg_ghost = SPAN_NOTICE("<b><font color='#1F66A0'>PRESS REPLY: </font></b> ")
 		msg_ghost += "Transmitting '[customname]' via secure connection ... "
 		msg_ghost += "<a href='?FaxView=\ref[fax_message]'>view message</a>"
@@ -1393,10 +1392,10 @@
 			return
 		GLOB.fax_contents += fax_message // save a copy
 
-		GLOB.USCMFaxes.Add("<a href='?FaxView=\ref[fax_message]'>\[view reply at [world.timeofday]\]</a>")
-
 		var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null
 
+		GLOB.USCMFaxes.Add("<a href='?FaxView=\ref[fax_message]'>\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]</a>")
+
 		var/msg_ghost = SPAN_NOTICE("<b><font color='#1F66A0'>USCM FAX REPLY: </font></b> ")
 		msg_ghost += "Transmitting '[customname]' via secure connection ... "
 		msg_ghost += "<a href='?FaxView=\ref[fax_message]'>view message</a>"
@@ -1472,12 +1471,12 @@
 			return
 		GLOB.fax_contents += fax_message // save a copy
 
-		GLOB.WYFaxes.Add("<a href='?FaxView=\ref[fax_message]'>\[view reply at [world.timeofday]\]</a>") //Add replies so that mods know what the hell is goin on with the RP
-
 		var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null
 		if(!customname)
 			return
 
+		GLOB.WYFaxes.Add("<a href='?FaxView=\ref[fax_message]'>\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]</a>") //Add replies so that mods know what the hell is goin on with the RP
+
 		var/msg_ghost = SPAN_NOTICE("<b><font color='#1F66A0'>WEYLAND-YUTANI FAX REPLY: </font></b> ")
 		msg_ghost += "Transmitting '[customname]' via secure connection ... "
 		msg_ghost += "<a href='?FaxView=\ref[fax_message]'>view message</a>"
@@ -1554,12 +1553,12 @@
 			return
 		GLOB.fax_contents += fax_message // save a copy
 
-		GLOB.CMBFaxes.Add("<a href='?FaxView=\ref[fax_message]'>\[view reply at [world.timeofday]\]</a>") //Add replies so that mods know what the hell is goin on with the RP
-
 		var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null
 		if(!customname)
 			return
 
+		GLOB.CMBFaxes.Add("<a href='?FaxView=\ref[fax_message]'>\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]</a>") //Add replies so that mods know what the hell is goin on with the RP
+
 		var/msg_ghost = SPAN_NOTICE("<b><font color='#1b748c'>COLONIAL MARSHAL BUREAU FAX REPLY: </font></b> ")
 		msg_ghost += "Transmitting '[customname]' via secure connection ... "
 		msg_ghost += "<a href='?FaxView=\ref[fax_message]'>view message</a>"

From cb8caaecf81488f329b2b5c805fc01c4ede0503f Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 14 Oct 2023 19:03:18 +0100
Subject: [PATCH 13/18] Automatic changelog for PR #4656 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4656.yml b/html/changelogs/AutoChangeLog-pr-4656.yml
new file mode 100644
index 000000000000..cae7537b5585
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4656.yml
@@ -0,0 +1,7 @@
+author: "Lalipar"
+delete-after: True
+changes:
+  - qol: "Readable time for when a fax was sent in fax panel"
+  - qol: "Adds ckey/character name for faxes in fax panel"
+  - qol: "Adds fax subject to fax panel"
+  - bugfix: "Added CMB faxes to Fax Panel"
\ No newline at end of file

From e358e62c8df0c52bed23f59b5348122b9e0f0fd6 Mon Sep 17 00:00:00 2001
From: fira <loyauflorian@gmail.com>
Date: Sat, 14 Oct 2023 18:43:51 +0100
Subject: [PATCH 14/18] Fixes nuke explosion runtiming if a living mob was in a
 nullspaced container (#4659)

# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

As per title.

I have no idea what causes this condition to begin with, live inspection
didn't yield any results.

# Explain why it's good for the game
This might sound like an improbable case, and it is, but it actually
happened last week. This caused the nuke explosion to stop and left
everyone confused for the next 45 minutes the round lasted to end
normally.

# Testing Photographs and Procedure
Untested.


# Changelog
:cl:
fix: Fix nuke explosion getting canceled in some very rare cases.
/:cl:
---
 code/game/gamemodes/cm_self_destruct.dm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/game/gamemodes/cm_self_destruct.dm b/code/game/gamemodes/cm_self_destruct.dm
index b86de24eed74..07c9c43a4768 100644
--- a/code/game/gamemodes/cm_self_destruct.dm
+++ b/code/game/gamemodes/cm_self_destruct.dm
@@ -259,12 +259,12 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi
 		var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s).
 		var/list/dead_mobs = list() //Everyone who only needs to see the cinematic.
 		for(var/mob/current_mob as anything in GLOB.mob_list) //This only does something cool for the people about to die, but should prove pretty interesting.
-			if(!current_mob || !current_mob.loc)
+			var/turf/current_turf = get_turf(current_mob)
+			if(!current_mob || !current_mob.loc || !current_turf)
 				continue //In case something changes when we sleep().
 			if(current_mob.stat == DEAD)
 				dead_mobs |= current_mob
 				continue
-			var/turf/current_turf = get_turf(current_mob)
 			if(current_turf.z in z_levels)
 				alive_mobs |= current_mob
 				shake_camera(current_mob, 110, 4)
@@ -286,6 +286,8 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi
 		for(var/mob/current_mob in alive_mobs)
 			if(current_mob && current_mob.loc) //Who knows, maybe they escaped, or don't exist anymore.
 				var/turf/current_mob_turf = get_turf(current_mob)
+				if(!current_mob_turf)
+					continue
 				if(current_mob_turf.z in z_levels)
 					if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge))
 						continue

From c083797921cd5cc74f3eb5fdec6b1253f0516466 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 14 Oct 2023 19:18:25 +0100
Subject: [PATCH 15/18] Automatic changelog for PR #4659 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4659.yml b/html/changelogs/AutoChangeLog-pr-4659.yml
new file mode 100644
index 000000000000..87750986cc0a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4659.yml
@@ -0,0 +1,4 @@
+author: "fira"
+delete-after: True
+changes:
+  - bugfix: "Fix nuke explosion getting canceled in some very rare cases."
\ No newline at end of file

From d2e43812453e534b800bc044e15e086173b9cd27 Mon Sep 17 00:00:00 2001
From: fira <loyauflorian@gmail.com>
Date: Sat, 14 Oct 2023 18:45:24 +0100
Subject: [PATCH 16/18] Fixes Xeno Name preference requring a reconnect to
 apply (#4660)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

See #4436 for an indepth description of the issue - basically Xeno name
is cached on client and updating preferences won't update it without a
reconnect (and the lobby screen even baits you thinking it does by
displaying pref not client's)

# Explain 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, and may discourage maintainers from reviewing or merging
your PR. This section is not strictly required for (non-controversial)
fix PRs or backend PRs. -->

Less confusion

Fixes #4436

# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->
Basic testing performed in the form of:
   Changing Xeno Name
   Launching game, observing
   Spawning a Xeno and possessing it
And observing which xeno name is present.


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
fix: Xeno Name preference does not require a reconnection to apply
anymore. It still won't change your current Xenomorph's name however.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
---
 code/modules/client/client_procs.dm       | 18 +++++++++++-------
 code/modules/client/preferences.dm        |  4 ++++
 code/modules/mob/new_player/new_player.dm |  4 ++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 3cfb08b8dac0..82540d6cbf5e 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -330,13 +330,8 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
 	prefs.last_ip = address //these are gonna be used for banning
 	prefs.last_id = computer_id //these are gonna be used for banning
 	fps = prefs.fps
-	xeno_prefix = prefs.xeno_prefix
-	xeno_postfix = prefs.xeno_postfix
-	xeno_name_ban = prefs.xeno_name_ban
-	if(!xeno_prefix || xeno_name_ban)
-		xeno_prefix = "XX"
-	if(!xeno_postfix || xeno_name_ban)
-		xeno_postfix = ""
+
+	load_xeno_name()
 
 	human_name_ban = prefs.human_name_ban
 
@@ -790,3 +785,12 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
 	if(admin_holder)
 		admin_holder.particle_test = new /datum/particle_editor(in_atom)
 		admin_holder.particle_test.tgui_interact(mob)
+
+/client/proc/load_xeno_name()
+	xeno_prefix = prefs.xeno_prefix
+	xeno_postfix = prefs.xeno_postfix
+	xeno_name_ban = prefs.xeno_name_ban
+	if(!xeno_prefix || xeno_name_ban)
+		xeno_prefix = "XX"
+	if(!xeno_postfix || xeno_name_ban)
+		xeno_postfix = ""
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 554ba28e417f..8ca177ddf66c 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1409,6 +1409,7 @@ var/const/MAX_SAVE_SLOTS = 10
 
 					if(length(new_xeno_prefix)==0)
 						xeno_prefix = "XX"
+						owner.load_xeno_name()
 					else
 						var/all_ok = TRUE
 						for(var/i=1, i<=length(new_xeno_prefix), i++)
@@ -1420,6 +1421,7 @@ var/const/MAX_SAVE_SLOTS = 10
 									all_ok = FALSE //everything else - won't
 						if(all_ok)
 							xeno_prefix = new_xeno_prefix
+							owner.load_xeno_name()
 						else
 							to_chat(user, "<font color='red'>Invalid Xeno Prefix. Your Prefix can contain either single letter or two letters.</font>")
 
@@ -1444,6 +1446,7 @@ var/const/MAX_SAVE_SLOTS = 10
 						return
 					else if(length(new_xeno_postfix)==0)
 						xeno_postfix = ""
+						owner.load_xeno_name()
 					else
 						var/all_ok = TRUE
 						var/first_char = TRUE
@@ -1469,6 +1472,7 @@ var/const/MAX_SAVE_SLOTS = 10
 							first_char = FALSE
 						if(all_ok)
 							xeno_postfix = new_xeno_postfix
+							owner.load_xeno_name()
 						else
 							to_chat(user, "<font color='red'>Invalid Xeno Postfix. Your Postfix can contain single letter and an optional digit after it.</font>")
 
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 5da499dabc52..dda2487c24d9 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -34,8 +34,8 @@
 		return
 
 	var/tempnumber = rand(1, 999)
-	var/postfix_text = (client.prefs && client.prefs.xeno_postfix) ? ("-"+client.prefs.xeno_postfix) : ""
-	var/prefix_text = (client.prefs && client.prefs.xeno_prefix) ? client.prefs.xeno_prefix : "XX"
+	var/postfix_text = (client.xeno_postfix) ? ("-"+client.xeno_postfix) : ""
+	var/prefix_text = (client.xeno_prefix) ? client.xeno_prefix : "XX"
 	var/xeno_text = "[prefix_text]-[tempnumber][postfix_text]"
 	var/round_start = !SSticker || !SSticker.mode || SSticker.current_state <= GAME_STATE_PREGAME
 

From 4c382f8024644dfff51ca98baa818678b65275e0 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 14 Oct 2023 19:32:08 +0100
Subject: [PATCH 17/18] Automatic changelog for PR #4660 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4660.yml b/html/changelogs/AutoChangeLog-pr-4660.yml
new file mode 100644
index 000000000000..71377e2d73f6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4660.yml
@@ -0,0 +1,4 @@
+author: "fira"
+delete-after: True
+changes:
+  - bugfix: "Xeno Name preference does not require a reconnection to apply anymore. It still won't change your current Xenomorph's name however."
\ No newline at end of file

From d06f53777af06143d6caefde98e41cb98f0e42df Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Sat, 14 Oct 2023 10:46:08 -0700
Subject: [PATCH 18/18] Adjusts CODEOWNERS (#4634)

# About the pull request
Removes Morrow from codeowners, moves the survivor file codeowner to me

# Explain why it's good for the game
Morrow has retired.
---
 .github/CODEOWNERS | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7a79b28b09aa..4dfa55a79231 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -24,9 +24,8 @@
 /tools/docker/ @Fira
 /Dockerfile @Fira
 
-# MorrowWolf
+# Zonespace
 
-/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @morrowwolf
-/code/modules/gear_presets/survivors.dm @morrowwolf
+/code/modules/gear_presets/survivors.dm @zonespace27
 
 # MULTIPLE OWNERS