From ccf3002e462684e04cd4c29ed14aa39a8b840849 Mon Sep 17 00:00:00 2001 From: MrStonedOne Date: Fri, 9 Dec 2016 02:08:53 -0800 Subject: [PATCH] Fixes somethings I broke. fixes walls spawning their metal in an odd spot because of loc vs src confusion. fixes ashdrakes's flame wall getting confused when it tried to see if the turf it is standing on is atmosly connected to the turf it is standing on. --- code/game/turfs/simulated/wall/reinf_walls.dm | 4 ++-- code/game/turfs/simulated/walls.dm | 4 ++-- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm index 3543a101c09..a81a4851891 100644 --- a/code/game/turfs/simulated/wall/reinf_walls.dm +++ b/code/game/turfs/simulated/wall/reinf_walls.dm @@ -30,11 +30,11 @@ user << "The support rods have been sliced through, and the outer sheath is connected loosely to the girder." /turf/closed/wall/r_wall/break_wall() - new sheet_type(loc) + new sheet_type(src) return (new /obj/structure/girder/reinforced(src)) /turf/closed/wall/r_wall/devastate_wall() - new sheet_type(loc) + new sheet_type(src) new /obj/item/stack/sheet/metal(src, 2) /turf/closed/wall/r_wall/attack_animal(mob/living/simple_animal/M) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 80b82246fb3..c9ca9c23e30 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -43,12 +43,12 @@ ChangeTurf(/turf/open/floor/plating) /turf/closed/wall/proc/break_wall() - var/obj/item/stack/sheet/builtin_sheet = new sheet_type(loc) + var/obj/item/stack/sheet/builtin_sheet = new sheet_type(src) builtin_sheet.amount = 2 return (new /obj/structure/girder(src)) /turf/closed/wall/proc/devastate_wall() - var/obj/item/stack/sheet/builtin_sheet = new sheet_type(loc) + var/obj/item/stack/sheet/builtin_sheet = new sheet_type(src) builtin_sheet.amount = 2 new /obj/item/stack/sheet/metal(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 6d15a0c24fd..9417ed48764 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -171,7 +171,7 @@ Difficulty: Medium var/range = 10 var/turf/previousturf = get_turf(src) for(var/turf/J in getline(src,E)) - if(!range || !previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J]) + if(!range || (J != previousturf && (!previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J]))) break range-- PoolOrNew(/obj/effect/hotspot,J)