cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes single tank bombs (#58818)

Browse Source 
* fixes single tank bombs

* move qdel later
This commit is contained in:
Sparkezel
2021-05-06 21:45:28 +02:00
committed by GitHub
parent 1a63ce8978
commit 5347d9ead5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/assembly/bomb.dm
View File

@@ -157,21 +157,17 @@
var/turf/ground_zero = get_turf(loc)
if(master)
qdel(master)
qdel(src)
if(bomb_mixture.temperature > (T0C + 400))
strength = (fuel_moles/15)
if(strength >=2)
explosion(src, devastation_range = round(strength,1), heavy_impact_range = round(strength*2,1), light_impact_range = round(strength*3,1), flash_range = round(strength*4,1))
explosion(ground_zero, devastation_range = round(strength,1), heavy_impact_range = round(strength*2,1), light_impact_range = round(strength*3,1), flash_range = round(strength*4,1))
else if(strength >=1)
explosion(src, devastation_range = round(strength,1), heavy_impact_range = round(strength*2,1), light_impact_range = round(strength*2,1), flash_range = round(strength*3,1))
explosion(ground_zero, devastation_range = round(strength,1), heavy_impact_range = round(strength*2,1), light_impact_range = round(strength*2,1), flash_range = round(strength*3,1))
else if(strength >=0.5)
explosion(src, heavy_impact_range = 1, light_impact_range = 2, flash_range = 4)
explosion(ground_zero, heavy_impact_range = 1, light_impact_range = 2, flash_range = 4)
else if(strength >=0.2)
explosion(src, devastation_range = -1, light_impact_range = 1, flash_range = 2)
explosion(ground_zero, devastation_range = -1, light_impact_range = 1, flash_range = 2)
else
ground_zero.assume_air(bomb_mixture)
ground_zero.hotspot_expose(1000, 125)
@@ -200,6 +196,10 @@
ground_zero.assume_air(bomb_mixture)
ground_zero.hotspot_expose(1000, 125)
if(master)
qdel(master)
qdel(src)
/obj/item/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out.
var/datum/gas_mixture/our_mix = return_air()
var/datum/gas_mixture/removed = remove_air(our_mix.total_moles())