From c3e8e59bb10fb2178b9484ecc1b5956fea2e2659 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Thu, 29 Jun 2023 01:43:15 +0000
Subject: [PATCH 01/24] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3298.yml | 15 --------
 html/changelogs/AutoChangeLog-pr-3666.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3717.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3718.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3723.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3730.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3731.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3736.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3742.yml |  6 ---
 html/changelogs/AutoChangeLog-pr-3743.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3746.yml |  4 --
 html/changelogs/AutoChangeLog-pr-3748.yml |  5 ---
 html/changelogs/archive/2023-06.yml       | 47 +++++++++++++++++++++++
 13 files changed, 47 insertions(+), 62 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3298.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3666.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3717.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3718.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3723.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3730.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3731.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3736.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3742.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3743.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3746.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3748.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3298.yml b/html/changelogs/AutoChangeLog-pr-3298.yml
deleted file mode 100644
index 0a75d2215043..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3298.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - rscadd: "Added an admin button for an ARES bioscan. Slightly refactored how Bioscans trigger for marines, relying on an ARES processor."
-  - rscadd: "Added individual proccessors for ARES systems. These are WIP and will eventually have damage and repair interactions."
-  - rscadd: "Added an ARES interaction console in the AI Core room, which holds logs for most ARES functions."
-  - rscadd: "Added the ability for ARES console to call ERT or Distress."
-  - rscadd: "Added motion triggers in ARES core and shipside comms that send alerts over Apollo."
-  - rscadd: "Added a 1to1 conversation feature between ARES and users of the interface console."
-  - rscadd: "Added preset open versions of blended poddoors."
-  - rscadd: "Added a console for directing Working Joes. This is largely WIP for future PR(s)."
-  - rscadd: "Added subtypes of air pipes that don't explode on hijack, used these in ARES core."
-  - maptweak: "Remodelled ARES Core onto a fake-z, and added the new processors."
-  - bugfix: "door_control buttons now respect being indestructable when processing explosions."
-  - maptweak: "Fixed the M39s overflowing in brig armory due to use of landmarks."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3666.yml b/html/changelogs/AutoChangeLog-pr-3666.yml
deleted file mode 100644
index d7d8860c237e..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3666.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Morrow"
-delete-after: True
-changes:
-  - balance: "Xenos no longer can pull dead xenos"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3717.yml b/html/changelogs/AutoChangeLog-pr-3717.yml
deleted file mode 100644
index 6d6327ea63a7..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3717.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Drathek"
-delete-after: True
-changes:
-  - bugfix: "Fixed the crashsite offset for a hijack shuttle that gets deterred by the MGAD System"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3718.yml b/html/changelogs/AutoChangeLog-pr-3718.yml
deleted file mode 100644
index 41f5322a2493..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3718.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TheGamerdk"
-delete-after: True
-changes:
-  - balance: "Queen boosted building no longer has 2 second cooldown when far from hive"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3723.yml b/html/changelogs/AutoChangeLog-pr-3723.yml
deleted file mode 100644
index 987b7eeec708..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3723.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TheGamerdk"
-delete-after: True
-changes:
-  - bugfix: "Communications intel objective now actually works"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3730.yml b/html/changelogs/AutoChangeLog-pr-3730.yml
deleted file mode 100644
index 9ae18e6bc788..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3730.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "fira"
-delete-after: True
-changes:
-  - bugfix: "Fixed a MC crash related to NPC huggers rebounding logic."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3731.yml b/html/changelogs/AutoChangeLog-pr-3731.yml
deleted file mode 100644
index 21fd76664d2b..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3731.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "blackdragonTOW"
-delete-after: True
-changes:
-  - maptweak: "Added a small light to unlit rooms."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3736.yml b/html/changelogs/AutoChangeLog-pr-3736.yml
deleted file mode 100644
index c1eba0beabfd..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3736.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Morrow"
-delete-after: True
-changes:
-  - rscdel: "Removed toxin mags on shivas"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3742.yml b/html/changelogs/AutoChangeLog-pr-3742.yml
deleted file mode 100644
index 7319ac52f8d9..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3742.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "SpartanBobby"
-delete-after: True
-changes:
-  - maptweak: "Minor decal changes to LV522"
-  - maptweak: "Buffed sec armory on LV522"
-  - maptweak: "LV522 Breaching charge moved to the PROP APC made UNACIDABLE"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3743.yml b/html/changelogs/AutoChangeLog-pr-3743.yml
deleted file mode 100644
index 084e74fc2c2e..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3743.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Katskan"
-delete-after: True
-changes:
-  - balance: "Removed G8A storage from various snow suits and parkas"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3746.yml b/html/changelogs/AutoChangeLog-pr-3746.yml
deleted file mode 100644
index 48b25b9efb1a..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3746.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "IowaPotatoFarmer"
-delete-after: True
-changes:
-  - rscadd: "Solaris Ridge now has a Corporate Liaison survivor."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3748.yml b/html/changelogs/AutoChangeLog-pr-3748.yml
deleted file mode 100644
index 74c02e602003..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3748.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Diegoflores31"
-delete-after: True
-changes:
-  - balance: "reduced Larva Burst time from 10 minutes to 7.5 minutes"
-  - refactor: "changed 1 letter vars."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-06.yml b/html/changelogs/archive/2023-06.yml
index 71aeb035f4b8..b1040b8044de 100644
--- a/html/changelogs/archive/2023-06.yml
+++ b/html/changelogs/archive/2023-06.yml
@@ -383,3 +383,50 @@
   - balance: explosive barricade upgrade provides strong protection against brute-based
       projectiles (50%)
   - balance: explosive barricade upgrade provides strong protection against fire (50%)
