Flare Storage Buff (#100)

cmss13-devs · Feb 1, 2024 · c69bc19 · c69bc19
1 parent b9e3ff8
commit c69bc19
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -1526,8 +1526,8 @@
 /obj/item/storage/belt/gun/flaregun
 	name = "\improper M276 pattern M82F flare gun holster rig"
 	desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the M82F flare gun."
-	storage_slots = 17
-	max_storage_space = 20
+	storage_slots = 28
+	max_storage_space = 31
 	icon_state = "m82f_holster"
 	item_state = "s_marinebelt"
 	can_hold = list(

diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
@@ -548,11 +548,11 @@
 
 /obj/item/storage/box/m94
 	name = "\improper M94 marking flare pack"
-	desc = "A packet of eight M94 Marking Flares. Carried by USCM soldiers to light dark areas that cannot be reached with the usual TNR Shoulder Lamp."
+	desc = "A packet of twenty one M94 Marking Flares. Carried by USCM soldiers to light dark areas that cannot be reached with the usual TNR Shoulder Lamp."
 	icon_state = "m94"
 	w_class = SIZE_MEDIUM
-	storage_slots = 8
-	max_storage_space = 8
+	storage_slots = 21
+	max_storage_space = 21
 	can_hold = list(/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare/signal)
 
 /obj/item/storage/box/m94/fill_preset_inventory()
@@ -568,7 +568,7 @@
 
 /obj/item/storage/box/m94/signal
 	name = "\improper M89-S signal flare pack"
-	desc = "A packet of eight M89-S Signal Marking Flares."
+	desc = "A packet of twenty one M89-S Signal Marking Flares."
 	icon_state = "m89"
 
 /obj/item/storage/box/m94/signal/fill_preset_inventory()

diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
@@ -1084,8 +1084,8 @@
 	name = "flare pouch"
 	desc = "A pouch designed to hold flares. Refillable with an M94 flare pack."
 	max_w_class = SIZE_SMALL
-	storage_slots = 8
-	max_storage_space = 8
+	storage_slots = 21
+	max_storage_space = 21
 	storage_flags = STORAGE_FLAGS_POUCH|STORAGE_USING_DRAWING_METHOD
 	icon_state = "flare"
 	can_hold = list(/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare/signal)

diff --git a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm
@@ -239,7 +239,7 @@
 	icon_state = "secure_crate"
 
 /obj/structure/largecrate/supply/supplies/flares
-	name = "Flare supply crate (x200)"
+	name = "Flare supply crate (x525)"
 	desc = "A supply crate containing two crates of flares."
 	supplies = list(/obj/item/ammo_box/magazine/misc/flares = 2)
 

diff --git a/code/modules/projectiles/ammo_boxes/misc_boxes.dm b/code/modules/projectiles/ammo_boxes/misc_boxes.dm
@@ -88,7 +88,7 @@
 	var/flare_amount = 0
 	for(var/obj/item/storage/box/m94/flare_box in contents)
 		flare_amount += flare_box.contents.len
-	flare_amount = round(flare_amount / 8) //10 packs, 8 flares each, maximum total of 10 flares we can throw out
+	flare_amount = round(flare_amount / 20) //10 packs, 20 flares each, maximum total of 10 flares we can throw out
 	return flare_amount
 
 /obj/item/ammo_box/magazine/misc/flares/process_burning(datum/cause_data/flame_cause_data)