From 887e172a26c753e8cf5d56bdb9aefa97bfcc163c Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sat, 23 Nov 2013 06:55:46 -0500 Subject: [PATCH] More asteroid unsim fixes --- code/game/asteroid.dm | 2 +- code/game/mecha/equipment/tools/tools.dm | 8 ++++---- code/game/objects/effects/glowshroom.dm | 2 +- code/game/objects/items/stacks/tiles/plasteel.dm | 2 +- code/game/turfs/simulated/floor.dm | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 05fc66d2d40..4d1e89634f2 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -131,7 +131,7 @@ proc/make_mining_asteroid_secret(var/size = 5) valid = 0 continue - if(locate(/turf/simulated/floor/plating/airless/asteroid) in surroundings) + if(locate(/turf/unsimulated/floor/plating/airless/asteroid) in surroundings) valid = 0 continue diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index fd34b65baa0..5a3e08897f9 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -102,8 +102,8 @@ for(var/obj/item/weapon/ore/ore in range(chassis,1)) if(get_dir(chassis,ore)&chassis.dir) ore.Move(ore_box) - else if(istype(target, /turf/simulated/floor/plating/airless/asteroid)) - for(var/turf/simulated/floor/plating/airless/asteroid/M in range(chassis,1)) + else if(istype(target, /turf/unsimulated/floor/plating/airless/asteroid)) + for(var/turf/unsimulated/floor/plating/airless/asteroid/M in range(chassis,1)) if(get_dir(chassis,M)&chassis.dir) M.gets_dug() log_message("Drilled through [target]") @@ -161,8 +161,8 @@ for(var/obj/item/weapon/ore/ore in range(chassis,1)) if(get_dir(chassis,ore)&chassis.dir) ore.Move(ore_box) - else if(istype(target,/turf/simulated/floor/plating/airless/asteroid)) - for(var/turf/simulated/floor/plating/airless/asteroid/M in range(target,1)) + else if(istype(target,/turf/unsimulated/floor/plating/airless/asteroid)) + for(var/turf/unsimulated/floor/plating/airless/asteroid/M in range(target,1)) M.gets_dug() log_message("Drilled through [target]") if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 425034ba485..598bca09199 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -67,7 +67,7 @@ if(prob(spreadIntoAdjacentChance)) spreadsIntoAdjacent = 1 - for(var/turf/simulated/floor/plating/airless/asteroid/earth in view(3,src)) + for(var/turf/unsimulated/floor/plating/airless/asteroid/earth in view(3,src)) if(spreadsIntoAdjacent || !locate(/obj/effect/glowshroom) in view(1,earth)) possibleLocs += earth diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index cbbf1811cc5..85edd19adf8 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -37,7 +37,7 @@ /obj/item/stack/tile/plasteel/proc/build(turf/S as turf) if (istype(S,/turf/space)) - S.ChangeTurf(/turf/simulated/floor/plating/airless) + S.ChangeTurf(/turf/unsimulated/floor/plating/airless) else S.ChangeTurf(/turf/simulated/floor/plating) // var/turf/simulated/floor/W = S.ReplaceWithFloor() diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 2b85253dd06..28bddbb2808 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -276,7 +276,7 @@ turf/simulated/floor/proc/update_icon() /turf/simulated/floor/proc/burn_tile() if(istype(src,/turf/simulated/floor/engine)) return - if(istype(src,/turf/simulated/floor/plating/airless/asteroid)) return//Asteroid tiles don't burn + if(istype(src,/turf/unsimulated/floor/plating/airless/asteroid)) return//Asteroid tiles don't burn if(broken || burnt) return if(is_plasteel_floor()) src.icon_state = "damaged[pick(1,2,3,4,5)]"