From c7afe4f70e63094dd70d99371043948b826ba958 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Fri, 13 Oct 2017 17:28:42 -0400 Subject: [PATCH 1/2] Cleans up explosives at syndie base ruin (#31645) --- .../LavaRuins/lavaland_surface_syndicate_base1.dmm | 3 +-- code/game/machinery/syndicatebomb.dm | 3 --- code/game/turfs/simulated/wall/mineral_walls.dm | 6 ++++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 5d192d2a7c..621ed9b00f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -12,8 +12,7 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base) "ae" = ( -/obj/item/bombcore/large/underwall, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/plastitanium/explosive, /area/ruin/powered/syndicate_lava_base) "af" = ( /obj/structure/closet/secure_closet/bar{ diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index d279f2849f..c8eae27f19 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -379,9 +379,6 @@ range_light = 20 range_flame = 20 -/obj/item/bombcore/large/underwall - layer = ABOVE_OPEN_TURF_LAYER - /obj/item/bombcore/miniature name = "small bomb core" w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index 6ae60a6e49..63c5305886 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -258,6 +258,12 @@ 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) + bombcore.detonate() + ..() + //have to copypaste this code /turf/closed/wall/mineral/plastitanium/interior/copyTurf(turf/T) if(T.type != type)