From 621f33db884b196fb985280b608f1dd89e9208dc Mon Sep 17 00:00:00 2001 From: private-tristan Date: Fri, 19 Jan 2024 17:17:42 -0500 Subject: [PATCH 1/6] Foam Nerf --- code/game/objects/effects/effect_system/foam.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/effect_system/foam.dm b/code/game/objects/effects/effect_system/foam.dm index edee94cb3747..0afb8c88ebd6 100644 --- a/code/game/objects/effects/effect_system/foam.dm +++ b/code/game/objects/effects/effect_system/foam.dm @@ -156,7 +156,7 @@ // dense and opaque, but easy to break #define FOAMED_METAL_FIRE_ACT_DMG 50 -#define FOAMED_METAL_XENO_SLASH 0.8 +#define FOAMED_METAL_XENO_SLASH 2.5 #define FOAMED_METAL_ITEM_MELEE 2 #define FOAMED_METAL_BULLET_DMG 2 #define FOAMED_METAL_EXPLOSION_DMG 1 From 68625603eb808b432a000e219a4e78b4053a920d Mon Sep 17 00:00:00 2001 From: private-tristan Date: Fri, 19 Jan 2024 17:33:02 -0500 Subject: [PATCH 2/6] Metal foam nades now use iron. --- code/game/objects/items/explosives/grenades/marines.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm index 46d2d4eba921..1cd3e1577c57 100644 --- a/code/game/objects/items/explosives/grenades/marines.dm +++ b/code/game/objects/items/explosives/grenades/marines.dm @@ -705,11 +705,11 @@ det_time = 20 underslug_launchable = TRUE harmful = FALSE - var/foam_metal_type = FOAM_METAL_TYPE_ALUMINIUM + var/foam_metal_type = FOAM_METAL_TYPE_IRON /obj/item/explosive/grenade/metal_foam/prime() var/datum/effect_system/foam_spread/s = new() - s.set_up(12, get_turf(src), metal_foam = foam_metal_type) //Metalfoam 1 for aluminum foam, 2 for iron foam (Stronger), 12 amt = 2 tiles radius (5 tile length diamond) + s.set_up(12, get_turf(src), metal_foam = foam_metal_type) //12 amt = 2 tiles radius (5 tile length diamond) s.start() qdel(src) From c6d74528ed5249158a8bb048c298eb418374e761 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Sat, 20 Jan 2024 23:51:32 -0500 Subject: [PATCH 3/6] Foam Limit, Queen/Charger/Rav/BasePrae can 1shot --- code/game/objects/effects/effect_system/foam.dm | 4 ++-- code/modules/reagents/chemistry_reactions/other.dm | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/effect_system/foam.dm b/code/game/objects/effects/effect_system/foam.dm index 0afb8c88ebd6..c5b927fa5723 100644 --- a/code/game/objects/effects/effect_system/foam.dm +++ b/code/game/objects/effects/effect_system/foam.dm @@ -156,7 +156,7 @@ // dense and opaque, but easy to break #define FOAMED_METAL_FIRE_ACT_DMG 50 -#define FOAMED_METAL_XENO_SLASH 2.5 +#define FOAMED_METAL_XENO_SLASH 1.75 #define FOAMED_METAL_ITEM_MELEE 2 #define FOAMED_METAL_BULLET_DMG 2 #define FOAMED_METAL_EXPLOSION_DMG 1 @@ -173,7 +173,7 @@ /obj/structure/foamed_metal/iron icon_state = "ironfoam" - health = 85 + health = 70 name = "foamed iron" desc = "A slightly stronger lightweight foamed iron wall." diff --git a/code/modules/reagents/chemistry_reactions/other.dm b/code/modules/reagents/chemistry_reactions/other.dm index 6b60ae89059c..69bdb68d6162 100644 --- a/code/modules/reagents/chemistry_reactions/other.dm +++ b/code/modules/reagents/chemistry_reactions/other.dm @@ -394,7 +394,7 @@ id = "ironlfoam" result = null required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1) - result_amount = 5 + result_amount = 3 /datum/chemical_reaction/ironfoam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) @@ -403,6 +403,8 @@ 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.start() From 97d230cea62fd79a5f284d4aeeb218556b19cc97 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Sun, 21 Jan 2024 00:19:48 -0500 Subject: [PATCH 4/6] Consistent Damage --- code/game/objects/effects/effect_system/foam.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/effect_system/foam.dm b/code/game/objects/effects/effect_system/foam.dm index c5b927fa5723..525cb8c731a9 100644 --- a/code/game/objects/effects/effect_system/foam.dm +++ b/code/game/objects/effects/effect_system/foam.dm @@ -211,7 +211,7 @@ return FALSE /obj/structure/foamed_metal/attack_alien(mob/living/carbon/xenomorph/X, dam_bonus) - var/damage = (rand(X.melee_damage_lower, X.melee_damage_upper) + dam_bonus) + var/damage = ((round((X.melee_damage_lower+X.melee_damage_upper)/2)) + dam_bonus) //Frenzy bonus if(X.frenzy_aura > 0) From 8188a55b186e6a32d8e044aa562ac3e95065b4c2 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Sun, 21 Jan 2024 16:17:13 -0500 Subject: [PATCH 5/6] Removes iron foam creation, adds more foam nades. --- code/datums/supply_packs/explosives.dm | 4 +++- .../vending/vendor_types/requisitions.dm | 2 +- .../reagents/chemistry_reactions/other.dm | 21 +------------------ 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/code/datums/supply_packs/explosives.dm b/code/datums/supply_packs/explosives.dm index 22458ef3fa6b..c1d53c6d894b 100644 --- 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 index 24f58c8f6ae3..6a806dd602ec 100644 --- 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 index 69bdb68d6162..f03abec98fba 100644 --- 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" From 3522108218804f1d39a54c52ce1a7644bd786c59 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Sun, 21 Jan 2024 16:21:02 -0500 Subject: [PATCH 6/6] woopsies --- code/datums/supply_packs/explosives.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/supply_packs/explosives.dm b/code/datums/supply_packs/explosives.dm index c1d53c6d894b..032ef047c78a 100644 --- a/code/datums/supply_packs/explosives.dm +++ b/code/datums/supply_packs/explosives.dm @@ -12,8 +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 + /obj/item/explosive/grenade/metal_foam, + /obj/item/explosive/grenade/metal_foam, ) cost = 40 containertype = /obj/structure/closet/crate/explosives