Merge branch 'master' into project/fax_responders_tm

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),

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),

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),

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),

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()

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

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

html/changelogs/archive/2024-09.yml

@@ -67,3 +67,24 @@
 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.
+2024-09-17:
+  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.