Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebalances OT rockets to be more incendiary rather than explosive #6045

Merged
merged 13 commits into from
Apr 13, 2024
Merged
2 changes: 2 additions & 0 deletions code/datums/ammo/rocket.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/items/explosives/explosive.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 4 additions & 3 deletions code/game/objects/items/explosives/warhead.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion code/modules/reagents/Chemistry-Holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
Loading