+2023-06-29:
+  Diegoflores31:
+  - balance: reduced Larva Burst time from 10 minutes to 7.5 minutes
+  - refactor: changed 1 letter vars.
+  Drathek:
+  - bugfix: Fixed the crashsite offset for a hijack shuttle that gets deterred by
+      the MGAD System
+  IowaPotatoFarmer:
+  - rscadd: Solaris Ridge now has a Corporate Liaison survivor.
+  Katskan:
+  - balance: Removed G8A storage from various snow suits and parkas
+  Morrow:
+  - balance: Xenos no longer can pull dead xenos
+  - rscdel: Removed toxin mags on shivas
+  SpartanBobby:
+  - maptweak: Minor decal changes to LV522
+  - maptweak: Buffed sec armory on LV522
+  - maptweak: LV522 Breaching charge moved to the PROP APC made UNACIDABLE
+  TheGamerdk:
+  - bugfix: Communications intel objective now actually works
+  - balance: Queen boosted building no longer has 2 second cooldown when far from
+      hive
+  blackdragonTOW:
+  - maptweak: Added a small light to unlit rooms.
+  fira:
+  - bugfix: Fixed a MC crash related to NPC huggers rebounding logic.
+  realforest2001:
+  - rscadd: Added an admin button for an ARES bioscan. Slightly refactored how Bioscans
+      trigger for marines, relying on an ARES processor.
+  - rscadd: Added individual proccessors for ARES systems. These are WIP and will
+      eventually have damage and repair interactions.
+  - rscadd: Added an ARES interaction console in the AI Core room, which holds logs
+      for most ARES functions.
+  - rscadd: Added the ability for ARES console to call ERT or Distress.
+  - rscadd: Added motion triggers in ARES core and shipside comms that send alerts
+      over Apollo.
+  - rscadd: Added a 1to1 conversation feature between ARES and users of the interface
+      console.
+  - rscadd: Added preset open versions of blended poddoors.
+  - rscadd: Added a console for directing Working Joes. This is largely WIP for future
+      PR(s).
+  - rscadd: Added subtypes of air pipes that don't explode on hijack, used these in
+      ARES core.
+  - maptweak: Remodelled ARES Core onto a fake-z, and added the new processors.
+  - bugfix: door_control buttons now respect being indestructable when processing
+      explosions.
+  - maptweak: Fixed the M39s overflowing in brig armory due to use of landmarks.

