diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 901a7a270a7..2dcfe954ae2 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -231,9 +231,8 @@ message_admins("[key_name_admin(user)] triggered a fueltank explosion.") log_game("[key_name(user)] triggered a fueltank explosion.") user << "\red That was stupid of you." - explosion(O.loc,-1,0,2) - if(O) - del(O) + var/obj/structure/reagent_dispensers/fueltank/tank = O + tank.explode() return if (src.welding) remove_fuel(1) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 454395f5006..bd527917746 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -93,22 +93,18 @@ ..() reagents.add_reagent("fuel",1000) - bullet_act(var/obj/item/projectile/Proj) if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) - explosion(src.loc,-1,0,2) - if(src) - del(src) - - + explode() blob_act() - explosion(src.loc,0,1,5,7,10) - if(src) - del(src) + explode() ex_act() - explosion(src.loc,-1,0,2) + explode() + + proc/explode() + explosion(src.loc,1,2,4) if(src) del(src)