diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm index 269435a7006..bcbf26ccdf9 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm @@ -429,12 +429,9 @@ "pn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, -/obj/item/mounted/frame/apc_frame{ - pixel_x = -3; - pixel_y = 28 - }, /obj/item/clothing/under/rank/cargo/miner, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/unbuilt/directional/north, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "pP" = ( @@ -1307,10 +1304,7 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/workboots/mining, /obj/effect/mapping_helpers/turfs/damage, -/obj/item/mounted/frame/apc_frame{ - pixel_x = -3; - pixel_y = 28 - }, +/obj/machinery/power/apc/unbuilt/directional/north, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "Wl" = ( @@ -1331,10 +1325,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/miningcar, -/obj/item/mounted/frame/apc_frame{ - pixel_x = -3; - pixel_y = 28 - }, +/obj/machinery/power/apc/unbuilt/directional/north, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "WU" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_minebot_factory.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_minebot_factory.dmm index e37aa8d5aea..3cf4aa875e8 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_minebot_factory.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_minebot_factory.dmm @@ -783,8 +783,8 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_factory) "tf" = ( -/obj/item/mounted/frame/apc_frame, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/unbuilt/directional/east, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; nitrogen = 0 @@ -934,12 +934,9 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "wO" = ( -/obj/item/mounted/frame/apc_frame{ - pixel_x = -3; - pixel_y = 28 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, +/obj/machinery/power/apc/unbuilt/directional/north, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_factory) "wW" = ( @@ -1519,10 +1516,9 @@ }, /area/ruin/unpowered/althland_factory) "LF" = ( -/obj/structure/sign/poster/official/space_cops/directional/north, /obj/structure/table, -/obj/item/mounted/frame/apc_frame, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/unbuilt/directional/north, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; nitrogen = 0 @@ -1733,13 +1729,10 @@ dir = 4; invisibility = 101 }, -/obj/item/mounted/frame/apc_frame{ - pixel_x = -3; - pixel_y = 28 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, +/obj/machinery/power/apc/unbuilt/directional/north, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_factory) "Rh" = ( @@ -1972,6 +1965,7 @@ dir = 1 }, /obj/effect/spawner/random/loot, +/obj/structure/sign/poster/official/space_cops/directional/north, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; nitrogen = 0 diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm index f46a15a871c..6edfb633675 100644 --- a/code/modules/power/apc/apc.dm +++ b/code/modules/power/apc/apc.dm @@ -1156,6 +1156,11 @@ /obj/machinery/power/apc/reinforced/critical cell_type = 25000 +/obj/machinery/power/apc/unbuilt + +/obj/machinery/power/apc/unbuilt/Initialize(mapload, direction, building) + . = ..(building = TRUE) + MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc, 24, 24) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate, 24, 24) @@ -1168,6 +1173,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, 24, 24) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced, 24, 24) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/important, 24, 24) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/critical, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/unbuilt, 24, 24) /obj/item/apc_electronics