From f51377c2841a0e940c74c6e17364672061a1dd3c Mon Sep 17 00:00:00 2001
From: zzzmike <85382350+zzzmike@users.noreply.github.com>
Date: Sat, 10 Aug 2024 21:46:34 -0700
Subject: [PATCH 01/15] IB fixed fun fact (#6863)

# About the pull request

Adds a fun fact for number of times internal bleeding was fixed, similar
to the revives fact.

# Explain why it's good for the game

I'm not a huge fan of fun facts in general as it sometimes incentivizes
bad behavior (such as focusing on revives exclusively and neglecting
other duties just because it has a fun fact), but between removing the
revives fact or just adding a second medical fact, I went this
direction.


# 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: fun fact for internal bleeding fixed
/:cl:
---
 code/datums/statistics/entities/death_stats.dm | 3 +++
 code/datums/statistics/random_facts/ib_fact.dm | 9 +++++++++
 code/modules/mob/mob_defines.dm                | 1 +
 code/modules/surgery/internal_bleeding.dm      | 1 +
 colonialmarines.dme                            | 1 +
 5 files changed, 15 insertions(+)
 create mode 100644 code/datums/statistics/random_facts/ib_fact.dm

diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm
index 18751ba604a1..de2d9cc71526 100644
--- a/code/datums/statistics/entities/death_stats.dm
+++ b/code/datums/statistics/entities/death_stats.dm
@@ -20,6 +20,7 @@
 	var/total_time_alive
 	var/total_damage_taken
 	var/total_revives_done = 0
+	var/total_ib_fixed = 0
 
 	var/total_brute = 0
 	var/total_burn = 0
@@ -53,6 +54,7 @@
 		"total_time_alive" = DB_FIELDTYPE_BIGINT,
 		"total_damage_taken" = DB_FIELDTYPE_INT,
 		"total_revives_done" = DB_FIELDTYPE_INT,
+		"total_ib_fixed" = DB_FIELDTYPE_INT,
 
 		"total_brute" = DB_FIELDTYPE_INT,
 		"total_burn" = DB_FIELDTYPE_INT,
@@ -132,6 +134,7 @@
 	new_death.total_time_alive = life_time_total
 	new_death.total_damage_taken = life_damage_taken_total
 	new_death.total_revives_done = life_revives_total
+	new_death.total_ib_fixed = life_ib_total
 
 	if(GLOB.round_statistics)
 		GLOB.round_statistics.track_death(new_death)
diff --git a/code/datums/statistics/random_facts/ib_fact.dm b/code/datums/statistics/random_facts/ib_fact.dm
new file mode 100644
index 000000000000..dca8c303b744
--- /dev/null
+++ b/code/datums/statistics/random_facts/ib_fact.dm
@@ -0,0 +1,9 @@
+/datum/random_fact/ib
+	statistic_name = "people"
+	statistic_verb = "fixed internal bleeding for"
+
+/datum/random_fact/ib/life_grab_stat(mob/fact_mob)
+	return fact_mob.life_ib_total
+
+/datum/random_fact/ib/death_grab_stat(datum/entity/statistic/death/fact_death)
+	return fact_death.total_ib_fixed
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index f1de550df4aa..297ff47c731c 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -113,6 +113,7 @@
 	var/life_kills_total = 0
 	var/life_damage_taken_total = 0
 	var/life_revives_total = 0
+	var/life_ib_total = 0
 	var/festivizer_hits_total = 0
 
 	var/life_value = 1 // when killed, the killee gets this much added to its life_kills_total
diff --git a/code/modules/surgery/internal_bleeding.dm b/code/modules/surgery/internal_bleeding.dm
index e4afcad5ec99..c67d670ea521 100644
--- a/code/modules/surgery/internal_bleeding.dm
+++ b/code/modules/surgery/internal_bleeding.dm
@@ -39,6 +39,7 @@
 
 /datum/surgery_step/fix_vein/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery)
 	user.count_niche_stat(STATISTICS_NICHE_SURGERY_IB)
