shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

this WILL fail CI

Browse Source 
hnnnngh
This commit is contained in:
DeltaFire
2021-11-14 20:48:41 +01:00
parent dacaa637ec
commit 7d2ff194d1
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/explosion.dm
+1 -1
View File
@@ -253,7 +253,7 @@ GLOBAL_LIST_EMPTY(explosions)
if(dist > EXPLODE_NONE) if(dist > EXPLODE_NONE)
T.explosion_level = max(T.explosion_level, dist) //let the bigger one have it T.explosion_level = max(T.explosion_level, dist) //let the bigger one have it
T.explosion_id = id T.explosion_id = id
T.ex_act(dist) T.ex_act(dist, origin = src)
exploded_this_tick += T exploded_this_tick += T
//--- THROW ITEMS AROUND --- //--- THROW ITEMS AROUND ---
code/game/atoms.dm
+3 -3
View File
@@ -610,12 +610,12 @@
user.buckle_message_cooldown = world.time + 50 user.buckle_message_cooldown = world.time + 50
to_chat(user, "<span class='warning'>You can't move while buckled to [src]!</span>") 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 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 set waitfor = FALSE
contents_explosion(severity, target) contents_explosion(severity, target, origin)
SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, severity, target) SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, severity, target)
/** /**
code/game/turfs/simulated/floor.dm
+1 -1
View File
@@ -72,7 +72,7 @@
if(mapload && prob(66)) // 2/3 instead of 1/3 (default) if(mapload && prob(66)) // 2/3 instead of 1/3 (default)
MakeDirty() MakeDirty()
/turf/open/floor/ex_act(severity, target) /turf/open/floor/ex_act(severity, target, origin)
var/shielded = is_shielded() var/shielded = is_shielded()
..() ..()
if(severity != 1 && shielded && target != src) if(severity != 1 && shielded && target != src)
code/game/turfs/simulated/walls.dm
+1 -1
View File
@@ -80,7 +80,7 @@
if(girder_type) if(girder_type)
new /obj/item/stack/sheet/metal(src) 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) if(target == src)
dismantle_wall(1,1) dismantle_wall(1,1)
return return
code/game/turfs/turf.dm
+2 -2
View File
@@ -451,7 +451,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
/turf/proc/is_shielded() /turf/proc/is_shielded()
/turf/contents_explosion(severity, target) /turf/contents_explosion(severity, target, origin)
var/affecting_level var/affecting_level
if(severity == 1) if(severity == 1)
affecting_level = 1 affecting_level = 1
@@ -469,7 +469,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
var/atom/movable/AM = A var/atom/movable/AM = A
if(!AM.ex_check(explosion_id)) if(!AM.ex_check(explosion_id))
continue continue
A.ex_act(severity, target) A.ex_act(severity, target, origin)
CHECK_TICK CHECK_TICK
/turf/wave_ex_act(power, datum/wave_explosion/explosion, dir) /turf/wave_ex_act(power, datum/wave_explosion/explosion, dir)
code/modules/mob/living/carbon/human/human_defense.dm
+4 -1
View File
@@ -319,7 +319,10 @@
var/atom/A = I var/atom/A = I
if(!QDELETED(A)) if(!QDELETED(A))
A.ex_act(severity) A.ex_act(severity)
gib() if(istype(origin, /datum/explosion))
gib(was_explosion = origin)
else
gib()
return return
else else
brute_loss = 500 brute_loss = 500