cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-25 09:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix blazing oil not being damaged by sprayed water (#58992)

Browse Source 
🆑 coiax
fix: Blazing Oil blobs can now be damaged by sprayed water from fire
extinguishers, as intended.
/🆑

Because the mechanism of how the water damages the blob has changed, the
extinguish damage has been increased, otherwise you had to empty a fire
extinguisher to kill even one single blob tile.
This commit is contained in:
coiax
2021-05-12 10:02:48 +01:00
committed by GitHub
parent 4a92369743
commit 3bef1c1104
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/effects/effect_system/effects_water.dm
View File

@@ -3,7 +3,7 @@
/obj/effect/particle_effect/water
name = "water"
icon_state = "extinguish"
pass_flags = PASSTABLE | PASSMACHINE | PASSSTRUCTURE | PASSGRILLE
pass_flags = PASSTABLE | PASSMACHINE | PASSSTRUCTURE | PASSGRILLE | PASSBLOB
var/life = 15
mouse_opacity = MOUSE_OPACITY_TRANSPARENT

2
code/modules/antagonists/blob/blobstrains/blazing_oil.dm
View File

@@ -15,7 +15,7 @@
fire_based = TRUE
/datum/blobstrain/reagent/blazing_oil/extinguish_reaction(obj/structure/blob/B)
B.take_damage(1.5, BURN, ENERGY)
B.take_damage(4.5, BURN, ENERGY)
/datum/blobstrain/reagent/blazing_oil/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag)
if(damage_type == BURN && damage_flag != ENERGY)