+	user.life_ib_total++
 
 	user.affected_message(target,
 		SPAN_NOTICE("You finish repairing [target]'s damaged vein."),
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 8374bb19415a..dab9a056a585 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -660,6 +660,7 @@
 #include "code\datums\statistics\entities\xeno_stats.dm"
 #include "code\datums\statistics\random_facts\christmas_fact.dm"
 #include "code\datums\statistics\random_facts\damage_fact.dm"
+#include "code\datums\statistics\random_facts\ib_fact.dm"
 #include "code\datums\statistics\random_facts\kills_fact.dm"
 #include "code\datums\statistics\random_facts\random_fact.dm"
 #include "code\datums\statistics\random_facts\revives_fact.dm"

From e7c7970fc8558599124f1c1eddf2e7b6edb311c9 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 11 Aug 2024 05:55:27 +0100
Subject: [PATCH 02/15] Automatic changelog for PR #6863 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-6863.yml b/html/changelogs/AutoChangeLog-pr-6863.yml
new file mode 100644
index 000000000000..a3e3fcc64c78
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6863.yml
@@ -0,0 +1,4 @@
+author: "zzzmike"
+delete-after: True
+changes:
+  - rscadd: "fun fact for internal bleeding fixed"
\ No newline at end of file

From ba3ec7b223a48c3f8056de07b2243165575a3687 Mon Sep 17 00:00:00 2001
From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com>
Date: Sun, 11 Aug 2024 07:48:08 +0300
Subject: [PATCH 03/15] Fixes being able to put items back in the specialist
 case (#6897)

# About the pull request
Closes #6896
<!-- 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
Fixes a bug
# 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: You can no longer put items back in the specialist case after
taking them out
/:cl:
---
 code/modules/cm_marines/equipment/kit_boxes.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm
index c1621baa9b5d..83b20636fc5e 100644
--- a/code/modules/cm_marines/equipment/kit_boxes.dm
+++ b/code/modules/cm_marines/equipment/kit_boxes.dm
@@ -9,6 +9,7 @@
 	storage_slots = 14
 	slowdown = 1
 	can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in.
+	max_w_class = 0
 	foldable = null
 
 /obj/item/storage/box/spec/update_icon()

From e45ff80ffd8f7b1a1a95ace629602d7db744adac Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sun, 11 Aug 2024 06:04:35 +0100
Subject: [PATCH 04/15] Automatic changelog for PR #6897 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-6897.yml b/html/changelogs/AutoChangeLog-pr-6897.yml
new file mode 100644
index 000000000000..307c3942e70d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6897.yml
@@ -0,0 +1,4 @@
+author: "Git-Nivrak"
+delete-after: True
+changes:
+  - bugfix: "You can no longer put items back in the specialist case after taking them out"
\ No newline at end of file

From 4c4c535b7f58ba80f3c8e727ccb77613ff82b677 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Mon, 12 Aug 2024 01:22:08 +0000
Subject: [PATCH 05/15] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-6863.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-6897.yml | 4 ----
 html/changelogs/archive/2024-08.yml       | 6 ++++++
 3 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6863.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-6897.yml

diff --git a/html/changelogs/AutoChangeLog-pr-6863.yml b/html/changelogs/AutoChangeLog-pr-6863.yml
deleted file mode 100644
index a3e3fcc64c78..000000000000
--- a/html/changelogs/AutoChangeLog-pr-6863.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zzzmike"
-delete-after: True
-changes:
-  - rscadd: "fun fact for internal bleeding fixed"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-6897.yml b/html/changelogs/AutoChangeLog-pr-6897.yml
deleted file mode 100644
index 307c3942e70d..000000000000
--- a/html/changelogs/AutoChangeLog-pr-6897.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Git-Nivrak"
-delete-after: True
-changes:
-  - bugfix: "You can no longer put items back in the specialist case after taking them out"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml
index dd7e9fc7ba82..1209b8165f1f 100644
--- a/html/changelogs/archive/2024-08.yml
+++ b/html/changelogs/archive/2024-08.yml
@@ -192,3 +192,9 @@
       the box.
   cuberound:
   - rscdel: removes gravity generator (ugly legacy stuff)
+2024-08-12:
+  Git-Nivrak:
+  - bugfix: You can no longer put items back in the specialist case after taking them
+      out
+  zzzmike:
+  - rscadd: fun fact for internal bleeding fixed

From 399218e982ef26f43c17e07427117b98e87dfe9e Mon Sep 17 00:00:00 2001
From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com>
Date: Mon, 12 Aug 2024 05:25:17 +0300
Subject: [PATCH 06/15] Makes explosions always deal full damage on the source
 tile (#6888)

# About the pull request
If you jump on the grenade you are going down
(Makes it so you no longer get 50% damage reduction if you are lying
down at the source tile of the explosion)
<!-- 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
Fixes some things that were broken (for example sadar rockets or cluster
OB gibbing humans on direct hit) and in general it doesn't make a lot of
sense to get half the damage by hugging the explosion
# 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:
balance: Explosions now always deal full damage at the source tile
fix: Fixed sadar rockets not gibbing humans on direct hit
/:cl:
---
 code/datums/ammo/rocket.dm                               | 4 ++--
 code/modules/mob/living/carbon/carbon.dm                 | 2 +-
 code/modules/mob/living/carbon/human/human.dm            | 2 +-
 code/modules/mob/living/carbon/xenomorph/damage_procs.dm | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm
index 83a94b2d8c5f..d1050ed32062 100644
--- a/code/datums/ammo/rocket.dm
+++ b/code/datums/ammo/rocket.dm
@@ -32,7 +32,7 @@
 	cell_explosion(get_turf(mob), 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, projectile.weapon_cause_data)
 	smoke.set_up(1, get_turf(mob))
 	if(ishuman_strict(mob)) // No yautya or synths. Makes humans gib on direct hit.
-		mob.ex_act(350, projectile.dir, projectile.weapon_cause_data, 100)
+		mob.ex_act(350, null, projectile.weapon_cause_data, 100)
 	smoke.start()
 
 /datum/ammo/rocket/on_hit_obj(obj/object, obj/projectile/projectile)
@@ -69,7 +69,7 @@
 	mob.apply_effect(3, WEAKEN)
 	mob.apply_effect(3, PARALYZE)
 	if(ishuman_strict(mob)) // No yautya or synths. Makes humans gib on direct hit.
-		mob.ex_act(300, projectile.dir, projectile.weapon_cause_data, 100)
+		mob.ex_act(300, null, projectile.weapon_cause_data, 100)
 	cell_explosion(turf, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, projectile.weapon_cause_data)
 	smoke.set_up(1, turf)
 	smoke.start()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 629d9b0427f3..3adb5c53f299 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -74,7 +74,7 @@
 
 /mob/living/carbon/ex_act(severity, direction, datum/cause_data/cause_data)
 
-	if(body_position == LYING_DOWN)
+	if(body_position == LYING_DOWN && direction)
 		severity *= EXPLOSION_PRONE_MULTIPLIER
 
 	if(severity >= 30)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7ab435fb599e..0d5d180b3408 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -133,7 +133,7 @@
 			. += "Self Destruct Status: [SShijack.get_sd_eta()]"
 
 /mob/living/carbon/human/ex_act(severity, direction, datum/cause_data/cause_data)
-	if(body_position == LYING_DOWN)
+	if(body_position == LYING_DOWN && direction)
 		severity *= EXPLOSION_PRONE_MULTIPLIER
 
 
diff --git a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm
index 4c97ce20b4eb..9d4de90072aa 100644
--- a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm
@@ -46,7 +46,7 @@
 
 /mob/living/carbon/xenomorph/ex_act(severity, direction, datum/cause_data/cause_data, pierce=0)
 
-	if(body_position == LYING_DOWN)
+	if(body_position == LYING_DOWN && direction)
 		severity *= EXPLOSION_PRONE_MULTIPLIER
 
 	if(severity >= 30)

From a0f8312348df756e9634605de782fc9058620871 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Mon, 12 Aug 2024 03:34:38 +0100
Subject: [PATCH 07/15] Automatic changelog for PR #6888 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-6888.yml b/html/changelogs/AutoChangeLog-pr-6888.yml
new file mode 100644
index 000000000000..002755079dc0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6888.yml
@@ -0,0 +1,5 @@
+author: "Git-Nivrak"
+delete-after: True
+changes:
+  - balance: "Explosions now always deal full damage at the source tile"
+  - bugfix: "Fixed sadar rockets not gibbing humans on direct hit"
\ No newline at end of file

From 67ef991a57515e42933b50fa4cd0c70892220745 Mon Sep 17 00:00:00 2001
From: MPhonks <134622054+MPhonks@users.noreply.github.com>
Date: Mon, 12 Aug 2024 04:28:23 +0200
Subject: [PATCH 08/15] Reduces the Cost of the AGM-184 'Harpoon II' from 300
 to 200 (#6876)

# About the pull request

The AGM-184 'Harpoon II' is an underwhelming choice for Gunship Pilots
doing CAS. Running the numbers, it is worse than both the Widowmaker
**and the Banshee** (this one's an incendiary rocket, how is the harpoon
worse than it?), despite costing the same. Below are the comparisons.

Widowmaker | Banshee | **Harpoon**
300 | 175 | **150**
260 | 155 | **134**
220 | 135 | **118**
180 | 115 | **102**
140 | 95 | **86**
100 | 75 | **70**
60 | 55 | **54**
20 | 35 | **38**
0 | 15 | **22**
0 | 0 | **6**

Most notable are the fact that the harpoon deals less damage at every
single tile than the Widowmaker (except for the negligible last three
tiles), and is comparable to the Banshee in strength despite having no
incendiary effect attached to it - and yet, costing the same.

With the change to the cost going from 300 to 200, you can get 6
Harpoons instead of 4 Widowmakers.

# Explain why it's good for the game

Gives the AGM-184 'Harpoon II' the love it deserves, renouncing its
status as a noob trap and troll pick, and provides reason as to why it's
an option to print in the first place.


# Testing Photographs and Procedure

N/A

# Changelog
:cl: MarpleJones
balance: Reduces the cost of the AGM-184 'Harpoon II' from 300 to 200.
/:cl:

---------

Co-authored-by: MarplePhonks <marplejones@gmail.com>
---
 code/modules/cm_marines/dropship_ammo.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index d439ecdadf22..aefc2366caf9 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -318,14 +318,13 @@
 
 /obj/structure/ship_ammo/rocket/harpoon
 	name = "\improper AGM-184 'Harpoon II'"
-	desc = "The AGM-184 Harpoon II is an Anti-Ship Missile, designed and used to effectively take down enemy ships with a huge blast wave with low explosive power. This one is modified to use ground signals. Can be loaded into the LAU-444 Guided Missile Launcher."
+	desc = "The AGM-184 Harpoon II is an Anti-Ship Missile, designed and used to effectively take down enemy ships with a huge blast wave with low explosive power. This one is modified to use ground signals and can be seen as a cheaper alternative to conventional ordnance. Can be loaded into the LAU-444 Guided Missile Launcher."
 	icon_state = "harpoon"
 	ammo_id = "s"
 	travelling_time = 50
-	point_cost = 300
+	point_cost = 200
 	fire_mission_delay = 4
 
-//Looks kinda OP but all it can actually do is just to blow windows and some of other things out, cant do much damage.
 /obj/structure/ship_ammo/rocket/harpoon/detonate_on(turf/impact, obj/structure/dropship_equipment/weapon/fired_from)
 	impact.ceiling_debris_check(3)
 	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cell_explosion), impact, 150, 16, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data(initial(name)), source_mob), 0.5 SECONDS)

From 4619e414dffade7a7a9db26352580a5492dfc3a2 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Mon, 12 Aug 2024 03:42:28 +0100
Subject: [PATCH 09/15] Automatic changelog for PR #6876 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-6876.yml b/html/changelogs/AutoChangeLog-pr-6876.yml
new file mode 100644
index 000000000000..16ca3bf4b61c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6876.yml
@@ -0,0 +1,4 @@
+author: "MarpleJones"
+delete-after: True
+changes:
+  - balance: "Reduces the cost of the AGM-184 'Harpoon II' from 300 to 200."
\ No newline at end of file

From 2e0dee2078fd157e68e2e546ea929c07fee43b7f Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:29:34 -0400
Subject: [PATCH 10/15] ERT  no longer show up in the orbit escape section
 (#6910)

# 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.
-->
ERT factions no longer show up in the escape section.

This issue was caused by #5058

# Explain why it's good for the game
Makes it clearer who has actually escaped and not ERT returning to their
base.

# 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: ERT no longer show up in the orbit escape section
/:cl:
---
 code/__DEFINES/mode.dm                  | 3 ++-
 code/modules/mob/dead/observer/orbit.dm | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
index 4c3a658ff421..368553468af0 100644
--- a/code/__DEFINES/mode.dm
+++ b/code/__DEFINES/mode.dm
@@ -280,7 +280,8 @@ DEFINE_BITFIELD(whitelist_status, list(
 
 #define FACTION_LIST_MARINE list(FACTION_MARINE)
 #define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE)
-#define FACTION_LIST_ERT list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
+#define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
+#define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_UPP list(FACTION_UPP)
 #define FACTION_LIST_CLF list(FACTION_CLF)
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 4bc4abf7036c..8c8d653331c9 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -144,7 +144,7 @@
 				else
 					serialized["background_color"] = human.assigned_equipment_preset?.minimap_background
 
-				if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(M.z) && !(human.faction in FACTION_LIST_ERT))
+				if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(M.z) && !(human.faction in FACTION_LIST_ERT_ALL))
 					escaped += list(serialized)
 				else if(human.faction in FACTION_LIST_WY)
 					wy += list(serialized)
@@ -152,7 +152,7 @@
 					synthetics += list(serialized)
 				else if(isyautja(human))
 					predators += list(serialized)
-				else if(human.faction in FACTION_LIST_ERT)
+				else if(human.faction in FACTION_LIST_ERT_OTHER)
 					ert_members += list(serialized)
 				else if(human.faction in FACTION_LIST_UPP)
 					upp += list(serialized)

From 4e61b35de8df17f59c0484722bb0712999803f60 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Mon, 12 Aug 2024 03:50:07 +0100
Subject: [PATCH 11/15] Automatic changelog for PR #6910 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-6910.yml b/html/changelogs/AutoChangeLog-pr-6910.yml
new file mode 100644
index 000000000000..fc24d3612b92
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6910.yml
@@ -0,0 +1,4 @@
+author: "Contrabang"
+delete-after: True
+changes:
+  - bugfix: "ERT no longer show up in the orbit escape section"
\ No newline at end of file

From 73361ccde497d8577249cd01920d3222026a2b3d Mon Sep 17 00:00:00 2001
From: Doubleumc <Doubleumc@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:29:54 -0400
Subject: [PATCH 12/15] "Start Round" can start delayed round (#6908)

# About the pull request

Clicking "Start Round" during a delayed round start will start the round
in one click.

<!-- 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

Currently "Start Round" will -- among other things -- set the round
timer to 0 but won't undelay the start, so a second use of "Start Round"
is needed to actually start a delayed round. With this change "Start
Round" will start the round regardless of delayed status.
# 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:
admin: "Start Round" can start a delayed round
/:cl:
---
 code/controllers/subsystem/ticker.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 1a6f98ee4cca..c3648df6ba29 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -124,6 +124,7 @@ SUBSYSTEM_DEF(ticker)
 /datum/controller/subsystem/ticker/proc/request_start()
 	if(current_state == GAME_STATE_PREGAME)
 		time_left = 0
+		delay_start = FALSE
 
 	// Killswitch if hanging or interrupted
 	if(SSnightmare.stat != NIGHTMARE_STATUS_DONE)

From d1d60fc023bf27eb68b3863b8f8a1c0f63b07bb4 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Mon, 12 Aug 2024 03:59:58 +0100
Subject: [PATCH 13/15] Automatic changelog for PR #6908 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-6908.yml b/html/changelogs/AutoChangeLog-pr-6908.yml
new file mode 100644
index 000000000000..8718ee21c162
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6908.yml
@@ -0,0 +1,4 @@
+author: "Doubleumc"
+delete-after: True
+changes:
+  - admin: "\"Start Round\" can start a delayed round"
\ No newline at end of file

From 176f7df4a8d35e70dbdf735b62c1dea76bddcf1b Mon Sep 17 00:00:00 2001
From: majchroo <67845893+majchroo@users.noreply.github.com>
Date: Mon, 12 Aug 2024 04:31:03 +0200
Subject: [PATCH 14/15] FIX Kutjevo Botany APC that can't be fixed (#6909)

# About the pull request

**TL;DR APC can't be fixed, moved to a place where it can be fixed.**

Kutjevo Botany APC is placed on a "dirt" tile (auto_turf to be precise)
and so it means that engineers can't use crowbar on that tile and rewire
the terminal underneath.

# Explain why it's good for the game

Engineers will be able to fix power in botany on Kutjevo.

# Testing Photographs and Procedure
Moved the APC using StrongDMM. Booted up the server and made sure I can
fix it as a spawned engineer.

<details>
<summary>Screenshots & Videos</summary>

Before:

![image](https://github.com/user-attachments/assets/12b384d8-2a02-4065-9470-c36bc1356857)

After:

![image](https://github.com/user-attachments/assets/1f00e1c9-cbd2-4127-be35-583ba5bb99b9)

Proof of testing:

![image](https://github.com/user-attachments/assets/bc48dfd6-6381-4f59-a407-398bf40d4db6)

</details>

# 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:Adamix147
maptweak: Moved the unfixable APC at Kutjevo Botany to make it fixable
again.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
---
 maps/map_files/Kutjevo/Kutjevo.dmm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index c0ad66e5aecb..6fefb6d19595 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -11208,9 +11208,8 @@
 /turf/open/gm/river/desert/deep/toxic,
 /area/kutjevo/interior/oob)
 "qwT" = (
-/obj/item/tool/wirecutters/clippers,
 /obj/structure/machinery/power/apc/no_power/north,
-/turf/open/auto_turf/sand/layer0,
+/turf/open/floor/kutjevo/multi_tiles,
 /area/kutjevo/interior/complex/botany)
 "qxc" = (
 /obj/structure/barricade/metal/wired{
@@ -33382,7 +33381,7 @@ lHs
 kDS
 xQM
 mbS
-nCM
+qwT
 bds
 qGA
 mbS
@@ -33884,7 +33883,7 @@ kDS
 alh
 mbS
 mbS
-qwT
+qGA
 xfW
 nCM
 mbS

From 0a1cfe36043f026df0c04583b0094dcd15fe64e3 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Mon, 12 Aug 2024 04:07:48 +0100
Subject: [PATCH 15/15] Automatic changelog for PR #6909 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-6909.yml b/html/changelogs/AutoChangeLog-pr-6909.yml
new file mode 100644
index 000000000000..9a91dee8fd9d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6909.yml
@@ -0,0 +1,4 @@
+author: "Adamix147"
+delete-after: True
+changes:
+  - maptweak: "Moved the unfixable APC at Kutjevo Botany to make it fixable again."
\ No newline at end of file