From 3b670242d10cb387dc5c0f179765df7aad8f341d Mon Sep 17 00:00:00 2001
From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com>
Date: Sun, 15 Sep 2024 01:40:42 +0000
Subject: [PATCH 01/13] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-7118.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-7145.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-7152.yml | 4 ----
 html/changelogs/archive/2024-09.yml       | 7 +++++++
 4 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7118.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7145.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7152.yml

diff --git a/html/changelogs/AutoChangeLog-pr-7118.yml b/html/changelogs/AutoChangeLog-pr-7118.yml
deleted file mode 100644
index 577fadade27d..000000000000
--- a/html/changelogs/AutoChangeLog-pr-7118.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "tallfission"
-delete-after: True
-changes:
-  - rscadd: "FTL vendors get signal flare packs for 5 points."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-7145.yml b/html/changelogs/AutoChangeLog-pr-7145.yml
deleted file mode 100644
index cc2ab230d291..000000000000
--- a/html/changelogs/AutoChangeLog-pr-7145.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - bugfix: "Fixes uniform vendor shutters being openable without access."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-7152.yml b/html/changelogs/AutoChangeLog-pr-7152.yml
deleted file mode 100644
index 313b1d38020f..000000000000
--- a/html/changelogs/AutoChangeLog-pr-7152.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - bugfix: "Scientists and Doctors from the Shiva panic room nightmare insert now spawn with snow gear as intended."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
index dad368310012..a75e92b922d5 100644
--- a/html/changelogs/archive/2024-09.yml
+++ b/html/changelogs/archive/2024-09.yml
@@ -67,3 +67,10 @@
 2024-09-14:
   MistChristmas:
   - balance: Buffs MW Fireman skill in line with the rest of MPs
+2024-09-15:
+  realforest2001:
+  - bugfix: Scientists and Doctors from the Shiva panic room nightmare insert now
+      spawn with snow gear as intended.
+  - bugfix: Fixes uniform vendor shutters being openable without access.
+  tallfission:
+  - rscadd: FTL vendors get signal flare packs for 5 points.