From 4b7aacdb2e4bf7023a941c8f5fef7f7a238c5ec5 Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Thu, 29 Jun 2023 04:55:04 +0200
Subject: [PATCH 02/24] Fixes being unable to re-enter your body when you're
 unnested (#3747)

# 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.
-->

Turns out the parent call of unbuckle() calls afterbuckle() which
deletes the nest and clears ghost_of_buckled_mob, which means it can't
set your ghost to can_reenter_corpse = TRUE

# Explain why it's good for the game
Bugs bad


# 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 now re-enter your body when unnested, marine mains,
rejoice!
/:cl:
---
 .../objects/structures/stool_bed_chair_nest/xeno_nest.dm     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
index e306b894b021..37d46cbe6d5d 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
@@ -289,11 +289,12 @@
 	if(buckled_human.stat == DEAD )
 		buckled_mob_density = FALSE
 
-	. = ..()
-
 	var/mob/dead/observer/G = ghost_of_buckled_mob
 	var/datum/mind/M = G?.mind
 	ghost_of_buckled_mob = null
+
+	. = ..() //Very important that this comes after, since it deletes the nest and clears ghost_of_buckled_mob
+
 	if(!istype(buckled_human) || !istype(G) || !istype(M) || buckled_human.undefibbable || buckled_human.mind || M.original != buckled_human || buckled_human.chestburst)
 		return // Zealous checking as most is handled by ghost code
 	to_chat(G, FONT_SIZE_HUGE(SPAN_DANGER("You have been freed from your nest and may go back to your body! (Look for 'Re-enter Corpse' in Ghost verbs, or <a href='?src=\ref[G];reentercorpse=1'>click here</a>!)")))

From 46a6d7658dc87d88e1fec0bfd73dc3f856e312ec Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 29 Jun 2023 04:04:49 +0100
Subject: [PATCH 03/24] Automatic changelog for PR #3747 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3747.yml b/html/changelogs/AutoChangeLog-pr-3747.yml
new file mode 100644
index 000000000000..c20e68184c69
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3747.yml
@@ -0,0 +1,4 @@
+author: "TheGamerdk"
+delete-after: True
+changes:
+  - bugfix: "You can now re-enter your body when unnested, marine mains, rejoice!"
\ No newline at end of file

From 5eba560f8c137cdcf2dec1f829337917d4968d97 Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Thu, 29 Jun 2023 05:18:34 +0200
Subject: [PATCH 04/24] Lurker no longer decloaks if they pounce onto a dead
 guy. (#3724)

# 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.
-->

Doesn't make sense to lose your cloak for pouncing at a dead guy.

They'll still decloak if it's a living guy hiding under a dead guy.

(This only happens if your pounce ends on a tile where there's a dead
guy)

# Explain why it's good for the game
Inconsistent at best. Bad

# 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: Lurkers no longer lose their pounce if they happen to end their
pounce on a tile with a dead human
/:cl:
---
 .../abilities/lurker/lurker_abilities.dm        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
index e0a29a034029..0c9358119def 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
@@ -14,20 +14,21 @@
 	can_be_shield_blocked = TRUE
 
 /datum/action/xeno_action/activable/pounce/lurker/additional_effects_always()
-	var/mob/living/carbon/xenomorph/X = owner
-	if (!istype(X))
+	var/mob/living/carbon/xenomorph/xeno = owner
+	if (!istype(xeno))
 		return
-
-	if (X.mutation_type == LURKER_NORMAL)
+	if (xeno.mutation_type == LURKER_NORMAL)
 		var/found = FALSE
-		for (var/mob/living/carbon/human/H in get_turf(X))
+		for (var/mob/living/carbon/human/human in get_turf(xeno))
+			if(human.stat == DEAD)
+				continue
 			found = TRUE
 			break
 
 		if (found)
-			var/datum/action/xeno_action/onclick/lurker_invisibility/LIA = get_xeno_action_by_type(X, /datum/action/xeno_action/onclick/lurker_invisibility)
-			if (istype(LIA))
-				LIA.invisibility_off()
+			var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invis = get_xeno_action_by_type(xeno, /datum/action/xeno_action/onclick/lurker_invisibility)
+			if (istype(lurker_invis))
+				lurker_invis.invisibility_off()
 
 /datum/action/xeno_action/activable/pounce/lurker/additional_effects(mob/living/L)
 	var/mob/living/carbon/xenomorph/X = owner

From 4715802ecf430793fc66c78cc510c5b834344ea7 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 29 Jun 2023 04:28:55 +0100
Subject: [PATCH 05/24] Automatic changelog for PR #3724 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3724.yml b/html/changelogs/AutoChangeLog-pr-3724.yml
new file mode 100644
index 000000000000..031042a976c9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3724.yml
@@ -0,0 +1,4 @@
+author: "TheGamerdk"
+delete-after: True
+changes:
+  - bugfix: "Lurkers no longer lose their pounce if they happen to end their pounce on a tile with a dead human"
\ No newline at end of file

From 53d1a3989d3168a22be4be1123aacaa21584ccba Mon Sep 17 00:00:00 2001
From: Drathek <76988376+Drulikar@users.noreply.github.com>
Date: Thu, 29 Jun 2023 01:22:54 -0700
Subject: [PATCH 06/24] Port TG#74500: Adds VERB_REF and derivative (#3753)

# About the pull request

This PR ports another 515 compatibility PR from TGStation:
https://github.com/tgstation/tgstation/pull/74500

# Explain why it's good for the game

Future proofing.

# 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
code: Ported VERB_REF and TYPE_VERB_REF from TG for 515 compatibility
/:cl:
---
 .github/guides/STANDARDS.md   |  4 +++-
 code/_byond_version_compat.dm | 32 +++++++++++++++++++++++++-------
 code/_onclick/click.dm        |  4 ++--
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/.github/guides/STANDARDS.md b/.github/guides/STANDARDS.md
index fc764d09c816..c9b988bd07ff 100644
--- a/.github/guides/STANDARDS.md
+++ b/.github/guides/STANDARDS.md
@@ -126,7 +126,7 @@ While we normally encourage (and in some cases, even require) bringing out of da
 This is a simple one - as we will eventually move to 515, we will need to ditch this kind of callback. So please don't add any new ones. Make our lives easier.
 
 ### PROC_REF Macros
- When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF,TYPE_PROC_REF and GLOBAL_PROC_REF macros.
+ When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF, TYPE_PROC_REF and GLOBAL_PROC_REF macros.
  They ensure compilation fails if the reffered to procs change names or get removed.
  The macro to be used depends on how the proc you're in relates to the proc you want to use:
 
@@ -168,6 +168,8 @@ This is a simple one - as we will eventually move to 515, we will need to ditch
  	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(funny)), 100))
  ```
 
+ Note that the same rules go for verbs too! We have VERB_REF() and TYPE_VERB_REF() as you need it in these same cases. GLOBAL_VERB_REF() isn't a thing however, as verbs are not global.
+
 ### Signal Handlers
 
 All procs that are registered to listen for signals using `RegisterSignal()` must contain at the start of the proc `SIGNAL_HANDLER` eg;
diff --git a/code/_byond_version_compat.dm b/code/_byond_version_compat.dm
index b5379a3b6d5c..df2f02d383b1 100644
--- a/code/_byond_version_compat.dm
+++ b/code/_byond_version_compat.dm
@@ -31,19 +31,37 @@
 #define LIBCALL call_ext
 #endif
 
-// So we want to have compile time guarantees these procs exist on local type, unfortunately 515 killed the .proc/procname syntax so we have to use nameof()
+// So we want to have compile time guarantees these methods exist on local type, unfortunately 515 killed the .proc/procname and .verb/verbname syntax so we have to use nameof()
+// For the record: GLOBAL_VERB_REF would be useless as verbs can't be global.
+
 #if DM_VERSION < 515
-/// Call by name proc reference, checks if the proc exists on this type or as a global proc
+
+/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
 #define PROC_REF(X) (.proc/##X)
-/// Call by name proc reference, checks if the proc exists on given type or as a global proc
+/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
+#define VERB_REF(X) (.verb/##X)
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
 #define TYPE_PROC_REF(TYPE, X) (##TYPE.proc/##X)
-/// Call by name proc reference, checks if the proc is existing global proc
+/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb
+#define TYPE_VERB_REF(TYPE, X) (##TYPE.verb/##X)
+
+/// Call by name proc reference, checks if the proc is an existing global proc
 #define GLOBAL_PROC_REF(X) (/proc/##X)
+
 #else
-/// Call by name proc reference, checks if the proc exists on this type or as a global proc
+
+/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
 #define PROC_REF(X) (nameof(.proc/##X))
-/// Call by name proc reference, checks if the proc exists on given type or as a global proc
+/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
+#define VERB_REF(X) (nameof(.verb/##X))
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
 #define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X))
-/// Call by name proc reference, checks if the proc is existing global proc
+/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb
+#define TYPE_VERB_REF(TYPE, X) (nameof(##TYPE.verb/##X))
+
+/// Call by name proc reference, checks if the proc is an existing global proc
 #define GLOBAL_PROC_REF(X) (/proc/##X)
+
 #endif
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index affbc28cdd45..df7dd48a1dd1 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -82,7 +82,7 @@
 		return
 
 	face_atom(A)
-	if(mods["middle"]) 
+	if(mods["middle"])
 		return
 	// Special type of click.
 	if (is_mob_restrained())
@@ -334,7 +334,7 @@
 	if(prefs.adaptive_zoom)
 		INVOKE_ASYNC(src, PROC_REF(adaptive_zoom))
 	else if(prefs.auto_fit_viewport)
-		INVOKE_ASYNC(src, .verb/fit_viewport)
+		INVOKE_ASYNC(src, VERB_REF(fit_viewport))
 
 /client/proc/get_adaptive_zoom_factor()
 	if(!prefs.adaptive_zoom)

From 7841a59b9a7527fd083e739376340e2283aca89b Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 29 Jun 2023 09:45:13 +0100
Subject: [PATCH 07/24] Automatic changelog for PR #3753 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3753.yml b/html/changelogs/AutoChangeLog-pr-3753.yml
new file mode 100644
index 000000000000..7105155792bd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3753.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - code_imp: "Ported VERB_REF and TYPE_VERB_REF from TG for 515 compatibility"
\ No newline at end of file

From 5700c6c7738336f4b11db55298113bd14cdf5f57 Mon Sep 17 00:00:00 2001
From: Drathek <76988376+Drulikar@users.noreply.github.com>
Date: Thu, 29 Jun 2023 01:28:30 -0700
Subject: [PATCH 08/24] Fix minimap removeimage proc not checking z level
 correctly (#3752)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# About the pull request

This PR fixes an issue where the removeimage proc in the minimap
subsystem didn't get the turf of the target to correctly test what Z
level they were added to such as being deleted in a cryopod. (Entering
say a cryopod is not considered a onTransitZ trigger despite the z value
changing)

# Explain why it's good for the game
This PR should fix runtimes such as:
```
[2023-06-28 07:08:53.119] runtime error: /list {len = 5}l"istress Signal"Êß@'
 - proc name: removeimage (/datum/controller/subsystem/minimaps/proc/removeimage)
 -   source file: minimap.dm,266
 -   usr: null
 -   src: Minimaps (/datum/controller/subsystem/minimaps)
 -   call stack:
 - Minimaps (/datum/controller/subsystem/minimaps): removeimage(, Leroy Luna (/mob/living/carbon/human))
 - /datum/callback (/datum/callback): Invoke()
 - Minimaps (/datum/controller/subsystem/minimaps): remove marker(Leroy Luna (/mob/living/carbon/human), null, null)
 - the marine senior command head... (/obj/item/device/radio/headset/almayer/mcom/cdrcom): dropped(Leroy Luna (/mob/living/carbon/human))
 - Leroy Luna (/mob/living/carbon/human): u equip(the marine senior command head... (/obj/item/device/radio/headset/almayer/mcom/cdrcom), the hypersleep chamber (/obj/structure/machinery/cryopod/right), null, null)
 - Leroy Luna (/mob/living/carbon/human): u equip(the marine senior command head... (/obj/item/device/radio/headset/almayer/mcom/cdrcom), the hypersleep chamber (/obj/structure/machinery/cryopod/right), null, null)
 - Leroy Luna (/mob/living/carbon/human): u equip(the marine senior command head... (/obj/item/device/radio/headset/almayer/mcom/cdrcom), the hypersleep chamber (/obj/structure/machinery/cryopod/right), null, null)
 - Leroy Luna (/mob/living/carbon/human): drop inv item to loc(the marine senior command head... (/obj/item/device/radio/headset/almayer/mcom/cdrcom), the hypersleep chamber (/obj/structure/machinery/cryopod/right), null, null)
 - the hypersleep chamber (/obj/structure/machinery/cryopod/right): despawn occupant()
 - the hypersleep chamber (/obj/structure/machinery/cryopod/right): process()
 - Machinery (/datum/controller/subsystem/machinery): fire(0)
 - Machinery (/datum/controller/subsystem/machinery): ignite(0)
 - Master (/datum/controller/master): RunQueue()
 - Master (/datum/controller/master): Loop(2)
 - Master (/datum/controller/master): StartProcessing(0)
