Removes iron foam creation, adds more foam nades.

cmss13-devs · Jan 21, 2024 · 8188a55 · 8188a55
1 parent 97d230c
commit 8188a55
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/code/datums/supply_packs/explosives.dm b/code/datums/supply_packs/explosives.dm
@@ -1,7 +1,7 @@
 // Group to populate with all the explosives exept OB and mortar shell
 
 /datum/supply_packs/explosives
-	name = "surplus explosives crate (claymore mine x5, M40 HIDP x2, M40 HEDP x2, M15 Frag x2, M12 Blast x2)"
+	name = "surplus explosives crate (claymore mine x5, M40 HIDP x2, M40 HEDP x2, M15 Frag x2, M12 Blast x2, M40 MFHS x2)"
 	contains = list(
 		/obj/item/storage/box/explosive_mines,
 		/obj/item/explosive/grenade/high_explosive,
@@ -12,6 +12,8 @@
 		/obj/item/explosive/grenade/high_explosive/m15,
 		/obj/item/explosive/grenade/high_explosive/pmc,
 		/obj/item/explosive/grenade/high_explosive/pmc,
+		/obj/item/explosive/grenade/metal_foam
+		/obj/item/explosive/grenade/metal_foam
 	)
 	cost = 40
 	containertype = /obj/structure/closet/crate/explosives

diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm
@@ -55,7 +55,7 @@
 		list("M74 AGM-Star Shell", round(scale * 2), /obj/item/explosive/grenade/high_explosive/airburst/starshell, VENDOR_ITEM_REGULAR),
 		list("M74 AGM-Hornet Shell", round(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR),
 		list("M40 HIRR Baton Slug", round(scale * 8), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR),
-		list("M40 MFHS Metal Foam Grenade", round(scale * 3), /obj/item/explosive/grenade/metal_foam, VENDOR_ITEM_REGULAR),
+		list("M40 MFHS Metal Foam Grenade", round(scale * 6), /obj/item/explosive/grenade/metal_foam, VENDOR_ITEM_REGULAR),
 		list("Plastic Explosives", round(scale * 3), /obj/item/explosive/plastic, VENDOR_ITEM_REGULAR),
 		list("Breaching Charge", round(scale * 2), /obj/item/explosive/plastic/breaching_charge, VENDOR_ITEM_REGULAR),
 

diff --git a/code/modules/reagents/chemistry_reactions/other.dm b/code/modules/reagents/chemistry_reactions/other.dm
@@ -384,31 +384,12 @@
 	for(var/mob/M as anything in viewers(5, location))
 		to_chat(M, SPAN_WARNING("The solution spews out a metallic shiny foam!"))
 
-	var/datum/effect_system/foam_spread/s = new()
-	s.set_up(created_volume, location, holder, 1)
-	s.start()
-
-
-/datum/chemical_reaction/ironfoam
-	name = "Iron Foam"
-	id = "ironlfoam"
-	result = null
-	required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1)
-	result_amount = 3
-
-/datum/chemical_reaction/ironfoam/on_reaction(datum/reagents/holder, created_volume)
-	var/location = get_turf(holder.my_atom)
-
-	for(var/mob/M as anything in viewers(5, location))
-		to_chat(M, SPAN_WARNING("The solution spews out a metallic dull foam!"))
-
 	var/datum/effect_system/foam_spread/s = new()
 	if (created_volume > 300)
 		created_volume = 300
-	s.set_up(created_volume, location, holder, 2)
+	s.set_up(created_volume, location, holder, 1)
 	s.start()
 
-
 /datum/chemical_reaction/foaming_agent
 	name = "Foaming Agent"
 	id = "foaming_agent"