Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2

KoishiVibe · Nov 15, 2024 · dd1b6fe · dd1b6fe
2 parents cf717e9 + 2e6ca13
commit dd1b6fe
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm
@@ -1070,7 +1070,7 @@ This is where the RO can reclaim their lost honor and purchase the M44 custom, t
 
 /datum/supply_packs/contraband/deep_storage/clf_holdout
 	name = "D18 Holdout Pistol"
-	contains = list(/obj/item/storage/box/loadout/clf)
+	contains = list(/obj/item/storage/box/loadout/CLF_loadout)
 	dollar_cost = 10
 	crate_heat = 2
 	containertype = /obj/structure/largecrate/black_market

diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
@@ -238,7 +238,7 @@
 	storage_slots = 4
 	can_hold = list(/obj/item/weapon/gun/pistol/clfpistol, /obj/item/ammo_magazine/pistol/clfpistol)
 
-/obj/item/storage/box/loadout/clf/fill_preset_inventory()
+/obj/item/storage/box/loadout/CLF_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/pistol/clfpistol())
 	for(var/i = 1 to storage_slots - 1)
 		new /obj/item/ammo_magazine/pistol/clfpistol(src)

diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
@@ -1245,6 +1245,7 @@
 	desc = "A set of magazine webbing made in an alternative configuration for standard M3 Pattern armor. This one is exclusively issued to Force Reconnoissance units."
 	icon_state = "m3rwebbing"
 	hold = /obj/item/storage/internal/accessory/webbing/m3mag/recon
+	flags_atom = NO_SNOW_TYPE
 
 /obj/item/storage/internal/accessory/webbing/m3mag/recon
 	storage_slots = 4

diff --git a/html/changelogs/AutoChangeLog-pr-553.yml b/html/changelogs/AutoChangeLog-pr-553.yml
@@ -0,0 +1,4 @@
+author: "BonniePandora"
+delete-after: True
+changes:
+  - bugfix: "Hummingbird pistol and ammo now spawn in the loadout weapon case"
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
@@ -54,3 +54,6 @@
   - imageadd: Helmet garb adjusted to account for M10 helmet cameras
   - imageadd: New, wide variants of helmet garb for UPP style helmets
   - imagedel: Deletes the padded, carrier, and skull armors due to unneeded redundancy
+2024-11-15:
+  Max-023:
+  - bugfix: Recon webbing now has the NO_SNOW_TYPE flag
diff --git a/maps/map_files/LV624_Fixed/LV624_repaired.dmm b/maps/map_files/LV624_Fixed/LV624_repaired.dmm
@@ -17708,7 +17708,7 @@
 /area/lv624/ground/river/east_river)
 "wWs" = (
 /obj/structure/surface/rack,
-/obj/item/storage/box/loadout/clf,
+/obj/item/storage/box/loadout/CLF_loadout,
 /turf/open/shuttle/bright_red,
 /area/lv624/lazarus/crashed_ship_containers)
 "wXg" = (