mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Adds more reasons to explosion logging (#28812)
* explos * yeah good enough * shorten that * use ckey * forgot this cause * unfuck it
This commit is contained in:
@@ -145,7 +145,7 @@
|
||||
qdel(H)
|
||||
if("exploded")
|
||||
H.visible_message("<span class='chaosverybad'>[H] explodes!</span>", "<span class='chaosverybad'>Boom!</span>")
|
||||
explosion(get_turf(H), 1, 1, 1, cause = "staff of chaos lethal explosion effect")
|
||||
explosion(get_turf(H), 1, 1, 1, cause = "staff of chaos lethal explosion effect, fired by [key_name(firer)]")
|
||||
if("cheese morphed")
|
||||
H.visible_message("<span class='chaosverybad'>[H] transforms into cheese!</span>", "<span class='chaosverybad'>You've been transformed into cheese!</span>")
|
||||
new /obj/item/food/sliced/cheesewedge(get_turf(H))
|
||||
@@ -192,7 +192,7 @@
|
||||
if("fireballed")
|
||||
H.visible_message("<span class='chaosbad'>[H] is hit by a fireball! </span>", "<span class='chaosverybad'>You get hit by a fireball!</span>")
|
||||
H.apply_damage(CHAOS_STAFF_DAMAGE / 3, BRUTE)
|
||||
explosion(get_turf(H), -1, 0, 2, 3, flame_range = 2, cause = "staff of chaos fireball effect")
|
||||
explosion(get_turf(H), -1, 0, 2, 3, flame_range = 2, cause = "staff of chaos fireball effect, fired by [key_name(firer)]")
|
||||
if("ice spiked")
|
||||
H.visible_message("<span class='chaosbad'>[H]'s chest get pierced by an ice spike!</span>", "<span class='chaosverybad'>An ice spike pierces your chest!</span>")
|
||||
H.apply_damage(CHAOS_STAFF_DAMAGE, BRUTE, "chest")
|
||||
|
||||
@@ -188,7 +188,7 @@ CONTENTS:
|
||||
max_charges = 8 //8, 4, 4, 3
|
||||
|
||||
/obj/item/gun/magic/wand/fireball/zap_self(mob/living/user)
|
||||
explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
|
||||
explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2, cause = "Self-fireball")
|
||||
charges--
|
||||
..()
|
||||
|
||||
@@ -234,7 +234,7 @@ CONTENTS:
|
||||
"<span class='userdanger'>Unsure which end of [src] is which, you accidentally zap yourself with a fireball!</span>",
|
||||
"<span class='userdanger'>You hear a firey explosion!</span>"
|
||||
)
|
||||
explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
|
||||
explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2, cause = "Fireball to the face from failed cigarette lighting")
|
||||
charges--
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams!
|
||||
if(B.owner != current_beam)
|
||||
turf.visible_message("<span class='userdanger'>The medbeams cross and EXPLODE!</span>")
|
||||
explosion(B.loc,0,3,5,8)
|
||||
explosion(B.loc,0,3,5,8, cause = "Crossed beams")
|
||||
qdel(dummy)
|
||||
return FALSE
|
||||
qdel(dummy)
|
||||
|
||||
@@ -68,6 +68,6 @@
|
||||
|
||||
/obj/item/projectile/homing/magic/homing_fireball/on_hit(mob/living/target)
|
||||
. = ..()
|
||||
explosion(get_turf(target), explosion_devastate, explosion_heavy, explosion_light, explosion_flash, 0, flame_range = explosion_fire)
|
||||
explosion(get_turf(target), explosion_devastate, explosion_heavy, explosion_light, explosion_flash, 0, flame_range = explosion_fire, cause = "Homing Fireball")
|
||||
if(istype(target)) //multiple flavors of pain
|
||||
target.adjustFireLoss(10) // does 20 brute, and 10 burn + explosion. Pretty brutal.
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
if(!.)
|
||||
return .
|
||||
var/turf/T = get_turf(target)
|
||||
explosion(T, exp_devastate, exp_heavy, exp_light, exp_flash, 0, flame_range = exp_fire)
|
||||
explosion(T, exp_devastate, exp_heavy, exp_light, exp_flash, 0, flame_range = exp_fire, cause = name)
|
||||
if(ismob(target)) //multiple flavors of pain
|
||||
var/mob/living/M = target
|
||||
M.take_overall_damage(0,10) //between this 10 burn, the 10 brute, the explosion brute, and the onfire burn, your at about 65 damage if you stop drop and roll immediately
|
||||
|
||||
@@ -215,7 +215,7 @@
|
||||
|
||||
/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0)
|
||||
..()
|
||||
explosion(target, -1, 0, 1)
|
||||
explosion(target, -1, 0, 1, cause = "frag 12 fired by [key_name(firer)]")
|
||||
return TRUE
|
||||
|
||||
/obj/item/projectile/bullet/confetti
|
||||
|
||||
Reference in New Issue
Block a user