From 70947e94f372a61e29eee4afd29c6ae112a12cc1 Mon Sep 17 00:00:00 2001
From: harryob <me@harryob.live>
Date: Fri, 25 Aug 2023 18:19:36 +0100
Subject: [PATCH 01/22] patches autowiki to work

---
 .github/workflows/autowiki.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml
index 82d0ac76f32f..0a431d520ba9 100644
--- a/.github/workflows/autowiki.yml
+++ b/.github/workflows/autowiki.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   autowiki:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: "Check for AUTOWIKI_USERNAME"
       id: secrets_set

From 552a863f1224f115a353fb15336db1a6985bfd0f Mon Sep 17 00:00:00 2001
From: harryob <me@harryob.live>
Date: Fri, 25 Aug 2023 18:22:51 +0100
Subject: [PATCH 02/22] removes extraneous install steps from autowiki.yml

---
 .github/workflows/autowiki.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml
index 0a431d520ba9..91ab12cdb19f 100644
--- a/.github/workflows/autowiki.yml
+++ b/.github/workflows/autowiki.yml
@@ -30,9 +30,6 @@ jobs:
     - name: Install rust-g
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       run: |
-        sudo dpkg --add-architecture i386
-        sudo apt update || true
-        sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
         bash tools/ci/install_rust_g.sh
     - name: Compile and generate Autowiki files
       if: steps.secrets_set.outputs.SECRETS_ENABLED

