Merge pull request #4872 from Citadel-Station-13/upstream-merge-34401
[MIRROR] Stray bullets and explosions don't blow up the entire syndi lava base anymore
This commit is contained in:
@@ -293,7 +293,7 @@
|
||||
if(adminlog)
|
||||
message_admins(adminlog)
|
||||
log_game(adminlog)
|
||||
explosion(get_turf(src), range_heavy, range_medium, range_light, flame_range = range_flame)
|
||||
explosion(src, range_heavy, range_medium, range_light, flame_range = range_flame)
|
||||
if(loc && istype(loc, /obj/machinery/syndicatebomb/))
|
||||
qdel(loc)
|
||||
qdel(src)
|
||||
|
||||
@@ -250,10 +250,15 @@
|
||||
/turf/closed/wall/mineral/plastitanium/overspace
|
||||
icon_state = "map-overspace"
|
||||
fixed_underlay = list("space"=1)
|
||||
|
||||
/turf/closed/wall/mineral/plastitanium/explosive/dismantle_wall(devastated, explode)
|
||||
var/obj/item/bombcore/large/bombcore = new(get_turf(src))
|
||||
if(devastated || explode)
|
||||
|
||||
/turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity)
|
||||
var/datum/explosion/acted_explosion = null
|
||||
for(var/datum/explosion/E in GLOB.explosions)
|
||||
if(E.explosion_id == explosion_id)
|
||||
acted_explosion = E
|
||||
break
|
||||
if(acted_explosion && istype(acted_explosion.explosion_source, /obj/item/bombcore))
|
||||
var/obj/item/bombcore/large/bombcore = new(get_turf(src))
|
||||
bombcore.detonate()
|
||||
..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user