diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index bcfeae80afd..9551bed794f 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -38,7 +38,8 @@ else playsound(src, 'sound/items/Welder.ogg', 100, 1) var/newgirder = break_wall() - transfer_fingerprints_to(newgirder) + if(newgirder) //maybe we don't /want/ a girder! + transfer_fingerprints_to(newgirder) for(var/obj/O in src.contents) //Eject contents! if(istype(O,/obj/structure/sign/poster)) diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index 4807d34115a..83e29d65bce 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -1,5 +1,5 @@ /turf/closed/wall/cult - name = "runed wall" + name = "runed metal wall" desc = "A cold metal wall engraved with indecipherable symbols. Studying them causes your head to pound." icon = 'icons/turf/walls/cult_wall.dmi' icon_state = "cult" @@ -21,6 +21,17 @@ /turf/closed/wall/cult/narsie_act() return +/turf/closed/wall/cult/artificer + name = "runed stone wall" + desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound." + +/turf/closed/wall/cult/artificer/break_wall() + PoolOrNew(/obj/effect/overlay/temp/cult/turf, get_turf(src)) + return null //excuse me we want no runed metal here + +/turf/closed/wall/cult/artificer/devastate_wall() + PoolOrNew(/obj/effect/overlay/temp/cult/turf, get_turf(src)) + /turf/closed/wall/vault icon = 'icons/turf/walls.dmi' icon_state = "rockvault" diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm index 238c78f6d74..d5666f99223 100644 --- a/code/modules/spells/spell_types/construct_spells.dm +++ b/code/modules/spells/spell_types/construct_spells.dm @@ -36,7 +36,7 @@ action_icon_state = "lesserconstruct" action_background_icon_state = "bg_cult" - summon_type = list(/turf/closed/wall/cult) + summon_type = list(/turf/closed/wall/cult/artificer) //we don't want artificer-based runed metal farms /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced name = "Greater Construction" diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index bb4ea481098..949f864eb7f 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