From 0e5029b2420d974c08ff3751c96db272c3a58982 Mon Sep 17 00:00:00 2001
From: forest2001 <41653574+realforest2001@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:34:49 +0100
Subject: [PATCH 03/22] Invisible Wall collide tweak (#4247)

# About the pull request
Changes where the message comes from when collidin with an invisible
wall as it was hardcoded but using the same text as description var
<!-- 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
# 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:
code: Changed backend for the message of walking into an invisible wall
to reduce duplication.
/:cl:
---
 code/game/objects/structures/blocker.dm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm
index aadf6d2a099e..a9e7371d7055 100644
--- a/code/game/objects/structures/blocker.dm
+++ b/code/game/objects/structures/blocker.dm
@@ -25,7 +25,10 @@
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/structure/blocker/invisible_wall/Collided(atom/movable/AM)
-	to_chat(AM, SPAN_WARNING("You cannot go this way."))
+	var/msg = desc
+	if(!msg)
+		msg = "You cannot go this way."
+	to_chat(AM, SPAN_WARNING(msg))
 
 /obj/structure/blocker/invisible_wall/New()
 	..()
@@ -35,10 +38,6 @@
 	desc = "You cannot wade out any further"
 	icon_state = "map_blocker"
 
-/obj/structure/blocker/invisible_wall/water/Collided(atom/movable/AM)
-	to_chat(AM, SPAN_WARNING("You cannot wade out any further."))
-
-
 /obj/structure/blocker/fog
 	name = "dense fog"
 	desc = "It looks way too dangerous to traverse. Best wait until it has cleared up."

From 86d455a7788cc88bdce4923a648d00c6300ebf19 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:44:07 +0100
Subject: [PATCH 04/22] Automatic changelog for PR #4247 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4247.yml b/html/changelogs/AutoChangeLog-pr-4247.yml
new file mode 100644
index 000000000000..502b07ad36ae
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4247.yml
@@ -0,0 +1,4 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - code_imp: "Changed backend for the message of walking into an invisible wall to reduce duplication."
\ No newline at end of file

From 75cea37a70c6afddc19c3b3059c6a21cd64eeea9 Mon Sep 17 00:00:00 2001
From: morrowwolf <darthbane97@gmail.com>
Date: Fri, 25 Aug 2023 13:35:21 -0400
Subject: [PATCH 05/22] Changes nutrition with blood loss (#4231)

# About the pull request

Nutrition now slowly lowers when you are regaining blood rather than
losing it rapidly when you have lower effective blood.

# Explain why it's good for the game

The other way was dumb. This way may be less dumb.


# 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
balance: You now lose nutrition when gaining blood rather than losing a
ton of nutrition when you have low effective blood
/:cl:
---
 code/modules/mob/living/blood.dm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index a6062276bd8e..ab3ce823c68e 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -12,8 +12,9 @@
 
 	if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood.
 		//Blood regeneration if there is some space
-		if(blood_volume < max_blood)
+		if(blood_volume < max_blood && nutrition >= 1)
 			blood_volume += 0.1 // regenerate blood VERY slowly
+			nutrition -= 0.25
 		else if(blood_volume > max_blood)
 			blood_volume -= 0.1 // The reverse in case we've gotten too much blood in our body
 			if(blood_volume > limit_blood)
@@ -43,12 +44,6 @@
 			if(oxyloss < maximum_oxyloss)
 				oxyloss += round(max(additional_oxyloss, 0))
 
-			//Bloodloss effects on nutrition
-			if(nutrition >= 300)
-				nutrition -= 10
-			else if(nutrition >= 200)
-				nutrition -= 3
-
 		switch(b_volume)
 			if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
 				if(prob(1))

From e3fc4ff57dd401f26b0bc671813f30d36fed1b03 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:59:32 +0100
Subject: [PATCH 06/22] Automatic changelog for PR #4231 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4231.yml b/html/changelogs/AutoChangeLog-pr-4231.yml
new file mode 100644
index 000000000000..2e36b15aec3e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4231.yml
@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - balance: "You now lose nutrition when gaining blood rather than losing a ton of nutrition when you have low effective blood"
\ No newline at end of file

From 7051fa8efe07e427f00ee23325ef8e6dd619f2fc Mon Sep 17 00:00:00 2001
From: Diegoflores31 <47069269+Diegoflores31@users.noreply.github.com>
Date: Fri, 25 Aug 2023 14:58:21 -0500
Subject: [PATCH 07/22] attachment obliteration (#4217)

# 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.
-->
fixes #4194
Fixes weird behaviour with underbarrel fire extinguisher being able to
be used one handed on some weapons but not on others

All attachable weapons will now require you to hold them with both hands
in order to be used. (( added an exception flag for future attachies
that may need it))

standarized error message you receive when you are not wielding an
attachment.

# Explain why it's good for the game
realism and standarized behaviour for all attachments

# 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: Masterkey and underbarrel extinguisher now must be wielded in
order to be used.
fix: Underbarrel extinguisher no longer bypass wielding restrictions on
flamers.
/:cl:
---
 code/__DEFINES/conflict.dm                  |  2 ++
 code/modules/projectiles/gun.dm             | 17 ++++++++++-------
 code/modules/projectiles/gun_attachables.dm |  7 +++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm
index 30b2627bb1b0..ed261184d9d3 100644
--- a/code/__DEFINES/conflict.dm
+++ b/code/__DEFINES/conflict.dm
@@ -90,6 +90,8 @@
 #define ATTACH_IGNORE_EMPTY (1<<5)
 /// This attachment should activate if you attack() with it attached.
 #define ATTACH_MELEE (1<<6)
+/// Override for attachies so you can fire them with a single hand . ONLY FOR PROJECTILES!!
+#define ATTACH_WIELD_OVERRIDE (1<<7)
 
 //Ammo magazine defines, for flags_magazine
 
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 257edd9a7720..8cbcc99838cd 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1343,11 +1343,10 @@ and you're good to go.
 
 	//The following relating to bursts was borrowed from Fire code.
 	var/check_for_attachment_fire = FALSE
-	if(active_attachable)
-		if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
-			check_for_attachment_fire = TRUE
-		else
-			active_attachable.activate_attachment(src, null, TRUE)//No way.
+	if(active_attachable?.flags_attach_features & ATTACH_PROJECTILE)
+		check_for_attachment_fire = TRUE
+	else
+		active_attachable.activate_attachment(src, null, TRUE)//No way.
 
 
 	var/bullets_to_fire = 1
@@ -1512,8 +1511,12 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed
 		if(flags_gun_features & GUN_TRIGGER_SAFETY)
 			to_chat(user, SPAN_WARNING("The safety is on!"))
 			return
-
-		if((flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(flags_item & WIELDED)) //If we're not holding the weapon with both hands when we should.
+		if(active_attachable)
+			if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
+				if(!(active_attachable.flags_attach_features & ATTACH_WIELD_OVERRIDE) && !(flags_item & WIELDED))
+					to_chat(user, SPAN_WARNING("You must wield [src] to fire [active_attachable]!"))
+					return
+		if((flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(flags_item & WIELDED) && !active_attachable) //If we're not holding the weapon with both hands when we should.
 			to_chat(user, SPAN_WARNING("You need a more secure grip to fire this weapon!"))
 			return
 
diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
index adaa5ba1dee3..88defe14c5ef 100644
--- a/code/modules/projectiles/gun_attachables.dm
+++ b/code/modules/projectiles/gun_attachables.dm
@@ -2363,7 +2363,7 @@ Defined in conflicts.dm of the #defines folder.
 	var/obj/item/weapon/gun/attached_gun = loc
 
 	if(!(attached_gun.flags_item & WIELDED))
-		to_chat(user, SPAN_WARNING("You must wield \the [attached_gun] to fire \the [src]!"))
+		to_chat(user, SPAN_WARNING("You must wield [attached_gun] to fire [src]!"))
 		return
 
 	if(current_rounds > round_usage_per_tile && ..())
@@ -2509,6 +2509,9 @@ Defined in conflicts.dm of the #defines folder.
 /obj/item/attachable/attached_gun/extinguisher/fire_attachment(atom/target, obj/item/weapon/gun/gun, mob/living/user)
 	if(!internal_extinguisher)
 		return
+	if(!(gun.flags_item & WIELDED))
+		to_chat(user, SPAN_WARNING("You must wield [gun] to fire [src]!"))
+		return
 	if(..())
 		return internal_extinguisher.afterattack(target, user)
 
@@ -2569,7 +2572,7 @@ Defined in conflicts.dm of the #defines folder.
 		return
 
 	if((gun.flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(gun.flags_item & WIELDED))
-		to_chat(user, SPAN_WARNING("You need a more secure grip to fire this weapon!"))
+		to_chat(user, SPAN_WARNING("You must wield [gun] to fire [src]!"))
 		return
 
 	if(gun.flags_gun_features & GUN_TRIGGER_SAFETY)

From bab12253798c8bc6dbcb4e28afee34dd86cc7f33 Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Fri, 25 Aug 2023 21:07:46 +0100
Subject: [PATCH 08/22] Automatic changelog for PR #4217 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4217.yml b/html/changelogs/AutoChangeLog-pr-4217.yml
new file mode 100644
index 000000000000..8850262fb74c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4217.yml
@@ -0,0 +1,5 @@
+author: "Diegoflores31"
+delete-after: True
+changes:
+  - balance: "Masterkey and underbarrel extinguisher now must be wielded in order to be used."
+  - bugfix: "Underbarrel extinguisher no longer bypass wielding restrictions on flamers."
\ No newline at end of file

From 0500216bf9931ebe3bb3fb67373a8a9e58c5ae4e Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sat, 26 Aug 2023 01:03:43 +0000
Subject: [PATCH 09/22] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3865.yml | 35 ------------
 html/changelogs/AutoChangeLog-pr-4131.yml |  6 ---
 html/changelogs/AutoChangeLog-pr-4156.yml |  5 --
 html/changelogs/AutoChangeLog-pr-4217.yml |  5 --
 html/changelogs/AutoChangeLog-pr-4231.yml |  4 --
 html/changelogs/AutoChangeLog-pr-4247.yml |  4 --
 html/changelogs/archive/2023-08.yml       | 66 +++++++++++++++++++++++
 7 files changed, 66 insertions(+), 59 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3865.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4131.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4156.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4217.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4231.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4247.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3865.yml b/html/changelogs/AutoChangeLog-pr-3865.yml
deleted file mode 100644
index b9f40a81c133..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3865.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-author: "CapCamIII"
-delete-after: True
-changes:
-  - rscadd: "Adds 6(8 if you're pedantic) new guns for the UPP, details for each in following lines."
-  - rscadd: "Type 19, Replacement for PPsh on colonies and black market."
-  - rscadd: "Type 64, replacement for scorpion, full sized SMG, 2 versions, 1 for upp, 1 for not upp"
-  - rscadd: "HJRA-12, RPG for UPP."
-  - rscadd: "Type 73, pistol for higher ranked UPP troops, UPP COs get a Type 74 which has high-impact rounds, replaces PK9 in non-UPP use."
-  - rscadd: "NP92, pistol, replaces PK9 in UPP use(mostly), integrally suppressed version called NPZ92 for UPP Commandos."
-  - rscadd: "QYJ-72, UPP GPMG, replaces minigun with UPP Minigunners"
-  - rscadd: "Technically resprites but due to changes closer to replaces N-Y revolver with ZHNK-72"
-  - rscadd: "Adds a character custom loadout Type 73, 2 mags spare."
-  - rscadd: "UPP helmets now work as ear protection, intended use with HJRA-12 RPG"
-  - rscadd: "UPP officers now have regular UM4 helmets instead of UH7 helmets in their vendors as UH7 looked ugly with their combat gear"
-  - rscdel: "Removes the PK9 entirely"
-  - rscdel: "Removes tranqs from UPP Commando loadout"
-  - rscdel: "Removes HEAP ammo from UPP officers and commandos, replaced with normal and AP mags when applicable"
-  - balance: "UPP jackets no longer have massive armor, in exchange they no longer slow and in clothing vendors a light version of UPP armor is vendable"
-  - balance: "UPP MPs are now armed with a ZHNK-72 belt on their jacket, with an additional shrapnelshot loader in their belt."
-  - balance: "Rebalances Type 71 damage/firerate/AP to be a sidegrade of M41A, about equal DPS, higher damage per shot and AP, lower fire rate, carbine is round-about the exact same as M41A however."
-  - balance: "Fixes UPP support armor, given to medics on their person and officers in their vendor, lighter version of UPP armor, exchanges protection for speed."
-  - balance: "Seperates SVD bullet damage from crude rifle bullet and buffs it as a hard-hitting AP bullet."
-  - balance: "Rebalances UPP revolver(now ZHNK-72), much harder hitting and has higher AP, but rarer, shrapnelshot extremely rare and good."
-  - balance: "Due to ammo changes, SVD no longer has burst."
-  - balance: "Removes ceramic plates from UPP loadouts"
-  - bugfix: "UPP Major now has the correct UPP Commander skillset"
-  - bugfix: "UPP Commander skillset can BE"
-  - bugfix: "Fixes typepath for UPP support/light armor, actually works now."
-  - spellcheck: "Renames SVD to Type 88"
-  - spellcheck: "Renames UPP Minigunner to UPP Machinegunner"
-  - spellcheck: "Renames UPP jackets to UL4 all around"
-  - soundadd: "Adds firing sounds for Type 73 and SVD/UPP MG"
-  - imageadd: "Resprites the SVD, Type 71, and Type 23, all sprites by wei/esselnek"
-  - imageadd: "Adds sprites for all above guns, all sprites by wei/esselnek"
-  - maptweak: "Changes instances of skorpion to non-upp type 64, also changes instances of ppsh to type 19"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4131.yml b/html/changelogs/AutoChangeLog-pr-4131.yml
deleted file mode 100644
index 807b4ab3b5cf..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4131.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - rscadd: "Telephones can now receive calls from multiple networks."
-  - rscadd: "Adds UPP, CLF and WY prefab phones."
-  - bugfix: "UPP RTO pack is now titled UPP rather than USCM"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4156.yml b/html/changelogs/AutoChangeLog-pr-4156.yml
deleted file mode 100644
index 0c8ec3e3213a..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4156.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Morrow, Frans_Feiffer (beautiful sprites)"
-delete-after: True
-changes:
-  - rscadd: "Added in built HUDs to various helmets"
-  - rscadd: "Sensormates used by squads without medical skills have been converted to buyable helmet optics"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4217.yml b/html/changelogs/AutoChangeLog-pr-4217.yml
deleted file mode 100644
index 8850262fb74c..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4217.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Diegoflores31"
-delete-after: True
-changes:
-  - balance: "Masterkey and underbarrel extinguisher now must be wielded in order to be used."
-  - bugfix: "Underbarrel extinguisher no longer bypass wielding restrictions on flamers."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4231.yml b/html/changelogs/AutoChangeLog-pr-4231.yml
deleted file mode 100644
index 2e36b15aec3e..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4231.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Morrow"
-delete-after: True
-changes:
-  - balance: "You now lose nutrition when gaining blood rather than losing a ton of nutrition when you have low effective blood"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4247.yml b/html/changelogs/AutoChangeLog-pr-4247.yml
deleted file mode 100644
index 502b07ad36ae..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4247.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - code_imp: "Changed backend for the message of walking into an invisible wall to reduce duplication."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml
index 1452b4bdaba0..2384c0125a40 100644
--- a/html/changelogs/archive/2023-08.yml
+++ b/html/changelogs/archive/2023-08.yml
@@ -344,3 +344,69 @@
   realforest2001:
   - rscadd: Added a new lockdown system to research.
   - rscadd: Added an admin button to interact with above.
+2023-08-26:
+  CapCamIII:
+  - rscadd: Adds 6(8 if you're pedantic) new guns for the UPP, details for each in
+      following lines.
+  - rscadd: Type 19, Replacement for PPsh on colonies and black market.
+  - rscadd: Type 64, replacement for scorpion, full sized SMG, 2 versions, 1 for upp,
+      1 for not upp
+  - rscadd: HJRA-12, RPG for UPP.
+  - rscadd: Type 73, pistol for higher ranked UPP troops, UPP COs get a Type 74 which
+      has high-impact rounds, replaces PK9 in non-UPP use.
+  - rscadd: NP92, pistol, replaces PK9 in UPP use(mostly), integrally suppressed version
+      called NPZ92 for UPP Commandos.
+  - rscadd: QYJ-72, UPP GPMG, replaces minigun with UPP Minigunners
+  - rscadd: Technically resprites but due to changes closer to replaces N-Y revolver
+      with ZHNK-72
+  - rscadd: Adds a character custom loadout Type 73, 2 mags spare.
+  - rscadd: UPP helmets now work as ear protection, intended use with HJRA-12 RPG
+  - rscadd: UPP officers now have regular UM4 helmets instead of UH7 helmets in their
+      vendors as UH7 looked ugly with their combat gear
+  - rscdel: Removes the PK9 entirely
+  - rscdel: Removes tranqs from UPP Commando loadout
+  - rscdel: Removes HEAP ammo from UPP officers and commandos, replaced with normal
+      and AP mags when applicable
+  - balance: UPP jackets no longer have massive armor, in exchange they no longer
+      slow and in clothing vendors a light version of UPP armor is vendable
+  - balance: UPP MPs are now armed with a ZHNK-72 belt on their jacket, with an additional
+      shrapnelshot loader in their belt.
+  - balance: Rebalances Type 71 damage/firerate/AP to be a sidegrade of M41A, about
+      equal DPS, higher damage per shot and AP, lower fire rate, carbine is round-about
+      the exact same as M41A however.
+  - balance: Fixes UPP support armor, given to medics on their person and officers
+      in their vendor, lighter version of UPP armor, exchanges protection for speed.
+  - balance: Seperates SVD bullet damage from crude rifle bullet and buffs it as a
+      hard-hitting AP bullet.
+  - balance: Rebalances UPP revolver(now ZHNK-72), much harder hitting and has higher
+      AP, but rarer, shrapnelshot extremely rare and good.
+  - balance: Due to ammo changes, SVD no longer has burst.
+  - balance: Removes ceramic plates from UPP loadouts
+  - bugfix: UPP Major now has the correct UPP Commander skillset
+  - bugfix: UPP Commander skillset can BE
+  - bugfix: Fixes typepath for UPP support/light armor, actually works now.
+  - spellcheck: Renames SVD to Type 88
+  - spellcheck: Renames UPP Minigunner to UPP Machinegunner
+  - spellcheck: Renames UPP jackets to UL4 all around
+  - soundadd: Adds firing sounds for Type 73 and SVD/UPP MG
+  - imageadd: Resprites the SVD, Type 71, and Type 23, all sprites by wei/esselnek
+  - imageadd: Adds sprites for all above guns, all sprites by wei/esselnek
+  - maptweak: Changes instances of skorpion to non-upp type 64, also changes instances
+      of ppsh to type 19
+  Diegoflores31:
+  - balance: Masterkey and underbarrel extinguisher now must be wielded in order to
+      be used.
+  - bugfix: Underbarrel extinguisher no longer bypass wielding restrictions on flamers.
+  Morrow:
+  - balance: You now lose nutrition when gaining blood rather than losing a ton of
+      nutrition when you have low effective blood
+  Morrow, Frans_Feiffer (beautiful sprites):
+  - rscadd: Added in built HUDs to various helmets
+  - rscadd: Sensormates used by squads without medical skills have been converted
+      to buyable helmet optics
+  realforest2001:
+  - code_imp: Changed backend for the message of walking into an invisible wall to
+      reduce duplication.
+  - rscadd: Telephones can now receive calls from multiple networks.
+  - rscadd: Adds UPP, CLF and WY prefab phones.
+  - bugfix: UPP RTO pack is now titled UPP rather than USCM

From 064a3fe398082ad09aa4b627ed2e2750bf9566d7 Mon Sep 17 00:00:00 2001
From: AnuvKH <65099811+AnuvKH@users.noreply.github.com>
Date: Fri, 25 Aug 2023 21:32:13 -0700
Subject: [PATCH 10/22] NV fixes (#4240)

# About the pull request

Removal of deep ocean around the monsoon that was causing players to get
stuck as well as removal of previously hidden incend ammo not caught.

Tested, small map changes only.

# Explain why it's good for the game

As requested.

# Testing Photographs and Procedure

# Changelog

:cl:
maptweak: Fixed deep ocean around NV monsoon, removed incend ammo.
/:cl:
---
 maps/map_files/New_Varadero/New_Varadero.dmm | 970 ++++++++++---------
 1 file changed, 490 insertions(+), 480 deletions(-)

diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm
index 4488d13b9bc7..12eaf10beabc 100644
--- a/maps/map_files/New_Varadero/New_Varadero.dmm
+++ b/maps/map_files/New_Varadero/New_Varadero.dmm
@@ -10422,9 +10422,9 @@
 /area/varadero/interior/hall_SE)
 "gIE" = (
 /obj/structure/flora/bush/ausbushes/var3/fernybush,
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/eastocean)
 "gJs" = (
@@ -12234,14 +12234,29 @@
 /turf/open/gm/dirt,
 /area/varadero/exterior/pontoon_beach)
 "hXg" = (
-/obj/structure/bed/chair{
-	dir = 1
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
 	},
-/obj/structure/machinery/light,
-/turf/open/floor/shiva{
-	icon_state = "green"
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
 	},
-/area/varadero/interior/court)
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/structure/barricade/handrail/wire{
+	layer = 3.1
+	},
+/turf/open/floor/wood,
+/area/varadero/interior/bunks)
 "hXq" = (
 /turf/open/floor/plating/icefloor{
 	icon_state = "asteroidplating"
@@ -20020,9 +20035,9 @@
 /obj/effect/landmark/lv624/fog_blocker{
 	time_to_dispel = 25000
 	},
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/eastocean)
 "mRq" = (
@@ -24543,9 +24558,9 @@
 /obj/effect/landmark/lv624/fog_blocker{
 	time_to_dispel = 25000
 	},
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/eastocean)
 "pOa" = (
@@ -26178,7 +26193,10 @@
 /obj/effect/landmark/lv624/fog_blocker{
 	time_to_dispel = 25000
 	},
-/turf/open/gm/coast/beachcorner2/north_west,
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
+	},
 /area/varadero/exterior/eastocean)
 "qNu" = (
 /turf/open/gm/dirt{
@@ -28386,15 +28404,6 @@
 	},
 /turf/open/auto_turf/sand_white/layer1,
 /area/varadero/interior/caves/east)
-"sfo" = (
-/obj/effect/landmark/lv624/fog_blocker{
-	time_to_dispel = 25000
-	},
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
-	},
-/area/varadero/exterior/eastocean)
 "sfs" = (
 /obj/structure/pipes/standard/simple/hidden/green{
 	dir = 4
@@ -32084,9 +32093,9 @@
 /obj/effect/landmark/lv624/fog_blocker{
 	time_to_dispel = 25000
 	},
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/eastocean)
 "uDw" = (
@@ -32241,7 +32250,8 @@
 /obj/structure/barricade/handrail/wire{
 	layer = 3.1
 	},
-/obj/item/ammo_magazine/handful/shotgun/incendiary,
+/obj/item/ammo_magazine/handful/shotgun/buckshot,
+/obj/item/ammo_magazine/handful/shotgun/buckshot,
 /turf/open/floor/wood,
 /area/varadero/interior/bunks)
 "uIl" = (
@@ -34952,9 +34962,9 @@
 	},
 /obj/structure/blocker/invisible_wall/water,
 /obj/structure/flora/bush/ausbushes/var3/stalkybush,
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/farocean)
 "wkM" = (
@@ -54732,7 +54742,7 @@ eMi
 qRy
 moK
 hPD
-hXg
+uQH
 riJ
 aQc
 qqA
@@ -55298,7 +55308,7 @@ bAE
 kIg
 nmC
 ben
-uIj
+hXg
 hDk
 aZb
 rAy
@@ -67132,9 +67142,9 @@ bGU
 rqg
 gPi
 xeU
-xFb
-sfo
-sfo
+dRs
+spv
+spv
 pNZ
 kyj
 gPi
@@ -67312,15 +67322,15 @@ gPi
 bko
 gPi
 qNr
-xFb
-sfo
-xFb
-sfo
-sfo
-sfo
-xFb
-xFb
-sfo
+dRs
+spv
+dRs
+spv
+spv
+spv
+dRs
+dRs
+spv
 ghN
 pZS
 kyD
@@ -67490,19 +67500,19 @@ qoI
 gPi
 xfQ
 spv
-xFb
+dRs
 uDr
-xFb
+dRs
 uDr
-xFb
-sfo
-xFb
-xFb
-sfo
-sfo
-xFb
-sfo
-sfo
+dRs
+spv
+dRs
+dRs
+spv
+spv
+dRs
+spv
+spv
 ghN
 gRj
 bGU
@@ -67670,21 +67680,21 @@ gPi
 gPi
 xfQ
 bUP
-jFL
-sfo
-xFb
-sfo
-tHc
-sfo
-xFb
-xFb
+bUP
+spv
+dRs
+spv
+ulb
+spv
+dRs
+dRs
 uDr
-sfo
-sfo
-xFb
-xFb
-sfo
-xFb
+spv
+spv
+dRs
+dRs
+spv
+dRs
 veV
 bko
 gPi
@@ -67850,25 +67860,25 @@ bUP
 bUP
 bUP
 bUP
-xFb
-xFb
-sfo
-xFb
-xFb
-sfo
-xFb
-xFb
-sfo
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-sfo
-xFb
-xFb
-sfo
+dRs
+dRs
+spv
+dRs
+dRs
+spv
+dRs
+dRs
+spv
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
+dRs
+dRs
+spv
 hwE
 ghN
 pZS
@@ -68025,33 +68035,33 @@ xFb
 xFb
 dRs
 dRs
-xFb
-xFb
-xFb
-xFb
 dRs
 dRs
-xFb
-xFb
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 uDr
-xFb
-xFb
-sfo
-xFb
-xFb
-sfo
-xFb
-xFb
-xFb
-xFb
-xFb
-sfo
-sfo
-xFb
-sfo
-xFb
-xFb
+dRs
+dRs
+spv
+dRs
+dRs
+spv
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
+spv
+dRs
+spv
+dRs
+dRs
 aaG
 dkS
 qlw
@@ -68201,38 +68211,38 @@ xFb
 xFb
 xFb
 xFb
+dRs
 xFb
 xFb
 xFb
 xFb
-xFb
-xFb
-xFb
-tHc
 dRs
-xFb
-xFb
 dRs
-xFb
-xFb
-sfo
+ulb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
 uDr
-xFb
-xFb
-sfo
-xFb
-xFb
-xFb
-sfo
-sfo
-xFb
-xFb
+dRs
+dRs
+spv
+dRs
+dRs
+dRs
+spv
+spv
+dRs
+dRs
 mRk
-sfo
-xFb
-sfo
-xFb
-xFb
+spv
+dRs
+spv
+dRs
+dRs
 uDr
 ihC
 ghN
@@ -68384,38 +68394,38 @@ xFb
 xFb
 xFb
 xFb
-xFb
-xFb
-xFb
 dRs
 xFb
 xFb
-xFb
 dRs
 xFb
 xFb
-xFb
 dRs
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 uDr
-sfo
-xFb
-xFb
-sfo
-sfo
-xFb
-xFb
-xFb
-sfo
+spv
+dRs
+dRs
+spv
+spv
+dRs
+dRs
+dRs
+spv
 uDr
-sfo
-sfo
-xFb
-xFb
+spv
+spv
+dRs
+dRs
 uDr
-xFb
+dRs
 uDr
-xFb
+dRs
 bUP
 ghN
 bGU
@@ -68572,31 +68582,31 @@ xFb
 xFb
 byC
 xFb
-xFb
-xFb
-xFb
-byC
-xFb
-byC
-xFb
+dRs
+dRs
+dRs
+exX
+dRs
+exX
+dRs
 uDr
-xFb
+dRs
 gIE
-xFb
-xFb
+dRs
+dRs
 uDr
-sfo
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-sfo
-sfo
-xFb
+spv
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
+spv
+dRs
 dRs
 bUP
 veV
@@ -68759,26 +68769,26 @@ xVw
 wBp
 wBp
 wBp
-rYC
+bBV
 wBp
 xBH
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 uDr
-sfo
-xFb
-xFb
-xFb
-xFb
-sfo
+spv
+dRs
+dRs
+dRs
+dRs
+spv
 uDr
 uDr
-xFb
-xFb
+dRs
+dRs
 dRs
 bUP
 bUP
@@ -68934,7 +68944,7 @@ mPk
 mPk
 mPk
 mPk
-mPk
+pRa
 cJL
 mPk
 mPk
@@ -68944,24 +68954,24 @@ mPk
 cJL
 mPk
 wkJ
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-sfo
-sfo
-sfo
-sfo
-sfo
-sfo
-xFb
-xFb
 dRs
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
+spv
+spv
+spv
+spv
+spv
+dRs
+dRs
+dRs
+dRs
 bUP
 ucL
 ghN
@@ -69120,31 +69130,31 @@ mPk
 mPk
 mPk
 mPk
-mPk
+pRa
 mPk
 mPk
 mPk
 mPk
 rYC
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 bUP
 ghN
 bGU
@@ -69306,27 +69316,27 @@ mPk
 mPk
 mPk
 mPk
-cJL
-wBp
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-tHc
+rUa
+mPW
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+ulb
 bUP
 veV
 jTR
@@ -69490,26 +69500,26 @@ mPk
 mPk
 mPk
 xVw
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 bUP
 ghN
 bGU
@@ -69671,153 +69681,138 @@ mPk
 mPk
 mPk
 mPk
-wBp
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-dRs
-xFb
-bUP
-veV
-jTR
-bGU
-bGU
-bGU
-vNB
-rvD
-pGs
-pGs
-pGs
-pGs
-pGs
-pGs
-pGs
-pGs
-pGs
-bsf
-bsf
-bsf
-bsf
-bsf
-ulv
-uvd
-uvd
-uvd
-brT
-kjI
-vNT
-brT
-reA
-brT
-brT
-snS
-kjI
-kjI
-snS
-brT
-brT
-rmS
-brT
-qwU
-nnk
-brT
-uvd
-uvd
-uvd
-brT
-bsf
-bsf
-bsf
-bsf
-bsf
-pGs
-pGs
-pGs
-wUU
-"}
-(175,1,1) = {"
-wUU
-nvv
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-pkl
-kkF
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
+wBp
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+bUP
+veV
+jTR
+bGU
+bGU
+bGU
+vNB
+rvD
+pGs
+pGs
+pGs
+pGs
+pGs
+pGs
+pGs
+pGs
+pGs
+bsf
+bsf
+bsf
+bsf
+bsf
+ulv
+uvd
+uvd
+uvd
+brT
+kjI
+vNT
+brT
+reA
+brT
+brT
+snS
+kjI
+kjI
+snS
+brT
+brT
+rmS
+brT
+qwU
+nnk
+brT
+uvd
+uvd
+uvd
+brT
+bsf
+bsf
+bsf
+bsf
+bsf
+pGs
+pGs
+pGs
+wUU
+"}
+(175,1,1) = {"
+wUU
+nvv
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+pkl
+kkF
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
 mPk
 mPk
 mPk
@@ -69853,27 +69848,42 @@ mPk
 mPk
 mPk
 mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+pRa
 wBp
 byC
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 xFb
 xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-dRs
 bUP
 bUP
 ghN
@@ -70038,26 +70048,26 @@ mPk
 rYC
 xFb
 xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 xFb
 xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
+dRs
+dRs
 tHc
-bUP
+jFL
 ghN
 bGU
 bGU
@@ -70222,24 +70232,24 @@ byC
 xFb
 xFb
 xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 xFb
+dRs
+dRs
 xFb
+dRs
 xFb
+dRs
+dRs
 xFb
 xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-bUP
+jFL
 ghN
 vNB
 rvD
@@ -70402,18 +70412,18 @@ mPk
 wBp
 xFb
 xFb
-xFb
+dRs
 xFb
 byC
+dRs
 xFb
-xFb
-xFb
+dRs
 byC
 xFb
 xFb
-xFb
+dRs
 byC
-xFb
+dRs
 xFb
 byC
 xFb
@@ -70766,6 +70776,7 @@ mPk
 mPk
 mPk
 mPk
+pRa
 mPk
 mPk
 mPk
@@ -70775,14 +70786,13 @@ mPk
 mPk
 mPk
 mPk
-mPk
-mPk
+pRa
 cJL
 mPk
 mPk
 mPk
 cJL
-mPk
+pRa
 mPk
 mPk
 mPk
@@ -70951,10 +70961,10 @@ mPk
 mPk
 mPk
 mPk
+pRa
 mPk
-mPk
-mPk
-mPk
+pRa
+pRa
 mPk
 mPk
 mPk

From ee759f48a01929bc0402616b55883da12cb21cfa Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 26 Aug 2023 05:41:15 +0100
Subject: [PATCH 11/22] Automatic changelog for PR #4240 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4240.yml b/html/changelogs/AutoChangeLog-pr-4240.yml
new file mode 100644
index 000000000000..0d16d08789da
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4240.yml
@@ -0,0 +1,4 @@
+author: "AnuvKH"
+delete-after: True
+changes:
+  - maptweak: "Fixed deep ocean around NV monsoon, removed incend ammo."
\ No newline at end of file

From 8f9a5e5336db7ddd05950853358677ed7bc1b16c Mon Sep 17 00:00:00 2001
From: morrowwolf <darthbane97@gmail.com>
Date: Sat, 26 Aug 2023 05:48:46 -0400
Subject: [PATCH 12/22] Ghost scan health nerf round 2 (#4256)

# About the pull request

Sneaky fellas were waiting to be revived and then scanning health before
re-entering the body which bypassed the previous checks. Naughty
naughty.


# Explain why it's good for the game

Not intentional.


# 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
fix: fixed a bypass to allow ghost scan health when it should not be
allowed
/: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 405dea1772f0..f1244ccc6de5 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -558,7 +558,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	var/mob/living/carbon/human/original_human = mind.original
 
-	if(!original_human.check_tod() || !original_human.is_revivable() || !can_reenter_corpse)
+	if((original_human.stat == DEAD && !original_human.check_tod() || !original_human.is_revivable()) || !can_reenter_corpse)
 		view_health_scan(target)
 		return
 

From 5a11ddb0a34eccc8700e4c11839e4448085c40ed Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 26 Aug 2023 10:57:58 +0100
Subject: [PATCH 13/22] Automatic changelog for PR #4256 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4256.yml b/html/changelogs/AutoChangeLog-pr-4256.yml
new file mode 100644
index 000000000000..f66857dad5fc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4256.yml
@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - bugfix: "fixed a bypass to allow ghost scan health when it should not be allowed"
\ No newline at end of file

From 60e83f87b7daec3b819c31e10febc6ef65fa51c6 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Sat, 26 Aug 2023 12:51:16 +0200
Subject: [PATCH 14/22] gives UPP SL normal bag with some basic loudout (#4127)

# About the pull request

UPP SL had only empty JIMA flag bag that is tiny and useless. Now they
get normal UPP bag with mini fire extinguisher three WP , two snacks and
on AP mag.

# Explain why it's good for the game

SL should not start with less stuff then normal soldier.


# 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: UPP SL gets proper bag with mini fire extinguisher three WP
grenades , two snacks and an AP mag
/:cl:
---
 code/modules/gear_presets/upp.dm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index 4248a5e0a1be..58ee8b0156fa 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -804,7 +804,14 @@
 /datum/equipment_preset/upp/leader/load_gear(mob/living/carbon/human/new_human)
 	var/UPPleadsidearm = rand(1,4)
 	//back
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/jima, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) //0.66
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //1.33
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //2
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //2.66
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //4
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_BACK) //5
 	//face
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
 	//head

From 607268a1d07851d538fba2a49fd19411e2010d5b Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 26 Aug 2023 11:59:34 +0100
Subject: [PATCH 15/22] Automatic changelog for PR #4127 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4127.yml b/html/changelogs/AutoChangeLog-pr-4127.yml
new file mode 100644
index 000000000000..03f1a6c567ea
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4127.yml
@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+  - rscadd: "UPP SL gets proper bag with mini fire extinguisher three WP grenades , two snacks and an AP mag"
\ No newline at end of file

From 72d4396d2a24904b2aaf0d7408a88c1dd96491f1 Mon Sep 17 00:00:00 2001
From: Diegoflores31 <47069269+Diegoflores31@users.noreply.github.com>
Date: Sat, 26 Aug 2023 07:22:52 -0500
Subject: [PATCH 16/22] eyecheck fix (#4212)

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

# Explain why it's good for the game
fixes #4190
bug 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: Glasses with flash protection can no longer be used for welding.
refactor: Adds defines for negative welding protection.
/:cl:

---------

Co-authored-by: harryob <me@harryob.live>
---
 code/__DEFINES/conflict.dm                    |  1 +
 .../objects/items/tools/maintenance_tools.dm  | 19 ++++++++++++-------
 code/modules/clothing/glasses/night.dm        |  1 +
 code/modules/clothing/glasses/thermal.dm      |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm
index ed261184d9d3..241bcb469622 100644
--- a/code/__DEFINES/conflict.dm
+++ b/code/__DEFINES/conflict.dm
@@ -220,6 +220,7 @@
 #define UNIFORM_HAS_SENSORS 1
 #define UNIFORM_FORCED_SENSORS 2
 
+#define EYE_PROTECTION_NEGATIVE -1
 #define EYE_PROTECTION_NONE 0
 #define EYE_PROTECTION_FLAVOR 1
 #define EYE_PROTECTION_FLASH 2
diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm
index b8affb0de616..bdc72b2a8ee5 100644
--- a/code/game/objects/items/tools/maintenance_tools.dm
+++ b/code/game/objects/items/tools/maintenance_tools.dm
@@ -380,22 +380,27 @@
 		if(E.robotic == ORGAN_ROBOT)
 			return
 		switch(safety)
-			if(1)
+			if(EYE_PROTECTION_FLASH)
+				to_chat(user, SPAN_DANGER("You see a bright light in the corner of your vision."))
+				E.take_damage(rand(0, 1), TRUE)
+				if(E.damage > 10)
+					E.take_damage(rand(3, 5), TRUE)
+			if(EYE_PROTECTION_FLAVOR)
 				to_chat(user, SPAN_DANGER("Your eyes sting a little."))
 				E.take_damage(rand(1, 2), TRUE)
-				if(E.damage > 12)
-					H.AdjustEyeBlur(3,6)
-			if(0)
+				if(E.damage > 8) // dont abuse your funny flavor glasses
+					E.take_damage(2, TRUE)
+			if(EYE_PROTECTION_NONE)
 				to_chat(user, SPAN_WARNING("Your eyes burn."))
-				E.take_damage(rand(2, 4), TRUE)
+				E.take_damage(rand(3, 4), TRUE)
 				if(E.damage > 10)
 					E.take_damage(rand(4, 10), TRUE)
-			if(-1)
+			if(EYE_PROTECTION_NEGATIVE)
 				to_chat(user, SPAN_WARNING("Your thermals intensify [src]'s glow. Your eyes itch and burn severely."))
 				H.AdjustEyeBlur(12,20)
 				E.take_damage(rand(12, 16), TRUE)
 
-		if(safety < 2)
+		if(safety < EYE_PROTECTION_WELDING)
 			if (E.damage >= E.min_broken_damage)
 				to_chat(H, SPAN_WARNING("You go blind! Maybe welding without protection wasn't such a great idea..."))
 				return FALSE
diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm
index 63d0c8f364af..afb711c3ca15 100644
--- a/code/modules/clothing/glasses/night.dm
+++ b/code/modules/clothing/glasses/night.dm
@@ -15,6 +15,7 @@
 	vision_flags = SEE_TURFS
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	fullscreen_vision = null
+	eye_protection = EYE_PROTECTION_NEGATIVE
 
 /obj/item/clothing/glasses/night/helmet //for the integrated NVGs that are in helmetgarb code
 	name = "\improper M2 night vision goggles"
diff --git a/code/modules/clothing/glasses/thermal.dm b/code/modules/clothing/glasses/thermal.dm
index bfc60d271724..b2ec7597e270 100644
--- a/code/modules/clothing/glasses/thermal.dm
+++ b/code/modules/clothing/glasses/thermal.dm
@@ -12,7 +12,7 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	darkness_view = 12
 	invisa_view = 2
-	eye_protection = -1
+	eye_protection = EYE_PROTECTION_NEGATIVE
 	deactive_state = "goggles_off"
 	fullscreen_vision = /atom/movable/screen/fullscreen/thermal
 	var/blinds_on_emp = TRUE

From 6b78d2f97fa7cafd7ceaf6a4cc0f1a19730fe04f Mon Sep 17 00:00:00 2001
From: cm13-github <128137806+cm13-github@users.noreply.github.com>
Date: Sat, 26 Aug 2023 13:30:54 +0100
Subject: [PATCH 17/22] Automatic changelog for PR #4212 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-4212.yml b/html/changelogs/AutoChangeLog-pr-4212.yml
new file mode 100644
index 000000000000..413054d5522c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4212.yml
@@ -0,0 +1,5 @@
+author: "Diegoflores31"
+delete-after: True
+changes:
+  - bugfix: "Glasses with flash protection can no longer be used for welding."
+  - refactor: "Adds defines for negative welding protection."
\ No newline at end of file

From f4709d5f5126a9386d500a9698fe14cd461193c8 Mon Sep 17 00:00:00 2001
From: Steelpoint <alexander.henley@hotmai.com>
Date: Sun, 27 Aug 2023 00:37:37 +0800
Subject: [PATCH 18/22] FixCommit

---
 maps/map_files/LV624/LV624.dmm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index c0babffe0d94..c3e2f65aab04 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -10305,7 +10305,6 @@
 "aSQ" = (
 /obj/structure/safe/floor{
 	name = "safe";
-	pixel_x = 30;
 	spawnkey = 0
 	},
 /turf/open/floor{

From 97d366de72c925162a5c701d825510daeaa395ca Mon Sep 17 00:00:00 2001
From: Steelpoint <alexander.henley@hotmai.com>
Date: Sun, 27 Aug 2023 00:47:48 +0800
Subject: [PATCH 19/22] FixCommit

---
 .github/workflows/autowiki.yml                |   5 +-
 code/__DEFINES/conflict.dm                    |   3 +
 .../objects/items/tools/maintenance_tools.dm  |  19 +-
 code/game/objects/structures/blocker.dm       |   9 +-
 code/modules/clothing/glasses/night.dm        |   1 +
 code/modules/clothing/glasses/thermal.dm      |   2 +-
 code/modules/gear_presets/upp.dm              |   9 +-
 code/modules/mob/dead/observer/observer.dm    |   2 +-
 code/modules/mob/living/blood.dm              |   9 +-
 code/modules/projectiles/gun.dm               |  17 +-
 code/modules/projectiles/gun_attachables.dm   |   7 +-
 html/changelogs/AutoChangeLog-pr-3865.yml     |  35 -
 html/changelogs/AutoChangeLog-pr-4127.yml     |   4 +
 html/changelogs/AutoChangeLog-pr-4131.yml     |   6 -
 html/changelogs/AutoChangeLog-pr-4156.yml     |   5 -
 html/changelogs/AutoChangeLog-pr-4212.yml     |   5 +
 html/changelogs/AutoChangeLog-pr-4240.yml     |   4 +
 html/changelogs/AutoChangeLog-pr-4256.yml     |   4 +
 html/changelogs/archive/2023-08.yml           |  66 ++
 maps/map_files/LV624/LV624.dmm                |   1 -
 maps/map_files/New_Varadero/New_Varadero.dmm  | 976 +++++++++---------
 21 files changed, 624 insertions(+), 565 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-3865.yml
 create mode 100644 html/changelogs/AutoChangeLog-pr-4127.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4131.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4156.yml
 create mode 100644 html/changelogs/AutoChangeLog-pr-4212.yml
 create mode 100644 html/changelogs/AutoChangeLog-pr-4240.yml
 create mode 100644 html/changelogs/AutoChangeLog-pr-4256.yml

diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml
index 82d0ac76f32f..91ab12cdb19f 100644
--- a/.github/workflows/autowiki.yml
+++ b/.github/workflows/autowiki.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   autowiki:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: "Check for AUTOWIKI_USERNAME"
       id: secrets_set
@@ -30,9 +30,6 @@ jobs:
     - name: Install rust-g
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       run: |
-        sudo dpkg --add-architecture i386
-        sudo apt update || true
-        sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
         bash tools/ci/install_rust_g.sh
     - name: Compile and generate Autowiki files
       if: steps.secrets_set.outputs.SECRETS_ENABLED
diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm
index 30b2627bb1b0..241bcb469622 100644
--- a/code/__DEFINES/conflict.dm
+++ b/code/__DEFINES/conflict.dm
@@ -90,6 +90,8 @@
 #define ATTACH_IGNORE_EMPTY (1<<5)
 /// This attachment should activate if you attack() with it attached.
 #define ATTACH_MELEE (1<<6)
+/// Override for attachies so you can fire them with a single hand . ONLY FOR PROJECTILES!!
+#define ATTACH_WIELD_OVERRIDE (1<<7)
 
 //Ammo magazine defines, for flags_magazine
 
@@ -218,6 +220,7 @@
 #define UNIFORM_HAS_SENSORS 1
 #define UNIFORM_FORCED_SENSORS 2
 
+#define EYE_PROTECTION_NEGATIVE -1
 #define EYE_PROTECTION_NONE 0
 #define EYE_PROTECTION_FLAVOR 1
 #define EYE_PROTECTION_FLASH 2
diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm
index b8affb0de616..bdc72b2a8ee5 100644
--- a/code/game/objects/items/tools/maintenance_tools.dm
+++ b/code/game/objects/items/tools/maintenance_tools.dm
@@ -380,22 +380,27 @@
 		if(E.robotic == ORGAN_ROBOT)
 			return
 		switch(safety)
-			if(1)
+			if(EYE_PROTECTION_FLASH)
+				to_chat(user, SPAN_DANGER("You see a bright light in the corner of your vision."))
+				E.take_damage(rand(0, 1), TRUE)
+				if(E.damage > 10)
+					E.take_damage(rand(3, 5), TRUE)
+			if(EYE_PROTECTION_FLAVOR)
 				to_chat(user, SPAN_DANGER("Your eyes sting a little."))
 				E.take_damage(rand(1, 2), TRUE)
-				if(E.damage > 12)
-					H.AdjustEyeBlur(3,6)
-			if(0)
+				if(E.damage > 8) // dont abuse your funny flavor glasses
+					E.take_damage(2, TRUE)
+			if(EYE_PROTECTION_NONE)
 				to_chat(user, SPAN_WARNING("Your eyes burn."))
-				E.take_damage(rand(2, 4), TRUE)
+				E.take_damage(rand(3, 4), TRUE)
 				if(E.damage > 10)
 					E.take_damage(rand(4, 10), TRUE)
-			if(-1)
+			if(EYE_PROTECTION_NEGATIVE)
 				to_chat(user, SPAN_WARNING("Your thermals intensify [src]'s glow. Your eyes itch and burn severely."))
 				H.AdjustEyeBlur(12,20)
 				E.take_damage(rand(12, 16), TRUE)
 
-		if(safety < 2)
+		if(safety < EYE_PROTECTION_WELDING)
 			if (E.damage >= E.min_broken_damage)
 				to_chat(H, SPAN_WARNING("You go blind! Maybe welding without protection wasn't such a great idea..."))
 				return FALSE
diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm
index aadf6d2a099e..a9e7371d7055 100644
--- a/code/game/objects/structures/blocker.dm
+++ b/code/game/objects/structures/blocker.dm
@@ -25,7 +25,10 @@
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/structure/blocker/invisible_wall/Collided(atom/movable/AM)
-	to_chat(AM, SPAN_WARNING("You cannot go this way."))
+	var/msg = desc
+	if(!msg)
+		msg = "You cannot go this way."
+	to_chat(AM, SPAN_WARNING(msg))
 
 /obj/structure/blocker/invisible_wall/New()
 	..()
@@ -35,10 +38,6 @@
 	desc = "You cannot wade out any further"
 	icon_state = "map_blocker"
 
-/obj/structure/blocker/invisible_wall/water/Collided(atom/movable/AM)
-	to_chat(AM, SPAN_WARNING("You cannot wade out any further."))
-
-
 /obj/structure/blocker/fog
 	name = "dense fog"
 	desc = "It looks way too dangerous to traverse. Best wait until it has cleared up."
diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm
index 63d0c8f364af..afb711c3ca15 100644
--- a/code/modules/clothing/glasses/night.dm
+++ b/code/modules/clothing/glasses/night.dm
@@ -15,6 +15,7 @@
 	vision_flags = SEE_TURFS
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	fullscreen_vision = null
+	eye_protection = EYE_PROTECTION_NEGATIVE
 
 /obj/item/clothing/glasses/night/helmet //for the integrated NVGs that are in helmetgarb code
 	name = "\improper M2 night vision goggles"
diff --git a/code/modules/clothing/glasses/thermal.dm b/code/modules/clothing/glasses/thermal.dm
index bfc60d271724..b2ec7597e270 100644
--- a/code/modules/clothing/glasses/thermal.dm
+++ b/code/modules/clothing/glasses/thermal.dm
@@ -12,7 +12,7 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	darkness_view = 12
 	invisa_view = 2
-	eye_protection = -1
+	eye_protection = EYE_PROTECTION_NEGATIVE
 	deactive_state = "goggles_off"
 	fullscreen_vision = /atom/movable/screen/fullscreen/thermal
 	var/blinds_on_emp = TRUE
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index 4248a5e0a1be..58ee8b0156fa 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -804,7 +804,14 @@
 /datum/equipment_preset/upp/leader/load_gear(mob/living/carbon/human/new_human)
 	var/UPPleadsidearm = rand(1,4)
 	//back
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/jima, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) //0.66
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //1.33
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //2
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //2.66
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //4
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_BACK) //5
 	//face
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
 	//head
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 405dea1772f0..f1244ccc6de5 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -558,7 +558,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	var/mob/living/carbon/human/original_human = mind.original
 
-	if(!original_human.check_tod() || !original_human.is_revivable() || !can_reenter_corpse)
+	if((original_human.stat == DEAD && !original_human.check_tod() || !original_human.is_revivable()) || !can_reenter_corpse)
 		view_health_scan(target)
 		return
 
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index a6062276bd8e..ab3ce823c68e 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -12,8 +12,9 @@
 
 	if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood.
 		//Blood regeneration if there is some space
-		if(blood_volume < max_blood)
+		if(blood_volume < max_blood && nutrition >= 1)
 			blood_volume += 0.1 // regenerate blood VERY slowly
+			nutrition -= 0.25
 		else if(blood_volume > max_blood)
 			blood_volume -= 0.1 // The reverse in case we've gotten too much blood in our body
 			if(blood_volume > limit_blood)
@@ -43,12 +44,6 @@
 			if(oxyloss < maximum_oxyloss)
 				oxyloss += round(max(additional_oxyloss, 0))
 
-			//Bloodloss effects on nutrition
-			if(nutrition >= 300)
-				nutrition -= 10
-			else if(nutrition >= 200)
-				nutrition -= 3
-
 		switch(b_volume)
 			if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
 				if(prob(1))
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 257edd9a7720..8cbcc99838cd 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1343,11 +1343,10 @@ and you're good to go.
 
 	//The following relating to bursts was borrowed from Fire code.
 	var/check_for_attachment_fire = FALSE
-	if(active_attachable)
-		if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
-			check_for_attachment_fire = TRUE
-		else
-			active_attachable.activate_attachment(src, null, TRUE)//No way.
+	if(active_attachable?.flags_attach_features & ATTACH_PROJECTILE)
+		check_for_attachment_fire = TRUE
+	else
+		active_attachable.activate_attachment(src, null, TRUE)//No way.
 
 
 	var/bullets_to_fire = 1
@@ -1512,8 +1511,12 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed
 		if(flags_gun_features & GUN_TRIGGER_SAFETY)
 			to_chat(user, SPAN_WARNING("The safety is on!"))
 			return
-
-		if((flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(flags_item & WIELDED)) //If we're not holding the weapon with both hands when we should.
+		if(active_attachable)
+			if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
+				if(!(active_attachable.flags_attach_features & ATTACH_WIELD_OVERRIDE) && !(flags_item & WIELDED))
+					to_chat(user, SPAN_WARNING("You must wield [src] to fire [active_attachable]!"))
+					return
+		if((flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(flags_item & WIELDED) && !active_attachable) //If we're not holding the weapon with both hands when we should.
 			to_chat(user, SPAN_WARNING("You need a more secure grip to fire this weapon!"))
 			return
 
diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
index adaa5ba1dee3..88defe14c5ef 100644
--- a/code/modules/projectiles/gun_attachables.dm
+++ b/code/modules/projectiles/gun_attachables.dm
@@ -2363,7 +2363,7 @@ Defined in conflicts.dm of the #defines folder.
 	var/obj/item/weapon/gun/attached_gun = loc
 
 	if(!(attached_gun.flags_item & WIELDED))
-		to_chat(user, SPAN_WARNING("You must wield \the [attached_gun] to fire \the [src]!"))
+		to_chat(user, SPAN_WARNING("You must wield [attached_gun] to fire [src]!"))
 		return
 
 	if(current_rounds > round_usage_per_tile && ..())
@@ -2509,6 +2509,9 @@ Defined in conflicts.dm of the #defines folder.
 /obj/item/attachable/attached_gun/extinguisher/fire_attachment(atom/target, obj/item/weapon/gun/gun, mob/living/user)
 	if(!internal_extinguisher)
 		return
+	if(!(gun.flags_item & WIELDED))
+		to_chat(user, SPAN_WARNING("You must wield [gun] to fire [src]!"))
+		return
 	if(..())
 		return internal_extinguisher.afterattack(target, user)
 
@@ -2569,7 +2572,7 @@ Defined in conflicts.dm of the #defines folder.
 		return
 
 	if((gun.flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(gun.flags_item & WIELDED))
-		to_chat(user, SPAN_WARNING("You need a more secure grip to fire this weapon!"))
+		to_chat(user, SPAN_WARNING("You must wield [gun] to fire [src]!"))
 		return
 
 	if(gun.flags_gun_features & GUN_TRIGGER_SAFETY)
diff --git a/html/changelogs/AutoChangeLog-pr-3865.yml b/html/changelogs/AutoChangeLog-pr-3865.yml
deleted file mode 100644
index b9f40a81c133..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3865.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-author: "CapCamIII"
-delete-after: True
-changes:
-  - rscadd: "Adds 6(8 if you're pedantic) new guns for the UPP, details for each in following lines."
-  - rscadd: "Type 19, Replacement for PPsh on colonies and black market."
-  - rscadd: "Type 64, replacement for scorpion, full sized SMG, 2 versions, 1 for upp, 1 for not upp"
-  - rscadd: "HJRA-12, RPG for UPP."
-  - rscadd: "Type 73, pistol for higher ranked UPP troops, UPP COs get a Type 74 which has high-impact rounds, replaces PK9 in non-UPP use."
-  - rscadd: "NP92, pistol, replaces PK9 in UPP use(mostly), integrally suppressed version called NPZ92 for UPP Commandos."
-  - rscadd: "QYJ-72, UPP GPMG, replaces minigun with UPP Minigunners"
-  - rscadd: "Technically resprites but due to changes closer to replaces N-Y revolver with ZHNK-72"
-  - rscadd: "Adds a character custom loadout Type 73, 2 mags spare."
-  - rscadd: "UPP helmets now work as ear protection, intended use with HJRA-12 RPG"
-  - rscadd: "UPP officers now have regular UM4 helmets instead of UH7 helmets in their vendors as UH7 looked ugly with their combat gear"
-  - rscdel: "Removes the PK9 entirely"
-  - rscdel: "Removes tranqs from UPP Commando loadout"
-  - rscdel: "Removes HEAP ammo from UPP officers and commandos, replaced with normal and AP mags when applicable"
-  - balance: "UPP jackets no longer have massive armor, in exchange they no longer slow and in clothing vendors a light version of UPP armor is vendable"
-  - balance: "UPP MPs are now armed with a ZHNK-72 belt on their jacket, with an additional shrapnelshot loader in their belt."
-  - balance: "Rebalances Type 71 damage/firerate/AP to be a sidegrade of M41A, about equal DPS, higher damage per shot and AP, lower fire rate, carbine is round-about the exact same as M41A however."
-  - balance: "Fixes UPP support armor, given to medics on their person and officers in their vendor, lighter version of UPP armor, exchanges protection for speed."
-  - balance: "Seperates SVD bullet damage from crude rifle bullet and buffs it as a hard-hitting AP bullet."
-  - balance: "Rebalances UPP revolver(now ZHNK-72), much harder hitting and has higher AP, but rarer, shrapnelshot extremely rare and good."
-  - balance: "Due to ammo changes, SVD no longer has burst."
-  - balance: "Removes ceramic plates from UPP loadouts"
-  - bugfix: "UPP Major now has the correct UPP Commander skillset"
-  - bugfix: "UPP Commander skillset can BE"
-  - bugfix: "Fixes typepath for UPP support/light armor, actually works now."
-  - spellcheck: "Renames SVD to Type 88"
-  - spellcheck: "Renames UPP Minigunner to UPP Machinegunner"
-  - spellcheck: "Renames UPP jackets to UL4 all around"
-  - soundadd: "Adds firing sounds for Type 73 and SVD/UPP MG"
-  - imageadd: "Resprites the SVD, Type 71, and Type 23, all sprites by wei/esselnek"
-  - imageadd: "Adds sprites for all above guns, all sprites by wei/esselnek"
-  - maptweak: "Changes instances of skorpion to non-upp type 64, also changes instances of ppsh to type 19"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4127.yml b/html/changelogs/AutoChangeLog-pr-4127.yml
new file mode 100644
index 000000000000..03f1a6c567ea
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4127.yml
@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+  - rscadd: "UPP SL gets proper bag with mini fire extinguisher three WP grenades , two snacks and an AP mag"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4131.yml b/html/changelogs/AutoChangeLog-pr-4131.yml
deleted file mode 100644
index 807b4ab3b5cf..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4131.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - rscadd: "Telephones can now receive calls from multiple networks."
-  - rscadd: "Adds UPP, CLF and WY prefab phones."
-  - bugfix: "UPP RTO pack is now titled UPP rather than USCM"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4156.yml b/html/changelogs/AutoChangeLog-pr-4156.yml
deleted file mode 100644
index 0c8ec3e3213a..000000000000
--- a/html/changelogs/AutoChangeLog-pr-4156.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Morrow, Frans_Feiffer (beautiful sprites)"
-delete-after: True
-changes:
-  - rscadd: "Added in built HUDs to various helmets"
-  - rscadd: "Sensormates used by squads without medical skills have been converted to buyable helmet optics"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4212.yml b/html/changelogs/AutoChangeLog-pr-4212.yml
new file mode 100644
index 000000000000..413054d5522c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4212.yml
@@ -0,0 +1,5 @@
+author: "Diegoflores31"
+delete-after: True
+changes:
+  - bugfix: "Glasses with flash protection can no longer be used for welding."
+  - refactor: "Adds defines for negative welding protection."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4240.yml b/html/changelogs/AutoChangeLog-pr-4240.yml
new file mode 100644
index 000000000000..0d16d08789da
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4240.yml
@@ -0,0 +1,4 @@
+author: "AnuvKH"
+delete-after: True
+changes:
+  - maptweak: "Fixed deep ocean around NV monsoon, removed incend ammo."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4256.yml b/html/changelogs/AutoChangeLog-pr-4256.yml
new file mode 100644
index 000000000000..f66857dad5fc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4256.yml
@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - bugfix: "fixed a bypass to allow ghost scan health when it should not be allowed"
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml
index 1452b4bdaba0..2384c0125a40 100644
--- a/html/changelogs/archive/2023-08.yml
+++ b/html/changelogs/archive/2023-08.yml
@@ -344,3 +344,69 @@
   realforest2001:
   - rscadd: Added a new lockdown system to research.
   - rscadd: Added an admin button to interact with above.
+2023-08-26:
+  CapCamIII:
+  - rscadd: Adds 6(8 if you're pedantic) new guns for the UPP, details for each in
+      following lines.
+  - rscadd: Type 19, Replacement for PPsh on colonies and black market.
+  - rscadd: Type 64, replacement for scorpion, full sized SMG, 2 versions, 1 for upp,
+      1 for not upp
+  - rscadd: HJRA-12, RPG for UPP.
+  - rscadd: Type 73, pistol for higher ranked UPP troops, UPP COs get a Type 74 which
+      has high-impact rounds, replaces PK9 in non-UPP use.
+  - rscadd: NP92, pistol, replaces PK9 in UPP use(mostly), integrally suppressed version
+      called NPZ92 for UPP Commandos.
+  - rscadd: QYJ-72, UPP GPMG, replaces minigun with UPP Minigunners
+  - rscadd: Technically resprites but due to changes closer to replaces N-Y revolver
+      with ZHNK-72
+  - rscadd: Adds a character custom loadout Type 73, 2 mags spare.
+  - rscadd: UPP helmets now work as ear protection, intended use with HJRA-12 RPG
+  - rscadd: UPP officers now have regular UM4 helmets instead of UH7 helmets in their
+      vendors as UH7 looked ugly with their combat gear
+  - rscdel: Removes the PK9 entirely
+  - rscdel: Removes tranqs from UPP Commando loadout
+  - rscdel: Removes HEAP ammo from UPP officers and commandos, replaced with normal
+      and AP mags when applicable
+  - balance: UPP jackets no longer have massive armor, in exchange they no longer
+      slow and in clothing vendors a light version of UPP armor is vendable
+  - balance: UPP MPs are now armed with a ZHNK-72 belt on their jacket, with an additional
+      shrapnelshot loader in their belt.
+  - balance: Rebalances Type 71 damage/firerate/AP to be a sidegrade of M41A, about
+      equal DPS, higher damage per shot and AP, lower fire rate, carbine is round-about
+      the exact same as M41A however.
+  - balance: Fixes UPP support armor, given to medics on their person and officers
+      in their vendor, lighter version of UPP armor, exchanges protection for speed.
+  - balance: Seperates SVD bullet damage from crude rifle bullet and buffs it as a
+      hard-hitting AP bullet.
+  - balance: Rebalances UPP revolver(now ZHNK-72), much harder hitting and has higher
+      AP, but rarer, shrapnelshot extremely rare and good.
+  - balance: Due to ammo changes, SVD no longer has burst.
+  - balance: Removes ceramic plates from UPP loadouts
+  - bugfix: UPP Major now has the correct UPP Commander skillset
+  - bugfix: UPP Commander skillset can BE
+  - bugfix: Fixes typepath for UPP support/light armor, actually works now.
+  - spellcheck: Renames SVD to Type 88
+  - spellcheck: Renames UPP Minigunner to UPP Machinegunner
+  - spellcheck: Renames UPP jackets to UL4 all around
+  - soundadd: Adds firing sounds for Type 73 and SVD/UPP MG
+  - imageadd: Resprites the SVD, Type 71, and Type 23, all sprites by wei/esselnek
+  - imageadd: Adds sprites for all above guns, all sprites by wei/esselnek
+  - maptweak: Changes instances of skorpion to non-upp type 64, also changes instances
+      of ppsh to type 19
+  Diegoflores31:
+  - balance: Masterkey and underbarrel extinguisher now must be wielded in order to
+      be used.
+  - bugfix: Underbarrel extinguisher no longer bypass wielding restrictions on flamers.
+  Morrow:
+  - balance: You now lose nutrition when gaining blood rather than losing a ton of
+      nutrition when you have low effective blood
+  Morrow, Frans_Feiffer (beautiful sprites):
+  - rscadd: Added in built HUDs to various helmets
+  - rscadd: Sensormates used by squads without medical skills have been converted
+      to buyable helmet optics
+  realforest2001:
+  - code_imp: Changed backend for the message of walking into an invisible wall to
+      reduce duplication.
+  - rscadd: Telephones can now receive calls from multiple networks.
+  - rscadd: Adds UPP, CLF and WY prefab phones.
+  - bugfix: UPP RTO pack is now titled UPP rather than USCM
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index c0babffe0d94..c3e2f65aab04 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -10305,7 +10305,6 @@
 "aSQ" = (
 /obj/structure/safe/floor{
 	name = "safe";
-	pixel_x = 30;
 	spawnkey = 0
 	},
 /turf/open/floor{
diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm
index 4488d13b9bc7..440acf79a7e9 100644
--- a/maps/map_files/New_Varadero/New_Varadero.dmm
+++ b/maps/map_files/New_Varadero/New_Varadero.dmm
@@ -10422,9 +10422,9 @@
 /area/varadero/interior/hall_SE)
 "gIE" = (
 /obj/structure/flora/bush/ausbushes/var3/fernybush,
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/eastocean)
 "gJs" = (
@@ -12233,15 +12233,6 @@
 	},
 /turf/open/gm/dirt,
 /area/varadero/exterior/pontoon_beach)
-"hXg" = (
-/obj/structure/bed/chair{
-	dir = 1
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/shiva{
-	icon_state = "green"
-	},
-/area/varadero/interior/court)
 "hXq" = (
 /turf/open/floor/plating/icefloor{
 	icon_state = "asteroidplating"
@@ -19811,6 +19802,30 @@
 	icon_state = "redfull"
 	},
 /area/varadero/interior/medical)
+"mKK" = (
+/obj/structure/window/reinforced{
+	dir = 4;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	layer = 3.3;
+	pixel_y = 4
+	},
+/obj/structure/bed{
+	can_buckle = 0
+	},
+/obj/structure/bed{
+	buckling_y = 13;
+	layer = 3.5;
+	pixel_y = 13
+	},
+/obj/structure/barricade/handrail/wire{
+	layer = 3.1
+	},
+/turf/open/floor/wood,
+/area/varadero/interior/bunks)
 "mLg" = (
 /obj/structure/platform_decoration/kutjevo,
 /turf/open/gm/river/ocean{
@@ -20020,9 +20035,9 @@
 /obj/effect/landmark/lv624/fog_blocker{
 	time_to_dispel = 25000
 	},
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/eastocean)
 "mRq" = (
@@ -24543,9 +24558,9 @@
 /obj/effect/landmark/lv624/fog_blocker{
 	time_to_dispel = 25000
 	},
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/eastocean)
 "pOa" = (
@@ -26178,7 +26193,10 @@
 /obj/effect/landmark/lv624/fog_blocker{
 	time_to_dispel = 25000
 	},
-/turf/open/gm/coast/beachcorner2/north_west,
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
+	},
 /area/varadero/exterior/eastocean)
 "qNu" = (
 /turf/open/gm/dirt{
@@ -28386,15 +28404,6 @@
 	},
 /turf/open/auto_turf/sand_white/layer1,
 /area/varadero/interior/caves/east)
-"sfo" = (
-/obj/effect/landmark/lv624/fog_blocker{
-	time_to_dispel = 25000
-	},
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
-	},
-/area/varadero/exterior/eastocean)
 "sfs" = (
 /obj/structure/pipes/standard/simple/hidden/green{
 	dir = 4
@@ -32084,9 +32093,9 @@
 /obj/effect/landmark/lv624/fog_blocker{
 	time_to_dispel = 25000
 	},
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/eastocean)
 "uDw" = (
@@ -32241,7 +32250,8 @@
 /obj/structure/barricade/handrail/wire{
 	layer = 3.1
 	},
-/obj/item/ammo_magazine/handful/shotgun/incendiary,
+/obj/item/ammo_magazine/handful/shotgun/buckshot,
+/obj/item/ammo_magazine/handful/shotgun/buckshot,
 /turf/open/floor/wood,
 /area/varadero/interior/bunks)
 "uIl" = (
@@ -34952,9 +34962,9 @@
 	},
 /obj/structure/blocker/invisible_wall/water,
 /obj/structure/flora/bush/ausbushes/var3/stalkybush,
-/turf/open/gm/river/ocean{
-	name = "deep ocean";
-	default_name = "deep ocean"
+/turf/open/gm/river{
+	name = "shallow ocean";
+	default_name = "shallow ocean"
 	},
 /area/varadero/exterior/farocean)
 "wkM" = (
@@ -54732,7 +54742,7 @@ eMi
 qRy
 moK
 hPD
-hXg
+uQH
 riJ
 aQc
 qqA
@@ -55298,7 +55308,7 @@ bAE
 kIg
 nmC
 ben
-uIj
+mKK
 hDk
 aZb
 rAy
@@ -67132,9 +67142,9 @@ bGU
 rqg
 gPi
 xeU
-xFb
-sfo
-sfo
+dRs
+spv
+spv
 pNZ
 kyj
 gPi
@@ -67312,15 +67322,15 @@ gPi
 bko
 gPi
 qNr
-xFb
-sfo
-xFb
-sfo
-sfo
-sfo
-xFb
-xFb
-sfo
+dRs
+spv
+dRs
+spv
+spv
+spv
+dRs
+dRs
+spv
 ghN
 pZS
 kyD
@@ -67490,19 +67500,19 @@ qoI
 gPi
 xfQ
 spv
-xFb
+dRs
 uDr
-xFb
+dRs
 uDr
-xFb
-sfo
-xFb
-xFb
-sfo
-sfo
-xFb
-sfo
-sfo
+dRs
+spv
+dRs
+dRs
+spv
+spv
+dRs
+spv
+spv
 ghN
 gRj
 bGU
@@ -67670,21 +67680,21 @@ gPi
 gPi
 xfQ
 bUP
-jFL
-sfo
-xFb
-sfo
-tHc
-sfo
-xFb
-xFb
+bUP
+spv
+dRs
+spv
+ulb
+spv
+dRs
+dRs
 uDr
-sfo
-sfo
-xFb
-xFb
-sfo
-xFb
+spv
+spv
+dRs
+dRs
+spv
+dRs
 veV
 bko
 gPi
@@ -67850,25 +67860,25 @@ bUP
 bUP
 bUP
 bUP
-xFb
-xFb
-sfo
-xFb
-xFb
-sfo
-xFb
-xFb
-sfo
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-sfo
-xFb
-xFb
-sfo
+dRs
+dRs
+spv
+dRs
+dRs
+spv
+dRs
+dRs
+spv
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
+dRs
+dRs
+spv
 hwE
 ghN
 pZS
@@ -68025,33 +68035,33 @@ xFb
 xFb
 dRs
 dRs
-xFb
-xFb
-xFb
-xFb
 dRs
 dRs
-xFb
-xFb
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 uDr
-xFb
-xFb
-sfo
-xFb
-xFb
-sfo
-xFb
-xFb
-xFb
-xFb
-xFb
-sfo
-sfo
-xFb
-sfo
-xFb
-xFb
+dRs
+dRs
+spv
+dRs
+dRs
+spv
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
+spv
+dRs
+spv
+dRs
+dRs
 aaG
 dkS
 qlw
@@ -68201,38 +68211,38 @@ xFb
 xFb
 xFb
 xFb
+dRs
 xFb
 xFb
 xFb
 xFb
-xFb
-xFb
-xFb
-tHc
 dRs
-xFb
-xFb
 dRs
-xFb
-xFb
-sfo
+ulb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
 uDr
-xFb
-xFb
-sfo
-xFb
-xFb
-xFb
-sfo
-sfo
-xFb
-xFb
+dRs
+dRs
+spv
+dRs
+dRs
+dRs
+spv
+spv
+dRs
+dRs
 mRk
-sfo
-xFb
-sfo
-xFb
-xFb
+spv
+dRs
+spv
+dRs
+dRs
 uDr
 ihC
 ghN
@@ -68384,38 +68394,38 @@ xFb
 xFb
 xFb
 xFb
-xFb
-xFb
-xFb
 dRs
 xFb
 xFb
-xFb
 dRs
 xFb
 xFb
-xFb
 dRs
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 uDr
-sfo
-xFb
-xFb
-sfo
-sfo
-xFb
-xFb
-xFb
-sfo
+spv
+dRs
+dRs
+spv
+spv
+dRs
+dRs
+dRs
+spv
 uDr
-sfo
-sfo
-xFb
-xFb
+spv
+spv
+dRs
+dRs
 uDr
-xFb
+dRs
 uDr
-xFb
+dRs
 bUP
 ghN
 bGU
@@ -68572,31 +68582,31 @@ xFb
 xFb
 byC
 xFb
-xFb
-xFb
-xFb
-byC
-xFb
-byC
-xFb
+dRs
+dRs
+dRs
+exX
+dRs
+exX
+dRs
 uDr
-xFb
+dRs
 gIE
-xFb
-xFb
+dRs
+dRs
 uDr
-sfo
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-sfo
-sfo
-xFb
+spv
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
+spv
+dRs
 dRs
 bUP
 veV
@@ -68759,26 +68769,26 @@ xVw
 wBp
 wBp
 wBp
-rYC
+bBV
 wBp
 xBH
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 uDr
-sfo
-xFb
-xFb
-xFb
-xFb
-sfo
+spv
+dRs
+dRs
+dRs
+dRs
+spv
 uDr
 uDr
-xFb
-xFb
+dRs
+dRs
 dRs
 bUP
 bUP
@@ -68934,7 +68944,7 @@ mPk
 mPk
 mPk
 mPk
-mPk
+pRa
 cJL
 mPk
 mPk
@@ -68944,24 +68954,24 @@ mPk
 cJL
 mPk
 wkJ
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-sfo
-sfo
-sfo
-sfo
-sfo
-sfo
-xFb
-xFb
 dRs
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+spv
+spv
+spv
+spv
+spv
+spv
+dRs
+dRs
+dRs
+dRs
 bUP
 ucL
 ghN
@@ -69120,31 +69130,31 @@ mPk
 mPk
 mPk
 mPk
-mPk
+pRa
 mPk
 mPk
 mPk
 mPk
 rYC
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 bUP
 ghN
 bGU
@@ -69306,27 +69316,27 @@ mPk
 mPk
 mPk
 mPk
-cJL
-wBp
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-tHc
+rUa
+mPW
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+ulb
 bUP
 veV
 jTR
@@ -69490,26 +69500,26 @@ mPk
 mPk
 mPk
 xVw
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 bUP
 ghN
 bGU
@@ -69671,153 +69681,138 @@ mPk
 mPk
 mPk
 mPk
-wBp
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-dRs
-xFb
-bUP
-veV
-jTR
-bGU
-bGU
-bGU
-vNB
-rvD
-pGs
-pGs
-pGs
-pGs
-pGs
-pGs
-pGs
-pGs
-pGs
-bsf
-bsf
-bsf
-bsf
-bsf
-ulv
-uvd
-uvd
-uvd
-brT
-kjI
-vNT
-brT
-reA
-brT
-brT
-snS
-kjI
-kjI
-snS
-brT
-brT
-rmS
-brT
-qwU
-nnk
-brT
-uvd
-uvd
-uvd
-brT
-bsf
-bsf
-bsf
-bsf
-bsf
-pGs
-pGs
-pGs
-wUU
-"}
-(175,1,1) = {"
-wUU
-nvv
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-pkl
-kkF
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
-mPk
+wBp
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+bUP
+veV
+jTR
+bGU
+bGU
+bGU
+vNB
+rvD
+pGs
+pGs
+pGs
+pGs
+pGs
+pGs
+pGs
+pGs
+pGs
+bsf
+bsf
+bsf
+bsf
+bsf
+ulv
+uvd
+uvd
+uvd
+brT
+kjI
+vNT
+brT
+reA
+brT
+brT
+snS
+kjI
+kjI
+snS
+brT
+brT
+rmS
+brT
+qwU
+nnk
+brT
+uvd
+uvd
+uvd
+brT
+bsf
+bsf
+bsf
+bsf
+bsf
+pGs
+pGs
+pGs
+wUU
+"}
+(175,1,1) = {"
+wUU
+nvv
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+pkl
+kkF
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
 mPk
 mPk
 mPk
@@ -69853,27 +69848,42 @@ mPk
 mPk
 mPk
 mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+mPk
+pRa
 wBp
 byC
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 xFb
 xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-dRs
 bUP
 bUP
 ghN
@@ -70038,26 +70048,26 @@ mPk
 rYC
 xFb
 xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 xFb
 xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
+dRs
+dRs
 tHc
-bUP
+jFL
 ghN
 bGU
 bGU
@@ -70222,24 +70232,24 @@ byC
 xFb
 xFb
 xFb
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
+dRs
 xFb
+dRs
+dRs
 xFb
+dRs
 xFb
+dRs
+dRs
 xFb
 xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-xFb
-bUP
+jFL
 ghN
 vNB
 rvD
@@ -70402,18 +70412,18 @@ mPk
 wBp
 xFb
 xFb
-xFb
+dRs
 xFb
 byC
+dRs
 xFb
-xFb
-xFb
+dRs
 byC
 xFb
 xFb
-xFb
+dRs
 byC
-xFb
+dRs
 xFb
 byC
 xFb
@@ -70766,6 +70776,7 @@ mPk
 mPk
 mPk
 mPk
+pRa
 mPk
 mPk
 mPk
@@ -70775,14 +70786,13 @@ mPk
 mPk
 mPk
 mPk
-mPk
-mPk
+pRa
 cJL
 mPk
 mPk
 mPk
 cJL
-mPk
+pRa
 mPk
 mPk
 mPk
@@ -70951,10 +70961,10 @@ mPk
 mPk
 mPk
 mPk
+pRa
 mPk
-mPk
-mPk
-mPk
+pRa
+pRa
 mPk
 mPk
 mPk

From ee423ca2a2e14c8c594ef2d87abd9f23b84fb0ed Mon Sep 17 00:00:00 2001
From: Steelpoint <alexander.henley@hotmai.com>
Date: Sun, 27 Aug 2023 00:48:55 +0800
Subject: [PATCH 20/22] asd

---
 maps/map_files/LV624/LV624.dmm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index c0babffe0d94..c3e2f65aab04 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -10305,7 +10305,6 @@
 "aSQ" = (
 /obj/structure/safe/floor{
 	name = "safe";
-	pixel_x = 30;
 	spawnkey = 0
 	},
 /turf/open/floor{

From df8f8fe652823dac7cf74da533abdbd911fcf388 Mon Sep 17 00:00:00 2001
From: Steelpoint <alexander.henley@hotmai.com>
Date: Sun, 27 Aug 2023 00:53:20 +0800
Subject: [PATCH 21/22] Merge branch 'master' of
 https://github.com/Steelpoint/cmss13 into MasterMaster


From 454e507fc73db8f2d91c520b31a662fd303a2571 Mon Sep 17 00:00:00 2001
From: Steelpoint <alexander.henley@hotmai.com>
Date: Sun, 27 Aug 2023 00:54:05 +0800
Subject: [PATCH 22/22] asd

---
 maps/map_files/LV624/LV624.dmm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index c0babffe0d94..c3e2f65aab04 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -10305,7 +10305,6 @@
 "aSQ" = (
 /obj/structure/safe/floor{
 	name = "safe";
-	pixel_x = 30;
 	spawnkey = 0
 	},
 /turf/open/floor{