cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 12:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Explosions SS runtime fix + code cleanup (#461)

Browse Source 
* Explosions SS runtime fix + code cleanup (#52894)

* runtime fix

* turf references are immortal

* Explosions SS runtime fix + code cleanup

Co-authored-by: Rohesie <rohesie@gmail.com>
This commit is contained in:
SkyratBot
2020-08-21 21:30:43 +01:00
committed by GitHub
co-authored by Rohesie
parent 98f195e72c
commit d3f6e8d49f
28 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/anomalies.dm
+4 -4
View File
@@ -332,7 +332,7 @@
if(target && !target.stat)
O.throw_at(target, 7, 5)
else
SSexplosions.medobj += O
SSexplosions.med_mov_atom += O
/obj/effect/anomaly/bhole/proc/grav(r, ex_act_force, pull_chance, turf_removal_chance)
for(var/t = -r, t < r, t++)
@@ -353,11 +353,11 @@
if(O.anchored)
switch(ex_act_force)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += O
SSexplosions.high_mov_atom += O
if(EXPLODE_HEAVY)
SSexplosions.medobj += O
SSexplosions.med_mov_atom += O
if(EXPLODE_LIGHT)
SSexplosions.lowobj += O
SSexplosions.low_mov_atom += O
else
step_towards(O,src)
for(var/mob/living/M in T.contents)
code/game/objects/items/storage/storage.dm
+4 -4
View File
@@ -19,14 +19,14 @@
return FALSE
/obj/item/storage/contents_explosion(severity, target)
for(var/atom/A in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
SSexplosions.low_mov_atom += thing
/obj/item/storage/canStrip(mob/who)
. = ..()
code/game/objects/obj_defense.dm
+1 -1
View File
@@ -159,7 +159,7 @@
return take_damage(M.force*3, mech_damtype, "melee", play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
/obj/singularity_act()
SSexplosions.highobj += src
SSexplosions.high_mov_atom += src
if(src && !QDELETED(src))
qdel(src)
return 2
code/game/objects/structures/crates_lockers/closets.dm
+4 -4
View File
@@ -496,14 +496,14 @@
req_access += pick(get_all_accesses())
/obj/structure/closet/contents_explosion(severity, target)
for(var/atom/A in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
SSexplosions.low_mov_atom += thing
/obj/structure/closet/singularity_act()
dump_contents()
code/game/objects/structures/extinguisher.dm
+3 -3
View File
@@ -35,11 +35,11 @@
if(stored_extinguisher)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += stored_extinguisher
SSexplosions.high_mov_atom += stored_extinguisher
if(EXPLODE_HEAVY)
SSexplosions.medobj += stored_extinguisher
SSexplosions.med_mov_atom += stored_extinguisher
if(EXPLODE_LIGHT)
SSexplosions.lowobj += stored_extinguisher
SSexplosions.low_mov_atom += stored_extinguisher
/obj/structure/extinguisher_cabinet/handle_atom_del(atom/A)
if(A == stored_extinguisher)
code/game/objects/structures/guncase.dm
+4 -4
View File
@@ -116,14 +116,14 @@
update_icon()
/obj/structure/guncase/contents_explosion(severity, target)
for(var/atom/A in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
SSexplosions.low_mov_atom += thing
/obj/structure/guncase/shotgun
name = "shotgun locker"
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+4 -4
View File
@@ -58,14 +58,14 @@
empty_pod()
/obj/structure/transit_tube_pod/contents_explosion(severity, target)
for(var/atom/movable/AM in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += AM
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += AM
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += AM
SSexplosions.low_mov_atom += thing
/obj/structure/transit_tube_pod/singularity_pull(S, current_size)
..()