```

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


![cryo](https://github.com/cmss13-devs/cmss13/assets/76988376/9ade906e-cde1-4330-9cd7-cc82ffb938e4)

</details>

# Changelog
:cl: Drathek
fix: Fix runtimes with minimap subsystem not handling targets inside of
objects during removal
/:cl:
---
 code/controllers/subsystem/minimap.dm | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index e365a9b60781..c3b2d36b8177 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -262,8 +262,12 @@ SUBSYSTEM_DEF(minimaps)
  * removes an image from raw tracked lists, invoked by callback
  */
 /datum/controller/subsystem/minimaps/proc/removeimage(image/blip, atom/target)
+	var/turf/turf_gotten = get_turf(target)
+	if(!turf_gotten)
+		return
+	var/z_level = turf_gotten.z
 	for(var/flag in GLOB.all_minimap_flags)
-		minimaps_by_z["[target.z]"].images_raw["[flag]"] -= blip
+		minimaps_by_z["[z_level]"].images_raw["[flag]"] -= blip
 	blip.UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
 	removal_cbs -= target
 
@@ -391,18 +395,24 @@ SUBSYSTEM_DEF(minimaps)
 		owner.client.screen += map
 	minimap_displayed = !minimap_displayed
 
-/datum/action/minimap/give_to(mob/M)
+/datum/action/minimap/give_to(mob/target)
 	. = ..()
 
 	if(default_overwatch_level)
 		map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags)
 	else
-		RegisterSignal(M, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change))
-	if(!SSminimaps.minimaps_by_z["[M.z]"] || !SSminimaps.minimaps_by_z["[M.z]"].hud_image)
+		RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change))
+
+	var/turf/turf_gotten = get_turf(target)
+	if(!turf_gotten)
+		return
+	var/z_level = turf_gotten.z
+
+	if(!SSminimaps.minimaps_by_z["[z_level]"] || !SSminimaps.minimaps_by_z["[z_level]"].hud_image)
 		return
-	map = SSminimaps.fetch_minimap_object(M.z, minimap_flags)
+	map = SSminimaps.fetch_minimap_object(z_level, minimap_flags)
 
-/datum/action/minimap/remove_from(mob/M)
+/datum/action/minimap/remove_from(mob/target)
 	. = ..()
 	if(minimap_displayed)
 		owner?.client?.screen -= map

From 156fa3991385d61d7cfd272889c9d676a9adeb9c Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 29 Jun 2023 10:00:36 +0100
Subject: [PATCH 09/24] Automatic changelog for PR #3752 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3752.yml b/html/changelogs/AutoChangeLog-pr-3752.yml
new file mode 100644
index 000000000000..2890d9c60a41
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3752.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - bugfix: "Fix runtimes with minimap subsystem not handling targets inside of objects during removal"
\ No newline at end of file

From 2e675897fae2d016203e583c1f77ed7477443221 Mon Sep 17 00:00:00 2001
From: Drathek <76988376+Drulikar@users.noreply.github.com>
Date: Thu, 29 Jun 2023 01:28:50 -0700
Subject: [PATCH 10/24] Remove dead code for langchat rotations (#3756)

# About the pull request

This PR removes some unused code as of #671

# Explain why it's good for the game

Less work for the server when updating a mob's transform.

# 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
code: Removed unnecessary calculations when updating a mob's transform.
/:cl:
---
 code/game/objects/objs.dm                      |  8 +++-----
 .../mob/living/carbon/human/update_icons.dm    | 18 +++++++-----------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 42a3a2f0b9ea..e98e3b527c5f 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -302,11 +302,9 @@
 		src.add_fingerprint(user)
 		afterbuckle(target)
 		if(buckle_lying) // Make sure buckling to beds/nests etc only turns, and doesn't give a random offset
-			var/matrix/M = matrix()
-			var/matrix/L = matrix() //Counterrotation for langchat text.
-			M.Turn(90)
-			L.Turn(270)
-			target.apply_transform(M)
+			var/matrix/new_matrix = matrix()
+			new_matrix.Turn(90)
+			target.apply_transform(new_matrix)
 		return TRUE
 
 /obj/proc/send_buckling_message(mob/M, mob/user)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 355f69ca05a9..f74b65c2606d 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -94,23 +94,19 @@ There are several things that need to be remembered:
 	if(lying == lying_prev && !force)
 		return
 	lying_prev = lying
-	var/matrix/M = matrix()
-	var/matrix/L = matrix() //Counter-rotation for langchat text.
+	var/matrix/new_matrix = matrix()
 	if(lying)
 		if(pulledby && pulledby.grab_level >= GRAB_CARRY)
-			M.Turn(90)
-			L.Turn(270)
+			new_matrix.Turn(90)
 		else
 			if(prob(50))
-				M.Turn(90)
-				L.Turn(270)
+				new_matrix.Turn(90)
 			else
-				M.Turn(270)
-				L.Turn(90)
-			M.Translate(rand(-10,10),rand(-10,10))
-		apply_transform(M)
+				new_matrix.Turn(270)
+			new_matrix.Translate(rand(-10,10), rand(-10,10))
+		apply_transform(new_matrix)
 	else
-		apply_transform(M)
+		apply_transform(new_matrix)
 
 /mob/living/carbon/human/UpdateDamageIcon()
 	for(var/obj/limb/O in limbs)

From a6e8a4d2872dbc564fe75317c66e5309e493423b Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 29 Jun 2023 10:17:12 +0100
Subject: [PATCH 11/24] Automatic changelog for PR #3756 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3756.yml b/html/changelogs/AutoChangeLog-pr-3756.yml
new file mode 100644
index 000000000000..77eb600b40f6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3756.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - code_imp: "Removed unnecessary calculations when updating a mob's transform."
\ No newline at end of file

From 2f1eb92f05dd275a153c0784289d3053c102854d Mon Sep 17 00:00:00 2001
From: morrowwolf <darthbane97@gmail.com>
Date: Thu, 29 Jun 2023 04:42:37 -0400
Subject: [PATCH 12/24] Removes wrong warden locker (#3751)

# About the pull request

Removes incorrect warden locker

# Explain why it's good for the game

This is not supposed to be here.

# 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: Morrow
del: Removed wrong warden locker
/:cl:
---
 maps/map_files/USS_Almayer/USS_Almayer.dmm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 63562239f4dc..b15ee29dd20a 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -56372,7 +56372,6 @@
 "pbh" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/closet/secure_closet/warden,
 /obj/structure/machinery/light{
 	dir = 4
 	},

From c3ffb3bf41b70f5cfdfad98f0d14be786f56317d Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Thu, 29 Jun 2023 10:30:05 +0100
Subject: [PATCH 13/24] Automatic changelog for PR #3751 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3751.yml b/html/changelogs/AutoChangeLog-pr-3751.yml
new file mode 100644
index 000000000000..50c548407f5e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3751.yml
@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - rscdel: "Removed wrong warden locker"
\ No newline at end of file

From ae54d1f1de3839c5d261f762bda61946ab3b523a Mon Sep 17 00:00:00 2001
From: fira <loyauflorian@gmail.com>
Date: Thu, 29 Jun 2023 09:44:39 +0100
Subject: [PATCH 14/24] Port /tg/ PR #75835 - Linux 515 fcopy() crash fix
 (#3525)

Details here: https://github.com/tgstation/tgstation/pull/75835
---
 code/_byond_version_compat.dm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/_byond_version_compat.dm b/code/_byond_version_compat.dm
index df2f02d383b1..719d85654b5f 100644
--- a/code/_byond_version_compat.dm
+++ b/code/_byond_version_compat.dm
@@ -65,3 +65,15 @@
 #define GLOBAL_PROC_REF(X) (/proc/##X)
 
 #endif
+
+#if (DM_VERSION == 515)
+/// fcopy will crash on 515 linux if given a non-existant file, instead of returning 0 like on 514 linux or 515 windows
+/// var case matches documentation for fcopy.
+/world/proc/__fcopy(Src, Dst)
+	if (istext(Src) && !fexists(Src))
+		return 0
+	return fcopy(Src, Dst)
+
+#define fcopy(Src, Dst) world.__fcopy(Src, Dst)
+
+#endif

From 49fc0dea934b89fc0f736888ea46cca192ca087d Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 30 Jun 2023 01:41:48 +0000
Subject: [PATCH 15/24] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3724.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-3747.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-3751.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-3752.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-3753.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-3756.yml |  4 ----
 html/changelogs/archive/2023-06.yml       | 12 ++++++++++++
 7 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3724.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3747.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3751.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3752.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3753.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3756.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3724.yml b/html/changelogs/AutoChangeLog-pr-3724.yml
deleted file mode 100644
index 031042a976c9..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3724.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TheGamerdk"
-delete-after: True
-changes:
-  - bugfix: "Lurkers no longer lose their pounce if they happen to end their pounce on a tile with a dead human"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3747.yml b/html/changelogs/AutoChangeLog-pr-3747.yml
deleted file mode 100644
index c20e68184c69..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3747.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TheGamerdk"
-delete-after: True
-changes:
-  - bugfix: "You can now re-enter your body when unnested, marine mains, rejoice!"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3751.yml b/html/changelogs/AutoChangeLog-pr-3751.yml
deleted file mode 100644
index 50c548407f5e..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3751.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Morrow"
-delete-after: True
-changes:
-  - rscdel: "Removed wrong warden locker"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3752.yml b/html/changelogs/AutoChangeLog-pr-3752.yml
deleted file mode 100644
index 2890d9c60a41..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3752.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Drathek"
-delete-after: True
-changes:
-  - bugfix: "Fix runtimes with minimap subsystem not handling targets inside of objects during removal"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3753.yml b/html/changelogs/AutoChangeLog-pr-3753.yml
deleted file mode 100644
index 7105155792bd..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3753.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Drathek"
-delete-after: True
-changes:
-  - code_imp: "Ported VERB_REF and TYPE_VERB_REF from TG for 515 compatibility"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3756.yml b/html/changelogs/AutoChangeLog-pr-3756.yml
deleted file mode 100644
index 77eb600b40f6..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3756.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Drathek"
-delete-after: True
-changes:
-  - code_imp: "Removed unnecessary calculations when updating a mob's transform."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-06.yml b/html/changelogs/archive/2023-06.yml
index b1040b8044de..e2d9dfed44d7 100644
--- a/html/changelogs/archive/2023-06.yml
+++ b/html/changelogs/archive/2023-06.yml
@@ -430,3 +430,15 @@
   - bugfix: door_control buttons now respect being indestructable when processing
       explosions.
   - maptweak: Fixed the M39s overflowing in brig armory due to use of landmarks.
+2023-06-30:
+  Drathek:
+  - bugfix: Fix runtimes with minimap subsystem not handling targets inside of objects
+      during removal
+  - code_imp: Ported VERB_REF and TYPE_VERB_REF from TG for 515 compatibility
+  - code_imp: Removed unnecessary calculations when updating a mob's transform.
+  Morrow:
+  - rscdel: Removed wrong warden locker
+  TheGamerdk:
+  - bugfix: You can now re-enter your body when unnested, marine mains, rejoice!
+  - bugfix: Lurkers no longer lose their pounce if they happen to end their pounce
+      on a tile with a dead human

From 9b123cc367fea2e2de3cfc63e208d60d1bfd60dd Mon Sep 17 00:00:00 2001
From: Drathek <76988376+Drulikar@users.noreply.github.com>
Date: Thu, 29 Jun 2023 23:38:23 -0700
Subject: [PATCH 16/24] Fix Facehugger Ban Oversight (#3766)

# About the pull request

This PR fixes an oversight where the xeno ban check wasn't being done
for facehuggers (except the facehugger join verb).

# Explain why it's good for the game

Fixes #3739

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


![image](https://github.com/cmss13-devs/cmss13/assets/76988376/861eed98-0810-40ed-8a4c-22529cdac345)

</details>

# Changelog
:cl: Drathek
fix: Fixed missing xeno ban check for playing as a facehugger
/:cl:
---
 code/modules/mob/living/carbon/xenomorph/xeno_defines.dm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index 5d3ee0b04ba7..7e1f31e66e67 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -286,7 +286,7 @@
 	var/bonus_larva_spawn_chance = 1
 	var/hijack_burrowed_surge = FALSE //at hijack, start spawning lots of burrowed
 	/// how many burrowed is going to spawn during larva surge
-	var/hijack_burrowed_left = 0 
+	var/hijack_burrowed_left = 0
 
 	var/ignore_slots = FALSE
 	var/dynamic_evolution = TRUE
@@ -1006,7 +1006,10 @@
 
 /datum/hive_status/proc/can_spawn_as_hugger(mob/dead/observer/user)
 	if(!GLOB.hive_datum || ! GLOB.hive_datum[hivenumber])
-		return
+		return FALSE
+	if(jobban_isbanned(user, JOB_XENOMORPH)) // User is jobbanned
+		to_chat(user, SPAN_WARNING("You are banned from playing aliens and cannot spawn as a xenomorph."))
+		return FALSE
 	if(world.time < hugger_timelock)
 		to_chat(user, SPAN_WARNING("The hive cannot support facehuggers yet..."))
 		return FALSE

From 374014d9523d2ca615f2e114af184e668e7a4db7 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 30 Jun 2023 07:46:43 +0100
Subject: [PATCH 17/24] Automatic changelog for PR #3766 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3766.yml b/html/changelogs/AutoChangeLog-pr-3766.yml
new file mode 100644
index 000000000000..6132f005140c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3766.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - bugfix: "Fixed missing xeno ban check for playing as a facehugger"
\ No newline at end of file

From 52eb64e8e0ec9cd3c94a84126f5d4a73f2e98ea3 Mon Sep 17 00:00:00 2001
From: Drathek <76988376+Drulikar@users.noreply.github.com>
Date: Thu, 29 Jun 2023 23:39:03 -0700
Subject: [PATCH 18/24] Fixes wordiness about re-entering your body when you're
 unnested (#3761)

# About the pull request

This PR is a followup to #3597 that was requested but refused in #3747
to improve the situation where there is too much text in a tgui_alert
when ghosting while nested.

# Explain why it's good for the game

Instead of:

![image](https://github.com/cmss13-devs/cmss13/assets/76988376/aee760ce-ed79-4cac-be06-b2d265bd69c6)
It is now:

![image](https://github.com/cmss13-devs/cmss13/assets/76988376/26859630-c185-4c2a-94e2-d275e85a620e)

# Testing Photographs and Procedure

1. Get nested
2. Remain in body for the first prompt
3. Ghost

# Changelog
:cl: Drathek
spellcheck: Tweaked message when ghosting while nested
/:cl:
---
 code/modules/mob/dead/observer/observer.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index fcb95a6fd783..a22e46ad2911 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -398,7 +398,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		var/is_nested = (buckled && istype(buckled, /obj/structure/bed/nest)) ? TRUE : FALSE
 		var/obj/structure/bed/nest/nest = FALSE
 		if(is_nested)
-			text_prompt += "\nSince you're nested, you will be given a chance to reenter your body upon being freed."
+			text_prompt += "\nSince you're nested, you will get a chance to reenter your body if freed."
 			nest = buckled
 		var/response = tgui_alert(src, text_prompt, "Are you sure you want to ghost?", options)
 		if(response == "Aghost")

From a7701d66c7b005389a33694fefc940f946079797 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 30 Jun 2023 08:04:24 +0100
Subject: [PATCH 19/24] Automatic changelog for PR #3761 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3761.yml b/html/changelogs/AutoChangeLog-pr-3761.yml
new file mode 100644
index 000000000000..75a499cd7e48
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3761.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - spellcheck: "Tweaked message when ghosting while nested"
\ No newline at end of file

From aa786c62e614bba140b6a7496d61b614d953f734 Mon Sep 17 00:00:00 2001
From: harryob <me@harryob.live>
Date: Fri, 30 Jun 2023 07:53:15 +0100
Subject: [PATCH 20/24] remove more references to GAs (#3759)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

removes some remaining floating references to GAs because i literally
just control-fd for "gameplay architect" 🤦

no playerfacing changes etc
---
 .github/CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c05d84e8122d..339d48c9fe39 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -74,10 +74,10 @@ These are the few directives we have for project maintainers.
     - Try to get secondary maintainer approval before merging if you are able to.
   - PRs with empty commits intended to generate a changelog.
 - Do not merge PRs that contain content from the [banned content list](./CONTRIBUTING.md#banned-content).
-- Do not merge PRs that contain balance changes without GA approval. Exceptions include:
-  - Any PR that has been un-reviewed by a GA for 7 days.
+- Do not merge PRs that contain balance changes without Maintainer Manager approval. Exceptions include:
+  - Any PR that has been un-reviewed by a Maintainer Manager for 7 days.
 - Do not remove the DNM label that another Maintainer has applied. Exceptions include:
-  - GAs removing a DNM label placed by a Maintainer for Balance/Design reasons
+  - Maintainer Managers removing a DNM label placed by a Maintainer for Balance/Design reasons
 
 These are not steadfast rules as maintainers are expected to use their best judgement when operating.
 

From 21dc6cde59d9dc943f304d5edd7d84a496f7eaba Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Fri, 30 Jun 2023 09:30:40 +0200
Subject: [PATCH 21/24] ARES will now announce how many Foxtrot marines woke up
 (#3675)

# 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.
-->

It's neat to be able to see how many Foxtrot marines woke up at a
glance. This also means you know *when* they've woken up.


# Explain why it's good for the game
Means CIC can actually know when, and how many, foxtrot woke up, at a
glance.

# 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: ARES will announce how many Foxtrot marines that woke up.
/:cl:

---------

Co-authored-by: harryob <me@harryob.live>
---
 code/datums/emergency_calls/cryo_marines.dm       | 6 ++++--
 code/datums/emergency_calls/cryo_marines_heavy.dm | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm
index e5992a62ecdd..9bec8b3593dd 100644
--- a/code/datums/emergency_calls/cryo_marines.dm
+++ b/code/datums/emergency_calls/cryo_marines.dm
@@ -13,10 +13,12 @@
 	shuttle_id = ""
 	var/leaders = 0
 
-/datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc)
+/datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message)
 	var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo]
 	leaders = cryo_squad.num_leaders
-	return ..()
+	. = ..()
+	if(length(members))
+		shipwide_ai_announcement("Successfully deployed [length(members)] Foxtrot marines.")
 
 /datum/emergency_call/cryo_squad/create_member(datum/mind/M, turf/override_spawn_loc)
 	set waitfor = 0
diff --git a/code/datums/emergency_calls/cryo_marines_heavy.dm b/code/datums/emergency_calls/cryo_marines_heavy.dm
index 6a3636568856..70ce52443573 100644
--- a/code/datums/emergency_calls/cryo_marines_heavy.dm
+++ b/code/datums/emergency_calls/cryo_marines_heavy.dm
@@ -16,10 +16,12 @@
 
 	var/leaders = 0
 
-/datum/emergency_call/cryo_squad_equipped/spawn_candidates(announce, override_spawn_loc)
+/datum/emergency_call/cryo_squad_equipped/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message)
 	var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo]
 	leaders = cryo_squad.num_leaders
-	return ..()
+	. = ..()
+	if(length(members))
+		shipwide_ai_announcement("Successfully deployed [length(members)] Foxtrot marines.")
 
 /datum/emergency_call/cryo_squad_equipped/create_member(datum/mind/M, turf/override_spawn_loc)
 	set waitfor = 0

From ec1d1d57849730172967a1b2baeb99a5247a661d Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 30 Jun 2023 08:43:00 +0100
Subject: [PATCH 22/24] Automatic changelog for PR #3675 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3675.yml b/html/changelogs/AutoChangeLog-pr-3675.yml
new file mode 100644
index 000000000000..744b83d85b08
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3675.yml
@@ -0,0 +1,4 @@
+author: "TheGamerdk"
+delete-after: True
+changes:
+  - rscadd: "ARES will announce how many Foxtrot marines that woke up."
\ No newline at end of file

From 0f36175cbcdab1be582ad40340291f9d8d650b85 Mon Sep 17 00:00:00 2001
From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com>
Date: Fri, 30 Jun 2023 10:48:14 +0300
Subject: [PATCH 23/24] Dropship Sentry Camera (#3737)

# About the pull request

Adds cameras to dropship deployable sentries. Only work when deployed.

# Explain why it's good for the game

A bit more awareness for the most boring role in the game won't hurt.
Also, it was a feature a few years ago, I still don't understand why it
was removed, maybe just got dropped during refactoring or something.

# 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: ihatethisengine
add: Added cameras to dropship deployable sentries.
/:cl:
---
 code/modules/cm_marines/dropship_equipment.dm | 13 ++++++++++++-
 code/modules/defenses/sentry.dm               |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm
index 42bbd7f746e7..89d33134bdb8 100644
--- a/code/modules/cm_marines/dropship_equipment.dm
+++ b/code/modules/cm_marines/dropship_equipment.dm
@@ -256,6 +256,13 @@
 	deployed_turret.start_processing()
 	deployed_turret.set_range()
 
+	deployed_turret.linked_cam = new(deployed_turret.loc, "[capitalize_first_letters(ship_base.name)] [capitalize_first_letters(name)]")
+	if (linked_shuttle.id == DROPSHIP_ALAMO)
+		deployed_turret.linked_cam.network = list(CAMERA_NET_ALAMO)
+	else if (linked_shuttle.id == DROPSHIP_NORMANDY)
+		deployed_turret.linked_cam.network = list(CAMERA_NET_NORMANDY)
+
+
 /obj/structure/dropship_equipment/sentry_holder/proc/undeploy_sentry()
 	if(!deployed_turret)
 		return
@@ -267,8 +274,12 @@
 	deployed_turret.stop_processing()
 	deployed_turret.unset_range()
 	icon_state = "sentry_system_installed"
+	QDEL_NULL(deployed_turret.linked_cam)
 
-
+/obj/structure/dropship_equipment/sentry_holder/Destroy()
+	if(deployed_turret)
+		QDEL_NULL(deployed_turret.linked_cam)
+	. = ..()
 
 
 /// Holder for the dropship mannable machinegun system
diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm
index 3d485f3abda7..946c347efaa0 100644
--- a/code/modules/defenses/sentry.dm
+++ b/code/modules/defenses/sentry.dm
@@ -539,11 +539,13 @@
 	choice_categories = list()
 	selected_categories = list()
 	var/obj/structure/dropship_equipment/sentry_holder/deployment_system
+	var/obj/structure/machinery/camera/cas/linked_cam
 
 /obj/structure/machinery/defenses/sentry/premade/dropship/Destroy()
 	if(deployment_system)
 		deployment_system.deployed_turret = null
 		deployment_system = null
+	QDEL_NULL(linked_cam)
 	. = ..()
 
 #define SENTRY_SNIPER_RANGE 10

From 6a457d9475b83fc2dd0796f1a47a9f7e5cebd4f4 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 30 Jun 2023 08:57:07 +0100
Subject: [PATCH 24/24] Automatic changelog for PR #3737 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-3737.yml b/html/changelogs/AutoChangeLog-pr-3737.yml
new file mode 100644
index 000000000000..770af461be67
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3737.yml
@@ -0,0 +1,4 @@
+author: "ihatethisengine"
+delete-after: True
+changes:
+  - rscadd: "Added cameras to dropship deployable sentries."
\ No newline at end of file