Skip to content

Commit

Permalink
Makes reagent explosions obey the max cap. (#4882)
Browse files Browse the repository at this point in the history
* The Stuff.

* Update effects_other.dm
  • Loading branch information
Loiosh42 authored Jan 20, 2025
1 parent 0e71b40 commit e25b594
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/explosions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ SUBSYSTEM_DEF(explosions)
* * flame_range: Flame range. Equal to the equivalent of the light impact range multiplied by this value.
* * flash_range: The range at which the explosion flashes people. Equal to the equivalent of the light impact range multiplied by this value.
* * adminlog: Whether to log the explosion/report it to the administration.
* * ignorecap: Whether to ignore the relevant bombcap. Defaults to FALSE.
* * ignorecap: Whether to ignore the relevant bombcap. Defaults to TRUE. Re: ignorecap = TRUE. If you call dyn_explosion, ensure that you set it false or want it to ignore cap.
* * flame_range: The range at which the explosion should produce hotspots.
* * silent: Whether to generate/execute sound effects.
* * smoke: Whether to generate a smoke cloud provided the explosion is powerful enough to warrant it.
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/effects/effect_system/effects_other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
var/flashing = FALSE // does explosion creates flash effect?
var/flashing_factor = 0 // factor of how powerful the flash effect relatively to the explosion
var/explosion_message = 1 //whether we show a message to mobs.
var/ignore_explosion_cap = FALSE

/datum/effect_system/reagents_explosion/set_up(amt, loca, flash = FALSE, flash_fact = 0, message = TRUE)
amount = amt
Expand All @@ -111,4 +112,4 @@
if(explosion_message)
location.visible_message(span_danger("The solution violently explodes!"), span_hear("You hear an explosion!"))

dyn_explosion(location, amount, flash_range = flashing_factor, explosion_cause = explosion_source)
dyn_explosion(location, amount, flash_range = flashing_factor, ignorecap = ignore_explosion_cap, explosion_cause = explosion_source) //monke edit: ignorecap set to FALSE, can't belive it took till 2025

0 comments on commit e25b594

Please sign in to comment.