From 5bf9de48233f5df3c1abd3902a1eb1a4dbdea148 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Fri, 29 Mar 2024 18:43:20 -0400 Subject: [PATCH 01/12] Update warhead.dm --- code/game/objects/items/explosives/warhead.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/explosives/warhead.dm b/code/game/objects/items/explosives/warhead.dm index 9825d7483193..f9949bfcee86 100644 --- a/code/game/objects/items/explosives/warhead.dm +++ b/code/game/objects/items/explosives/warhead.dm @@ -9,10 +9,11 @@ name = "84mm rocket warhead" desc = "A custom warhead meant for 84mm rocket shells." icon_state = "warhead_rocket" - max_container_volume = 180 + max_container_volume = 210 + no_star_shape = TRUE matter = list("metal" = 11250) //3 sheets - reaction_limits = list( "max_ex_power" = 300, "base_ex_falloff" = 120,"max_ex_shards" = 64, - "max_fire_rad" = 7, "max_fire_int" = 30, "max_fire_dur" = 36, + reaction_limits = list( "max_ex_power" = 215, "base_ex_falloff" = 90,"max_ex_shards" = 64, + "max_fire_rad" = 7, "max_fire_int" = 40, "max_fire_dur" = 48, "min_fire_rad" = 2, "min_fire_int" = 4, "min_fire_dur" = 5 ) has_blast_wave_dampener = TRUE From b99f484712c52bfd167d74dada446a9d987cbd03 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Fri, 29 Mar 2024 18:43:46 -0400 Subject: [PATCH 02/12] Update rocket.dm --- code/datums/ammo/rocket.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index 7581d434c4b4..722602cada69 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -275,6 +275,8 @@ /datum/ammo/rocket/custom name = "custom rocket" + accurate_range = 8 + max_range = 8 /datum/ammo/rocket/custom/proc/prime(atom/atom, obj/projectile/projectile) var/obj/item/weapon/gun/launcher/rocket/launcher = projectile.shot_from From dd4a2527366b4bda883c064901b07c68ac06dcf0 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Fri, 29 Mar 2024 18:44:21 -0400 Subject: [PATCH 03/12] Update explosive.dm --- code/game/objects/items/explosives/explosive.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/explosives/explosive.dm b/code/game/objects/items/explosives/explosive.dm index 4483372c9b85..0563506fd76f 100644 --- a/code/game/objects/items/explosives/explosive.dm +++ b/code/game/objects/items/explosives/explosive.dm @@ -24,6 +24,7 @@ "min_fire_rad" = 1, "min_fire_int" = 3, "min_fire_dur" = 3 ) var/falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR + var/no_star_shape = FALSE //forces the shape of the flame to be normal if true var/use_dir = FALSE var/angle = 360 var/has_blast_wave_dampener = FALSE; //Whether or not the casing can be toggle between different falloff_mode @@ -185,6 +186,7 @@ for(var/obj/item/reagent_container/glass/G in containers) if(G.reagents.total_volume) has_reagents = 1 + reagents.no_star_shape = no_star_shape break if(!has_reagents) From 01d79072f86a0b8222b51798da2689f8ab1e55c8 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Fri, 29 Mar 2024 18:46:29 -0400 Subject: [PATCH 04/12] Update Chemistry-Holder.dm --- code/modules/reagents/Chemistry-Holder.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 73a254d1fdd6..cac4763720b1 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -4,6 +4,7 @@ var/maximum_volume = 100 var/atom/my_atom = null var/trigger_volatiles = FALSE + var/no_star_shape = FALSE var/exploded = FALSE var/datum/weakref/source_mob @@ -165,13 +166,9 @@ if(specific_reagent) if(istype(R, specific_reagent)) R.last_source_mob = WEAKREF(new_source_mob) - if(R.data_properties) - R.data_properties["last_source_mob"] = R.last_source_mob return continue R.last_source_mob = WEAKREF(new_source_mob) - if(R.data_properties) - R.data_properties["last_source_mob"] = R.last_source_mob /datum/reagents/proc/copy_to(obj/target, amount=1, multiplier=1, preserve_data=1, safety = 0) if(!target) @@ -678,7 +675,7 @@ duration = max_fire_dur // shape - if(supplemented > 0 && intensity > CHEM_FIRE_STAR_THRESHOLD) + if(supplemented > 0 && intensity > CHEM_FIRE_STAR_THRESHOLD && src.no_star_shape == FALSE) flameshape = FLAMESHAPE_STAR if(supplemented < 0 && intensity < CHEM_FIRE_IRREGULAR_THRESHOLD) From c315db01535c67ecd5a38f1d12a1be943cea320e Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Fri, 29 Mar 2024 18:50:21 -0400 Subject: [PATCH 05/12] Update Chemistry-Holder.dm --- code/modules/reagents/Chemistry-Holder.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index cac4763720b1..a2e093352726 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -166,9 +166,13 @@ if(specific_reagent) if(istype(R, specific_reagent)) R.last_source_mob = WEAKREF(new_source_mob) + if(R.data_properties) + R.data_properties["last_source_mob"] = R.last_source_mob return continue R.last_source_mob = WEAKREF(new_source_mob) + if(R.data_properties) + R.data_properties["last_source_mob"] = R.last_source_mob /datum/reagents/proc/copy_to(obj/target, amount=1, multiplier=1, preserve_data=1, safety = 0) if(!target) From 71e7e645f7a1eca506dd5518d1e3ba0f0ca3a2fd Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:48:16 -0400 Subject: [PATCH 06/12] Update code/game/objects/items/explosives/explosive.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/objects/items/explosives/explosive.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/explosives/explosive.dm b/code/game/objects/items/explosives/explosive.dm index 0563506fd76f..22e18ab7e217 100644 --- a/code/game/objects/items/explosives/explosive.dm +++ b/code/game/objects/items/explosives/explosive.dm @@ -24,7 +24,8 @@ "min_fire_rad" = 1, "min_fire_int" = 3, "min_fire_dur" = 3 ) var/falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR - var/no_star_shape = FALSE //forces the shape of the flame to be normal if true + /// Whether a star shape is possible when the intensity meets CHEM_FIRE_STAR_THRESHOLD + var/allow_star_shape = TRUE var/use_dir = FALSE var/angle = 360 var/has_blast_wave_dampener = FALSE; //Whether or not the casing can be toggle between different falloff_mode From 900f5cadfb2e81d8276e03abbf95f84b2e69f8c4 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:48:22 -0400 Subject: [PATCH 07/12] Update code/game/objects/items/explosives/explosive.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/objects/items/explosives/explosive.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/explosives/explosive.dm b/code/game/objects/items/explosives/explosive.dm index 22e18ab7e217..cac5bd3d0b61 100644 --- a/code/game/objects/items/explosives/explosive.dm +++ b/code/game/objects/items/explosives/explosive.dm @@ -187,7 +187,7 @@ for(var/obj/item/reagent_container/glass/G in containers) if(G.reagents.total_volume) has_reagents = 1 - reagents.no_star_shape = no_star_shape + reagents.allow_star_shape = allow_star_shape break if(!has_reagents) From de37bba5fb77bea880064cf1aac3c6ee6c1a0fb2 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:48:28 -0400 Subject: [PATCH 08/12] Update code/game/objects/items/explosives/warhead.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/objects/items/explosives/warhead.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/explosives/warhead.dm b/code/game/objects/items/explosives/warhead.dm index f9949bfcee86..d5c3cb16c681 100644 --- a/code/game/objects/items/explosives/warhead.dm +++ b/code/game/objects/items/explosives/warhead.dm @@ -10,7 +10,7 @@ desc = "A custom warhead meant for 84mm rocket shells." icon_state = "warhead_rocket" max_container_volume = 210 - no_star_shape = TRUE + allow_star_shape = FALSE matter = list("metal" = 11250) //3 sheets reaction_limits = list( "max_ex_power" = 215, "base_ex_falloff" = 90,"max_ex_shards" = 64, "max_fire_rad" = 7, "max_fire_int" = 40, "max_fire_dur" = 48, From ac186844d43ca8a8ea16431f1ecf10aba6bc050a Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:48:36 -0400 Subject: [PATCH 09/12] Update code/modules/reagents/Chemistry-Holder.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/reagents/Chemistry-Holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index a2e093352726..e62fdb37730f 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -679,7 +679,7 @@ duration = max_fire_dur // shape - if(supplemented > 0 && intensity > CHEM_FIRE_STAR_THRESHOLD && src.no_star_shape == FALSE) + if(supplemented > 0 && intensity > CHEM_FIRE_STAR_THRESHOLD && allow_star_shape) flameshape = FLAMESHAPE_STAR if(supplemented < 0 && intensity < CHEM_FIRE_IRREGULAR_THRESHOLD) From 4773f763a3a5c353d8fdc1e3ccc5a96cdb6a9e0d Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:48:50 -0400 Subject: [PATCH 10/12] Update code/game/objects/items/explosives/warhead.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/objects/items/explosives/warhead.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/explosives/warhead.dm b/code/game/objects/items/explosives/warhead.dm index d5c3cb16c681..bb0af93727e1 100644 --- a/code/game/objects/items/explosives/warhead.dm +++ b/code/game/objects/items/explosives/warhead.dm @@ -13,7 +13,7 @@ allow_star_shape = FALSE matter = list("metal" = 11250) //3 sheets reaction_limits = list( "max_ex_power" = 215, "base_ex_falloff" = 90,"max_ex_shards" = 64, - "max_fire_rad" = 7, "max_fire_int" = 40, "max_fire_dur" = 48, + "max_fire_rad" = 6, "max_fire_int" = 40, "max_fire_dur" = 48, "min_fire_rad" = 2, "min_fire_int" = 4, "min_fire_dur" = 5 ) has_blast_wave_dampener = TRUE From bbffc7921f1085e2415c221ad42bb9478fe01f89 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:50:09 -0400 Subject: [PATCH 11/12] Update warhead.dm --- code/game/objects/items/explosives/warhead.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/explosives/warhead.dm b/code/game/objects/items/explosives/warhead.dm index bb0af93727e1..1b7ec1ed4f94 100644 --- a/code/game/objects/items/explosives/warhead.dm +++ b/code/game/objects/items/explosives/warhead.dm @@ -12,7 +12,7 @@ max_container_volume = 210 allow_star_shape = FALSE matter = list("metal" = 11250) //3 sheets - reaction_limits = list( "max_ex_power" = 215, "base_ex_falloff" = 90,"max_ex_shards" = 64, + reaction_limits = list( "max_ex_power" = 240, "base_ex_falloff" = 90,"max_ex_shards" = 64, "max_fire_rad" = 6, "max_fire_int" = 40, "max_fire_dur" = 48, "min_fire_rad" = 2, "min_fire_int" = 4, "min_fire_dur" = 5 ) From d721861d06ed9ba90a477ebb984e02cbd3daeffc Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:50:57 -0400 Subject: [PATCH 12/12] Update code/modules/reagents/Chemistry-Holder.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/reagents/Chemistry-Holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index e62fdb37730f..f59ceff64018 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -4,7 +4,7 @@ var/maximum_volume = 100 var/atom/my_atom = null var/trigger_volatiles = FALSE - var/no_star_shape = FALSE + var/allow_star_shape = TRUE var/exploded = FALSE var/datum/weakref/source_mob