TGS Test Merge (#6045)

cmss13-devs · Apr 7, 2024 · ae8507c · ae8507c
2 parents caeccc4 + d721861
commit ae8507c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git 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

diff --git a/code/game/objects/items/explosives/explosive.dm b/code/game/objects/items/explosives/explosive.dm
@@ -24,6 +24,8 @@
 									"min_fire_rad" = 1, "min_fire_int" = 3, "min_fire_dur" = 3
 	)
 	var/falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR
+	/// 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
@@ -185,6 +187,7 @@
 	for(var/obj/item/reagent_container/glass/G in containers)
 		if(G.reagents.total_volume)
 			has_reagents = 1
+			reagents.allow_star_shape = allow_star_shape
 			break
 
 	if(!has_reagents)

diff --git 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
+	allow_star_shape = FALSE
 	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" = 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
 	)
 	has_blast_wave_dampener = TRUE

diff --git 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/allow_star_shape = TRUE
 	var/exploded = FALSE
 	var/datum/weakref/source_mob
 
@@ -678,7 +679,7 @@
 		duration = max_fire_dur
 
 	// shape
-	if(supplemented > 0 && intensity > CHEM_FIRE_STAR_THRESHOLD)
+	if(supplemented > 0 && intensity > CHEM_FIRE_STAR_THRESHOLD && allow_star_shape)
 		flameshape = FLAMESHAPE_STAR
 
 	if(supplemented < 0 && intensity < CHEM_FIRE_IRREGULAR_THRESHOLD)