From 93b594496f5e464a5aae66acce1491325cc19375 Mon Sep 17 00:00:00 2001
From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:36:04 +0800
Subject: [PATCH 02/13] UPP rounds box storage fix (#7158)

# About the pull request
fixes #6930. corrects the type of ammo the box can store.

<!-- 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:
fix: fixes UPP ammo storage boxes
/:cl:
---
 code/modules/projectiles/ammo_boxes/round_boxes.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/projectiles/ammo_boxes/round_boxes.dm b/code/modules/projectiles/ammo_boxes/round_boxes.dm
index ab1d1667c15f..b4849466c309 100644
--- a/code/modules/projectiles/ammo_boxes/round_boxes.dm
+++ b/code/modules/projectiles/ammo_boxes/round_boxes.dm
@@ -104,7 +104,7 @@
 	overlay_gun_type = "_rounds_type71"
 	overlay_content = "_type71_reg"
 	caliber = "5.45x39mm"
-	default_ammo = /datum/ammo/bullet/rifle
+	default_ammo = /datum/ammo/bullet/rifle/type71
 
 /obj/item/ammo_box/rounds/type71/empty
 	empty = TRUE
@@ -115,7 +115,7 @@
 	icon_state = "base_type71"
 	overlay_gun_type = "_rounds_type71"
 	overlay_content = "_type71_ap"
-	default_ammo = /datum/ammo/bullet/rifle/ap
+	default_ammo = /datum/ammo/bullet/rifle/type71/ap
 
 /obj/item/ammo_box/rounds/type71/ap/empty
 	empty = TRUE

From 2d050e34c4694168b04e98dd7e2f32801986c519 Mon Sep 17 00:00:00 2001
From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:47:24 +0000
Subject: [PATCH 03/13] Automatic changelog for PR #7158 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-7158.yml b/html/changelogs/AutoChangeLog-pr-7158.yml
new file mode 100644
index 000000000000..ca7c3fc60f2a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7158.yml
@@ -0,0 +1,4 @@
+author: "deathrobotpunch"
+delete-after: True
+changes:
+  - bugfix: "fixes UPP ammo storage boxes"
\ No newline at end of file

From f89fe16221bbf55e5a86b6a9bdda3e6bddfbb64e Mon Sep 17 00:00:00 2001
From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:36:41 +0800
Subject: [PATCH 04/13] fixes undroppable wrist blades (#7159)

# About the pull request
fixes #6640
adds trait DELONDROP to wristblades
<!-- 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:
fix: Pred wristblades now del on drop
/:cl:
---
 code/modules/cm_preds/yaut_weapons.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm
index 14336cbdba04..2ca371fa75a9 100644
--- a/code/modules/cm_preds/yaut_weapons.dm
+++ b/code/modules/cm_preds/yaut_weapons.dm
@@ -60,7 +60,7 @@
 	w_class = SIZE_HUGE
 	edge = TRUE
 	sharp = IS_SHARP_ITEM_ACCURATE
-	flags_item = NOSHIELD|NODROP|ITEM_PREDATOR
+	flags_item = NOSHIELD|NODROP|DELONDROP|ITEM_PREDATOR
 	flags_equip_slot = NO_FLAGS
 	hitsound = 'sound/weapons/wristblades_hit.ogg'
 	attack_speed = 6

From 742923147ca4a5c8ee21a1b1e78f07e3e2698505 Mon Sep 17 00:00:00 2001
From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:56:23 +0000
Subject: [PATCH 05/13] Automatic changelog for PR #7159 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-7159.yml b/html/changelogs/AutoChangeLog-pr-7159.yml
new file mode 100644
index 000000000000..57ecc3d24917
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7159.yml
@@ -0,0 +1,4 @@
+author: "deathrobotpunch"
+delete-after: True
+changes:
+  - bugfix: "Pred wristblades now del on drop"
\ No newline at end of file

From f8196ee343715fce3fe05a1484db4ec0c2af22f2 Mon Sep 17 00:00:00 2001
From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 01:11:34 +0000
Subject: [PATCH 06/13] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-7158.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-7159.yml | 4 ----
 html/changelogs/archive/2024-09.yml       | 4 ++++
 3 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7158.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7159.yml

diff --git a/html/changelogs/AutoChangeLog-pr-7158.yml b/html/changelogs/AutoChangeLog-pr-7158.yml
deleted file mode 100644
index ca7c3fc60f2a..000000000000
--- a/html/changelogs/AutoChangeLog-pr-7158.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "deathrobotpunch"
-delete-after: True
-changes:
-  - bugfix: "fixes UPP ammo storage boxes"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-7159.yml b/html/changelogs/AutoChangeLog-pr-7159.yml
deleted file mode 100644
index 57ecc3d24917..000000000000
--- a/html/changelogs/AutoChangeLog-pr-7159.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "deathrobotpunch"
-delete-after: True
-changes:
-  - bugfix: "Pred wristblades now del on drop"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
index a75e92b922d5..f826ab730553 100644
--- a/html/changelogs/archive/2024-09.yml
+++ b/html/changelogs/archive/2024-09.yml
@@ -74,3 +74,7 @@
   - bugfix: Fixes uniform vendor shutters being openable without access.
   tallfission:
   - rscadd: FTL vendors get signal flare packs for 5 points.
+2024-09-17:
+  deathrobotpunch:
+  - bugfix: Pred wristblades now del on drop
+  - bugfix: fixes UPP ammo storage boxes

From 1bfa282beb8ffa6af271d72b45feb83f430e1e05 Mon Sep 17 00:00:00 2001
From: NHC <155458128+TheManWithNoHands@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:16:06 +0200
Subject: [PATCH 07/13] HM and CT vendor stuff (#7056)

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

# About the pull request

* Adds the Grenade Satchel as a bag option in the ComTec clothing vendor
* Adds Fix-o-Vein to buy with points in the Coprsmen vendor
* Adds 2 scaling Grenade Satchels in the req vendor

# Explain why it's good for the game

The Grenade Satchel and Fix-o-vein are two very under used items. Mainly
because they are barley available.

Fix-o-vein only lives in surgical trays, yet is never really used in
surgery because all its good for is fixing IB a bit faster. And Shipside
doctors dont need to worry that much about fixing IB fast.
But the only surgery that HM can even do is IB, and they need to worry
about their speed. Fix-o-vein is infinitly more usefull in the hands of
HM then for doctors. Price migth change though.

The Grenade satchel is barley even used. Only Ot and grenade spec even
have access to them, wich is kinda silly. They arent a spec spicific
item like the rocket bag. Anyone can carry grenades, and there is even a
Rifelman version of the grenade launcher.
This should allow people to make more grenade centerd build without
having to sacrefise their entire loudout for it. It takes up the
backslot, wich is incredibly valubel, so i belive that is fine balance
wise. Besides, you can already get grenade satchels from OT or the
leftoer one from spec. Its just less annoying to get as normal riflemen.
And ComTecs can just chose it as their bag if they want to go wild with
C4 or satchel charges. I definitly would want to try.
Btw, did you know you can fit engi kits in the nade satchel?

# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->

<!-- !! If you are modifying sprites, you **must** include one or more
in-game screenshots or videos of the new sprites. !! -->

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

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

</details>


# Changelog

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

:cl:TheManWithNoHands
qol: added Grenade satchel in Comtec and req vendor, making it more
accesible
balance: Added Fix-o-vein in HM squad vendor. Allows surgicalline, synth
grath, fix-o-vein, cautery to be stored in Hm surgical case.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
---
 code/game/machinery/vending/vendor_types/requisitions.dm        | 1 +
 .../machinery/vending/vendor_types/squad_prep/squad_engineer.dm | 1 +
 .../machinery/vending/vendor_types/squad_prep/squad_medic.dm    | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm
index e530b754d78b..569a042da81d 100644
--- a/code/game/machinery/vending/vendor_types/requisitions.dm
+++ b/code/game/machinery/vending/vendor_types/requisitions.dm
@@ -80,6 +80,7 @@
 		list("IMP Ammo Rack", floor(scale * 2), /obj/item/storage/backpack/marine/ammo_rack, VENDOR_ITEM_REGULAR),
 		list("Radio Telephone Pack", floor(scale * 2), /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR),
 		list("Parachute", floor(scale * 20), /obj/item/parachute, VENDOR_ITEM_REGULAR),
+		list("Grenade Satchel", floor(scale * 2), /obj/item/storage/backpack/marine/grenadepack, VENDOR_ITEM_REGULAR),
 
 		list("BELTS", -1, null, null),
 		list("G8-A General Utility Pouch", floor(scale * 2), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
index 8d5e7b83590f..f59f9543592a 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
@@ -126,6 +126,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
 		list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
 		list("Technician Welder-Satchel", 0, /obj/item/storage/backpack/marine/engineerpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
 		list("Technician Welder Chestrig", 0, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
+		list("Grenade Satchel", 0, /obj/item/storage/backpack/marine/grenadepack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
 
 		list("BELT (CHOOSE 1)", 0, null, null, null),
 		list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
index 9952c7f00b8f..6db49ebdd6a2 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
@@ -46,6 +46,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
 		list("Pressurized Reagent Canister Pouch (EMPTY)", 3, /obj/item/storage/pouch/pressurized_reagent_canister, null, VENDOR_ITEM_REGULAR),
 		list("G8-A General Utility Pouch", 15, /obj/item/storage/backpack/general_belt, null, VENDOR_ITEM_REGULAR),
 		list("MS-11 Smart Refill Tank", 6, /obj/item/reagent_container/glass/minitank, null, VENDOR_ITEM_REGULAR),
+		list("FixOVein", 7, /obj/item/tool/surgery/FixOVein, null, VENDOR_ITEM_REGULAR),
+
 
 		list("EXPLOSIVES", 0, null, null, null),
 		list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),

From e7d83ed7e26f0359becc1f66806d3f279daf015c Mon Sep 17 00:00:00 2001
From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:23:23 +0000
Subject: [PATCH 08/13] Automatic changelog for PR #7056 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-7056.yml b/html/changelogs/AutoChangeLog-pr-7056.yml
new file mode 100644
index 000000000000..6cff2e840ba0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7056.yml
@@ -0,0 +1,5 @@
+author: "TheManWithNoHands"
+delete-after: True
+changes:
+  - qol: "added Grenade satchel in Comtec and req vendor, making it more accesible"
+  - balance: "Added Fix-o-vein in HM squad vendor. Allows surgicalline, synth grath, fix-o-vein, cautery to be stored in Hm surgical case."
\ No newline at end of file

From 747a19f06fb3faad2754e7dab0807397a47ed02e Mon Sep 17 00:00:00 2001
From: gl0ck <102577236+efzapa@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:17:27 -0400
Subject: [PATCH 09/13] Adds MREs to the ColMarTech Food Vendor (#7111)

# About the pull request

Adds 15 MREs to each ColMarTech Food Vendor on the Almayer

# Explain why it's good for the game

Marines basically already get infinite MREs anyways, no harm in adding
them if shipside personnel like MPs want to grab food on the go and not
have a whole plate of food just in their bag, which is weird.

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



https://github.com/user-attachments/assets/6a711776-d791-48b6-946f-b7495cbf8022


</details>


# Changelog
:cl:
add: All ColMarTech Food Vendors now have 15 MREs
/:cl:
---
 code/game/machinery/vending/vendor_types/food.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/machinery/vending/vendor_types/food.dm b/code/game/machinery/vending/vendor_types/food.dm
index 62ed5124727e..81344aca1058 100644
--- a/code/game/machinery/vending/vendor_types/food.dm
+++ b/code/game/machinery/vending/vendor_types/food.dm
@@ -11,6 +11,7 @@
 /obj/structure/machinery/cm_vending/sorted/marine_food/populate_product_list(scale)
 	listed_products = list(
 		list("PREPARED MEALS", -1, null, null),
+		list("USCM Meal Ready to Eat", 15, /obj/item/storage/box/MRE, VENDOR_ITEM_REGULAR),
 		list("USCM Prepared Meal (Chicken)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal5, VENDOR_ITEM_REGULAR),
 		list("USCM Prepared Meal (Cornbread)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal1, VENDOR_ITEM_REGULAR),
 		list("USCM Prepared Meal (Pasta)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal3, VENDOR_ITEM_REGULAR),

From 7d04589b1d21a45fb0a9e318b78c1da4b6c33a02 Mon Sep 17 00:00:00 2001
From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:30:51 +0000
Subject: [PATCH 10/13] Automatic changelog for PR #7111 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-7111.yml b/html/changelogs/AutoChangeLog-pr-7111.yml
new file mode 100644
index 000000000000..acf6592f9b0a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7111.yml
@@ -0,0 +1,4 @@
+author: "efzapa"
+delete-after: True
+changes:
+  - rscadd: "All ColMarTech Food Vendors now have 15 MREs"
\ No newline at end of file

From b228b68961c087cf973a8e2bf550fffd2cdfee86 Mon Sep 17 00:00:00 2001
From: forest2001 <41653574+realforest2001@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:25:24 +0100
Subject: [PATCH 11/13] Project ARES: Fix gas duration (#7119)

# About the pull request

As title


# Changelog
:cl:
fix: Fixes the duration of the AI Core nerve gas, will no longer last a
full minute.
/:cl:
---
 code/game/objects/structures/pipes/vents/vents.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/structures/pipes/vents/vents.dm b/code/game/objects/structures/pipes/vents/vents.dm
index d7e090c581c5..e9e7afd62577 100644
--- a/code/game/objects/structures/pipes/vents/vents.dm
+++ b/code/game/objects/structures/pipes/vents/vents.dm
@@ -180,5 +180,5 @@
 	if(!gas_holder || welded)
 		return FALSE
 	playsound(loc, 'sound/effects/smoke.ogg', 25, 1, 4)
-	gas_holder.set_up(radius, 0, get_turf(src), null, 10 SECONDS)
+	gas_holder.set_up(radius, 0, get_turf(src), null, 10)
 	gas_holder.start()

From 76037ad1bb7e3047bdf1ac4d37357815d0418a79 Mon Sep 17 00:00:00 2001
From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:37:07 +0000
Subject: [PATCH 12/13] Automatic changelog for PR #7119 [ci skip]

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

diff --git a/html/changelogs/AutoChangeLog-pr-7119.yml b/html/changelogs/AutoChangeLog-pr-7119.yml
new file mode 100644
index 000000000000..d36ba8cb4de0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7119.yml
@@ -0,0 +1,4 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - bugfix: "Fixes the duration of the AI Core nerve gas, will no longer last a full minute."
\ No newline at end of file

From 31464990f3a4b8334fc6672b8412737eeb684c54 Mon Sep 17 00:00:00 2001
From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 01:24:49 +0000
Subject: [PATCH 13/13] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-7056.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-7111.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-7119.yml |  4 ----
 html/changelogs/archive/2024-09.yml       | 10 ++++++++++
 4 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7056.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7111.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-7119.yml

diff --git a/html/changelogs/AutoChangeLog-pr-7056.yml b/html/changelogs/AutoChangeLog-pr-7056.yml
deleted file mode 100644
index 6cff2e840ba0..000000000000
--- a/html/changelogs/AutoChangeLog-pr-7056.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "TheManWithNoHands"
-delete-after: True
-changes:
-  - qol: "added Grenade satchel in Comtec and req vendor, making it more accesible"
-  - balance: "Added Fix-o-vein in HM squad vendor. Allows surgicalline, synth grath, fix-o-vein, cautery to be stored in Hm surgical case."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-7111.yml b/html/changelogs/AutoChangeLog-pr-7111.yml
deleted file mode 100644
index acf6592f9b0a..000000000000
--- a/html/changelogs/AutoChangeLog-pr-7111.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "efzapa"
-delete-after: True
-changes:
-  - rscadd: "All ColMarTech Food Vendors now have 15 MREs"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-7119.yml b/html/changelogs/AutoChangeLog-pr-7119.yml
deleted file mode 100644
index d36ba8cb4de0..000000000000
--- a/html/changelogs/AutoChangeLog-pr-7119.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "realforest2001"
-delete-after: True
-changes:
-  - bugfix: "Fixes the duration of the AI Core nerve gas, will no longer last a full minute."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
index f826ab730553..122f3a58e929 100644
--- a/html/changelogs/archive/2024-09.yml
+++ b/html/changelogs/archive/2024-09.yml
@@ -78,3 +78,13 @@
   deathrobotpunch:
   - bugfix: Pred wristblades now del on drop
   - bugfix: fixes UPP ammo storage boxes
+2024-09-18:
+  TheManWithNoHands:
+  - qol: added Grenade satchel in Comtec and req vendor, making it more accesible
+  - balance: Added Fix-o-vein in HM squad vendor. Allows surgicalline, synth grath,
+      fix-o-vein, cautery to be stored in Hm surgical case.
+  efzapa:
+  - rscadd: All ColMarTech Food Vendors now have 15 MREs
+  realforest2001:
+  - bugfix: Fixes the duration of the AI Core nerve gas, will no longer last a full
+      minute.