From 09b3f74b8365de5cbde65202aa9c96024d9ca2ca Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 13 Apr 2024 08:05:16 -0400 Subject: [PATCH] Adds 2 new flamer fuels for OT/Chemistry to make. (#6057) # About the pull request adds 2 new flamer fuels for OT/Chem to create and distribute to marines, sticky-napalm and high-combustion napalm sticky napalm has 15 intensity 50 duration (max firestacks), made with welding fuel and napalm. designed for suppression and backliner fighting high combustion has 45 intensity 10 duration, made with CLF3 and napalm. designed for high burst damage for reference pyro's blueflame has 40 intensity 40 duration CLF3 recipe now gives you 3 units instead of 1 to not be so straining on energy these new flamer chems won't impact fire stats for OT casings # Explain why it's good for the game more flamer fuel variety good these are sidegrades not direct upgrades, they are each good in certain situations while normal fuel is a jack of all trades # Testing Photographs and Procedure https://github.com/cmss13-devs/cmss13/assets/140007537/182093a6-2a5d-47ed-ab92-6c044fe66d0f # Changelog :cl: Tim Harley cookpet add: Added 2 new flamer fuels craftable by OTs/Chemistry balance: CLF3 recipe now gives more units per reaction /:cl: --- .../reagents/chemistry_reactions/other.dm | 16 +++++++++- .../reagents/chemistry_reagents/other.dm | 30 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry_reactions/other.dm b/code/modules/reagents/chemistry_reactions/other.dm index f03abec98fba..24a8563e0848 100644 --- a/code/modules/reagents/chemistry_reactions/other.dm +++ b/code/modules/reagents/chemistry_reactions/other.dm @@ -174,13 +174,27 @@ holder.trigger_volatiles = TRUE return +/datum/chemical_reaction/custom/sticky + name = "Sticky-Napalm" + id = "stickynapalm" + result = "stickynapalm" + required_reagents = list("napalm" = 1, "fuel" = 1) + result_amount = 2 + +/datum/chemical_reaction/custom/high_damage + name = "High-Combustion Napalm Fuel" + id = "highdamagenapalm" + result = "highdamagenapalm" + required_reagents = list("napalm" = 1, "chlorine trifluoride" = 1) + result_amount = 2 + // Chemfire supplement chemicals. /datum/chemical_reaction/chlorinetrifluoride name = "Chlorine Trifluoride" id = "chlorine trifluoride" result = "chlorine trifluoride" required_reagents = list("fluorine" = 3, "chlorine" = 1) - result_amount = 1 + result_amount = 3 /datum/chemical_reaction/chlorinetrifluoride/on_reaction(datum/reagents/holder, created_volume) holder.trigger_volatiles = TRUE diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm index 35a0d1c7db38..786a58857830 100644 --- a/code/modules/reagents/chemistry_reagents/other.dm +++ b/code/modules/reagents/chemistry_reagents/other.dm @@ -690,6 +690,36 @@ burn_sprite = "red" properties = list(PROPERTY_OXIDIZING = 6, PROPERTY_FUELING = 7, PROPERTY_FLOWING = 1) +/datum/reagent/napalm/sticky + name = "Sticky-Napalm" + id = "stickynapalm" + description = "A custom napalm mix, stickier and lasts longer but lower damage" + reagent_state = LIQUID + color = "#f8e3b2" + chemfiresupp = FALSE + burncolor = "#f8e3b2" + burn_sprite = "dynamic" + properties = list( + PROPERTY_INTENSITY = BURN_LEVEL_TIER_2, + PROPERTY_DURATION = BURN_TIME_TIER_5, + PROPERTY_RADIUS = 5, + ) + +/datum/reagent/napalm/high_damage + name = "High-Combustion Napalm Fuel" + id = "highdamagenapalm" + description = "A custom napalm mix, higher damage but not as sticky" + reagent_state = LIQUID + color = "#742424" + chemfiresupp = FALSE + burncolor = "#742424" + burn_sprite = "dynamic" + properties = list( + PROPERTY_INTENSITY = BURN_LEVEL_TIER_8, + PROPERTY_DURATION = BURN_TIME_TIER_1, + PROPERTY_RADIUS = 5, + ) + // This is the regular flamer fuel and pyro regular flamer fuel. /datum/reagent/napalm/ut name = "UT-Napthal Fuel"