this WILL fail CI
hnnnngh
This commit is contained in:
@@ -253,7 +253,7 @@ GLOBAL_LIST_EMPTY(explosions)
|
||||
if(dist > EXPLODE_NONE)
|
||||
T.explosion_level = max(T.explosion_level, dist) //let the bigger one have it
|
||||
T.explosion_id = id
|
||||
T.ex_act(dist)
|
||||
T.ex_act(dist, origin = src)
|
||||
exploded_this_tick += T
|
||||
|
||||
//--- THROW ITEMS AROUND ---
|
||||
|
||||
@@ -610,12 +610,12 @@
|
||||
user.buckle_message_cooldown = world.time + 50
|
||||
to_chat(user, "<span class='warning'>You can't move while buckled to [src]!</span>")
|
||||
|
||||
/atom/proc/contents_explosion(severity, target)
|
||||
/atom/proc/contents_explosion(severity, target, origin)
|
||||
return //For handling the effects of explosions on contents that would not normally be effected
|
||||
|
||||
/atom/proc/ex_act(severity, target, datum/explosion/E)
|
||||
/atom/proc/ex_act(severity, target, origin)
|
||||
set waitfor = FALSE
|
||||
contents_explosion(severity, target)
|
||||
contents_explosion(severity, target, origin)
|
||||
SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, severity, target)
|
||||
|
||||
/**
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
if(mapload && prob(66)) // 2/3 instead of 1/3 (default)
|
||||
MakeDirty()
|
||||
|
||||
/turf/open/floor/ex_act(severity, target)
|
||||
/turf/open/floor/ex_act(severity, target, origin)
|
||||
var/shielded = is_shielded()
|
||||
..()
|
||||
if(severity != 1 && shielded && target != src)
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
if(girder_type)
|
||||
new /obj/item/stack/sheet/metal(src)
|
||||
|
||||
/turf/closed/wall/ex_act(severity, target)
|
||||
/turf/closed/wall/ex_act(severity, target, origin)
|
||||
if(target == src)
|
||||
dismantle_wall(1,1)
|
||||
return
|
||||
|
||||
@@ -451,7 +451,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
|
||||
|
||||
/turf/proc/is_shielded()
|
||||
|
||||
/turf/contents_explosion(severity, target)
|
||||
/turf/contents_explosion(severity, target, origin)
|
||||
var/affecting_level
|
||||
if(severity == 1)
|
||||
affecting_level = 1
|
||||
@@ -469,7 +469,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
|
||||
var/atom/movable/AM = A
|
||||
if(!AM.ex_check(explosion_id))
|
||||
continue
|
||||
A.ex_act(severity, target)
|
||||
A.ex_act(severity, target, origin)
|
||||
CHECK_TICK
|
||||
|
||||
/turf/wave_ex_act(power, datum/wave_explosion/explosion, dir)
|
||||
|
||||
@@ -319,7 +319,10 @@
|
||||
var/atom/A = I
|
||||
if(!QDELETED(A))
|
||||
A.ex_act(severity)
|
||||
gib()
|
||||
if(istype(origin, /datum/explosion))
|
||||
gib(was_explosion = origin)
|
||||
else
|
||||
gib()
|
||||
return
|
||||
else
|
||||
brute_loss = 500
|
||||
|
||||
Reference in New Issue
Block a user