From 7a99caeeb3f0361d499e91e00cfcc7f4afe79078 Mon Sep 17 00:00:00 2001 From: MLGTASTICa Date: Tue, 13 Aug 2024 08:24:01 +0300 Subject: [PATCH] THE changes. --- code/__DEFINES/__atomFlags.dm | 2 + code/game/atoms.dm | 3 + code/game/machinery/alarm.dm | 4 +- code/game/objects/structures.dm | 1 - code/game/objects/structures/window.dm | 16 - code/game/turfs/space/space.dm | 4 +- code/game/turfs/turf.dm | 2 + code/modules/power/apc.dm | 14 +- code/modules/projectiles/hitbox_datums.dm | 22 +- code/modules/reagents/reagent_dispenser.dm | 4 +- maps/CEVEris/_CEV_Eris.dmm | 314 +++++++++--------- maps/encounters/prisonhulk/prisonhulk.dmm | 2 +- maps/submaps/cave_pois/crashed_pod.dmm | 2 +- .../crashed_pod/crashed_pod.dmm | 2 +- .../ec_old_crash/ec_old_crash.dmm | 6 +- .../planetary_ruins/hydrobase/hydrobase.dmm | 22 +- .../planetary_ruins/playablecolony/colony.dmm | 80 ++--- maps/testmap/test_map.dmm | 6 +- 18 files changed, 252 insertions(+), 254 deletions(-) diff --git a/code/__DEFINES/__atomFlags.dm b/code/__DEFINES/__atomFlags.dm index 5265cc6e66..7e3ffc9ecb 100644 --- a/code/__DEFINES/__atomFlags.dm +++ b/code/__DEFINES/__atomFlags.dm @@ -11,3 +11,5 @@ #define AF_IGNORE_ON_BULLETSCAN (1<<6) /// This atom will get ignored by explosions #define AF_EXPLOSION_IGNORANT (1<<8) +/// Uses the aiming level for shooting at the shooter instead. +#define AF_PASS_AIMING_LEVEL (1<<9) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index b18b01e276..2f20b49592 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -108,6 +108,9 @@ return /atom/getAimingLevel(atom/shooter, defZone) + if(atomFlags & AF_PASS_AIMING_LEVEL) + if(isliving(shooter)) + return shooter.getAimingLevel(shooter, defZone) if(hitbox) return hitbox.getAimingLevel(shooter, defZone, src) else diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 997f0ce5ad..19809987a7 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -129,7 +129,7 @@ var/turf/toAttach = get_step(loc, reverse_dir[dir]) if(iswall(toAttach)) - toAttach.attachGameAtom(src, ATFS_PRIORITIZE_ATTACHED_FOR_HITS, ATFA_EASY_INTERACTIVE | ATFA_DIRECTIONAL_HITTABLE | ATFA_CENTER_ON_SUPPORTER) + toAttach.attachGameAtom(src, ATFS_PRIORITIZE_ATTACHED_FOR_HITS, ATFA_EASY_INTERACTIVE | ATFA_DIRECTIONAL_HITTABLE ) else stack_trace("[src.type] has no wall to attach itself to at X:[x] Y:[y] Z:[z]") // the players need to be confused so they complain about it! @@ -1221,7 +1221,7 @@ FIRE ALARM var/turf/toAttach = get_step(loc, reverse_dir[dir]) if(iswall(toAttach)) - toAttach.attachGameAtom(src, ATFS_PRIORITIZE_ATTACHED_FOR_HITS, ATFA_EASY_INTERACTIVE | ATFA_DIRECTIONAL_HITTABLE | ATFA_CENTER_ON_SUPPORTER) + toAttach.attachGameAtom(src, ATFS_PRIORITIZE_ATTACHED_FOR_HITS, ATFA_EASY_INTERACTIVE | ATFA_DIRECTIONAL_HITTABLE ) else stack_trace("[src.type] has no wall to attach itself to at X:[x] Y:[y] Z:[z]") // the players need to be confused so they complain about it! diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 4918e34810..99512870be 100755 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -106,7 +106,6 @@ return PROJECTILE_CONTINUE return PROJECTILE_STOP - /obj/structure/New() ..() if(climbable) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 705ba34974..be6cf72c76 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -147,22 +147,6 @@ qdel(src) return - -/obj/structure/window/bullet_act(obj/item/projectile/Proj, defZone, hitboxFlags) - - . = PROJECTILE_CONTINUE - var/targetzone = check_zone(Proj.def_zone) - if(targetzone in list(BP_CHEST, BP_HEAD, BP_L_ARM, BP_R_ARM)) - var/proj_damage = Proj.get_structure_damage() - if(proj_damage) - hit(proj_damage) - ..() - if(!QDELETED(src)) - return PROJECTILE_STOP - - return PROJECTILE_STOP - - //TODO: Make full windows a separate type of window. //Once a full window, it will always be a full window, so there's no point //having the same type for both. diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index c4ed738c2d..c0f80e02a0 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -3,6 +3,7 @@ name = "\proper space" icon_state = "0" dynamic_lighting = 0 + atomFlags = AF_PASS_AIMING_LEVEL plane = PLANE_SPACE layer = SPACE_LAYER @@ -21,9 +22,6 @@ /turf/space/bullet_act(obj/item/projectile/P, def_zone, hitboxFlags) return PROJECTILE_CONTINUE -/turf/space/getAimingLevel(atom/shooter, defZone) - return shooter.getAimingLevel(shooter, defZone) - /turf/space/take_damage(target_power, damage_type) return TRUE diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index f12820e193..dc1968016b 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -14,6 +14,8 @@ var/footstep_type + atomFlags = AF_PASS_AIMING_LEVEL + //Properties for airtight tiles (/wall) var/thermal_conductivity = 0.05 var/heat_capacity = 1 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 87cd79e7e9..df10297528 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -71,7 +71,7 @@ anchored = TRUE use_power = NO_POWER_USE req_access = list(access_engine_equip) - //hitbox = /datum/hitboxDatum/atom/apc + hitbox = /datum/hitboxDatum/atom/areaPowerController var/need_sound var/area/area var/areastring @@ -183,13 +183,13 @@ /obj/machinery/power/apc/set_dir() . = ..() switch(dir) - if(NORTH) - pixel_y = 28 if(SOUTH) + pixel_y = 28 + if(NORTH) pixel_y = -28 - if(EAST) - pixel_x = 28 if(WEST) + pixel_x = 28 + if(EAST) pixel_x = -28 @@ -222,10 +222,10 @@ log_mapping("Duplicate APC created at [AREACOORD(src)]. Original at [AREACOORD(area.apc)].") area.apc = src - var/turf/toAttach = get_step(loc, dir) + var/turf/toAttach = get_step(loc, reverse_dir[dir]) if(iswall(toAttach)) - toAttach.attachGameAtom(src, ATFS_PRIORITIZE_ATTACHED_FOR_HITS, ATFA_EASY_INTERACTIVE | ATFA_DIRECTIONAL_HITTABLE | ATFA_CENTER_ON_SUPPORTER) + toAttach.attachGameAtom(src, ATFS_PRIORITIZE_ATTACHED_FOR_HITS, ATFA_EASY_INTERACTIVE | ATFA_DIRECTIONAL_HITTABLE ) else stack_trace("[src.type] has no wall to attach itself to at X:[x] Y:[y] Z:[z]") // the players need to be confused so they complain about it! diff --git a/code/modules/projectiles/hitbox_datums.dm b/code/modules/projectiles/hitbox_datums.dm index 37e534d784..17032cf53b 100644 --- a/code/modules/projectiles/hitbox_datums.dm +++ b/code/modules/projectiles/hitbox_datums.dm @@ -317,6 +317,14 @@ boolean lineLine(float x1, float y1, float x2, float y2, float x3, float y3, flo LISTWEST = list(BBOX(10,9,23,25,LEVEL_CHEST-1,LEVEL_CHEST+2,null)) ) +/datum/hitboxDatum/atom/areaPowerController + boundingBoxes = list( + LISTNORTH = list(BBOX(8,10,24,23,LEVEL_CHEST-1,LEVEL_CHEST+2,null)), + LISTSOUTH = list(BBOX(8,10,24,23,LEVEL_CHEST-1,LEVEL_CHEST+2,null)), + LISTEAST = list(BBOX(10,8,23,24,LEVEL_CHEST-1,LEVEL_CHEST+2,null)), + LISTWEST = list(BBOX(10,9,23,25,LEVEL_CHEST-1,LEVEL_CHEST+2,null)) + ) + /datum/hitboxDatum/atom/window/directional boundingBoxes = list( LISTNORTH = list(BBOX(1,26,32,32, LEVEL_TURF, LEVEL_ABOVE, null)), @@ -333,6 +341,14 @@ boolean lineLine(float x1, float y1, float x2, float y2, float x3, float y3, flo LISTWEST = list(BBOX(0,0,32,32, LEVEL_TURF, LEVEL_LOWWALL, null)) ) +/datum/hitboxDatum/atom/reagentTank + boundingBoxes = list( + LISTNORTH = list(BBOX(5,4,31,28, LEVEL_TURF, LEVEL_TABLE, null)), + LISTSOUTH = list(BBOX(5,4,31,28, LEVEL_TURF, LEVEL_TABLE, null)), + LISTEAST = list(BBOX(5,4,31,28, LEVEL_TURF, LEVEL_TABLE, null)), + LISTWEST = list(BBOX(5,4,31,28, LEVEL_TURF, LEVEL_TABLE, null)) + ) + /datum/hitboxDatum/turf boundingBoxes = BBOX(0,0,32,32,LEVEL_BELOW ,LEVEL_ABOVE,null) @@ -371,12 +387,6 @@ boolean lineLine(float x1, float y1, float x2, float y2, float x3, float y3, flo return TRUE return FALSE -/datum/hitboxDatum/turf/getAimingLevel(atom/shooter, defZone, atom/owner) - if(isliving(shooter)) - return shooter.getAimingLevel(shooter, defZone) - else - return ..() - /datum/hitboxDatum/turf/wall boundingBoxes = BBOX(0,0,32,32,LEVEL_BELOW ,LEVEL_ABOVE,null) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 3281ef02a2..cb02089554 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -80,6 +80,7 @@ name = "water tank" desc = "A water tank. It is used to store high amounts of water." icon_state = "watertank" + hitbox = /datum/hitboxDatum/atom/reagentTank amount_per_transfer_from_this = 10 volume = 1500 starting_reagent = "water" @@ -108,6 +109,7 @@ desc = "A tank full of industrial welding fuel. Do not consume." description_antag = "Can have an assembly with a igniter attached for detonation upon a trigger. Can also use a screwdriver to leak fuel when dragged" icon = 'icons/obj/objects.dmi' + hitbox = /datum/hitboxDatum/atom/reagentTank icon_state = "weldtank" amount_per_transfer_from_this = 10 volume = 500 @@ -197,8 +199,6 @@ message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (JMP).") log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).") - if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) ) - explode() /obj/structure/reagent_dispensers/fueltank/explosion_act(target_power, explosion_handler/handle) if(target_power > health) explode() diff --git a/maps/CEVEris/_CEV_Eris.dmm b/maps/CEVEris/_CEV_Eris.dmm index c0e57f4540..262c4b84a7 100644 --- a/maps/CEVEris/_CEV_Eris.dmm +++ b/maps/CEVEris/_CEV_Eris.dmm @@ -86,7 +86,7 @@ /obj/item/target, /obj/item/target, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -345,7 +345,7 @@ "abb" = ( /obj/structure/closet/wardrobe/sec, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -773,7 +773,7 @@ "acc" = ( /obj/structure/closet/wardrobe/color/orange, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -918,7 +918,7 @@ /area/eris/security/disposal) "acu" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -2645,7 +2645,7 @@ /area/eris/security/exerooms) "agz" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -2881,7 +2881,7 @@ icon_state = "pipe-c" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -4367,7 +4367,7 @@ /area/eris/security/exerooms) "akn" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -5116,7 +5116,7 @@ /area/eris/security/maintpost) "amg" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -6460,7 +6460,7 @@ /area/eris/crew_quarters/sleep) "apz" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -6721,7 +6721,7 @@ /area/eris/crew_quarters/bar) "aqb" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -6929,7 +6929,7 @@ "aqA" = ( /obj/structure/catwalk, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -7028,7 +7028,7 @@ /area/eris/hallway/side/eschangarb) "aqJ" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -7613,7 +7613,7 @@ /area/eris/hallway/side/eschangarb) "arV" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -8280,7 +8280,7 @@ /area/eris/maintenance/section3deck5starboard) "atq" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -9055,7 +9055,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -9073,7 +9073,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -9242,7 +9242,7 @@ "awc" = ( /obj/structure/catwalk, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -10937,7 +10937,7 @@ /area/eris/maintenance/disposal) "aAC" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -11449,7 +11449,7 @@ /area/eris/crew_quarters/toilet/medbay) "aBQ" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -11934,7 +11934,7 @@ /area/eris/maintenance/section4deck5port) "aDh" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -12529,7 +12529,7 @@ /area/eris/maintenance/section4deck5port) "aEF" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -13100,7 +13100,7 @@ dir = 8 }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -16187,7 +16187,7 @@ /area/eris/engineering/wastingroom) "aOG" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -16320,7 +16320,7 @@ pixel_y = -22 }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -16597,7 +16597,7 @@ /area/eris/engineering/atmos/storage) "aPH" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -17345,7 +17345,7 @@ /area/eris/security/main) "aRi" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -17627,7 +17627,7 @@ /area/eris/security/barracks) "aRQ" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -17926,7 +17926,7 @@ /area/eris/security/warden) "aSz" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -18729,7 +18729,7 @@ /area/eris/security/prisoncells) "aUs" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -19886,7 +19886,7 @@ /area/eris/maintenance/section2deck4port) "aWU" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -20113,7 +20113,7 @@ /area/eris/engineering/atmos) "aXy" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -22103,7 +22103,7 @@ "bbB" = ( /obj/structure/catwalk, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -23690,7 +23690,7 @@ /area/eris/maintenance/substation/section1) "bez" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -23938,7 +23938,7 @@ /area/eris/maintenance/substation/section2) "bfc" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -24148,7 +24148,7 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -24542,7 +24542,7 @@ /area/eris/maintenance/section2deck4starboard) "bgD" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -25569,7 +25569,7 @@ dir = 8 }, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -25995,7 +25995,7 @@ /area/eris/rnd/robotics) "bjW" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -26778,7 +26778,7 @@ /area/eris/crew_quarters/librarybackroom) "blC" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -27863,7 +27863,7 @@ /area/eris/medical/morgue) "bnW" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -28056,7 +28056,7 @@ /area/eris/maintenance/section3deck1central) "box" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -30290,7 +30290,7 @@ /area/eris/command/teleporter) "bux" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -31058,7 +31058,7 @@ /area/eris/hallway/main/section1) "bws" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -31866,7 +31866,7 @@ /area/eris/engineering/drone_fabrication) "byc" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -32341,7 +32341,7 @@ dir = 8 }, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -32640,7 +32640,7 @@ /area/eris/engineering/atmos/storage) "bzP" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -32864,7 +32864,7 @@ /area/eris/maintenance/sorter) "bAt" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -33133,7 +33133,7 @@ /area/eris/maintenance/section3deck1central) "bBb" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -34095,7 +34095,7 @@ /area/eris/rnd/docking) "bDK" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -35186,7 +35186,7 @@ /area/eris/security/lobby) "bGf" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -35287,7 +35287,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -35912,7 +35912,7 @@ /area/eris/hallway/main/section4) "bHG" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -37136,7 +37136,7 @@ /area/eris/maintenance/section4deck4port) "bKj" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -38050,7 +38050,7 @@ /area/eris/maintenance/section4deck4port) "bMi" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -39358,7 +39358,7 @@ /area/eris/engineering/construction) "bOZ" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -40148,7 +40148,7 @@ /area/eris/maintenance/section4deck4port) "bQR" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -40193,7 +40193,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -40523,7 +40523,7 @@ "bRW" = ( /obj/structure/closet/wardrobe/color/mixed, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -40757,7 +40757,7 @@ "bSC" = ( /obj/structure/closet/firecloset, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -41266,7 +41266,7 @@ "bTP" = ( /obj/structure/catwalk, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -41935,7 +41935,7 @@ /area/eris/hallway/main/section1) "bVD" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -42181,7 +42181,7 @@ /area/eris/medical/psych) "bWm" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -44212,7 +44212,7 @@ /area/eris/command/fo) "cbz" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -44834,7 +44834,7 @@ /area/eris/maintenance/section3deck4central) "cda" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -47069,7 +47069,7 @@ /area/eris/rnd/server) "chX" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -48282,7 +48282,7 @@ /area/eris/medical/medbay) "clh" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -48410,7 +48410,7 @@ /area/eris/rnd/mixing) "clA" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -49660,7 +49660,7 @@ pixel_y = 4 }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -49685,7 +49685,7 @@ /area/eris/maintenance/section3deck4central) "coO" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -50450,7 +50450,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -51447,7 +51447,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -51584,7 +51584,7 @@ /area/eris/quartermaster/storage) "ctT" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -51852,7 +51852,7 @@ /area/eris/command/meo) "cuJ" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -51942,7 +51942,7 @@ /area/eris/medical/medbreak) "cuV" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -52888,7 +52888,7 @@ "cxr" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -53961,7 +53961,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -54019,7 +54019,7 @@ /obj/structure/table/reinforced, /obj/item/storage/box/donut, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -54217,7 +54217,7 @@ /obj/structure/table/standard, /obj/item/device/radio/off, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -54236,7 +54236,7 @@ "cAG" = ( /obj/structure/catwalk, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -56573,7 +56573,7 @@ /area/eris/maintenance/section3deck4central) "cGp" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -56631,7 +56631,7 @@ "cGu" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -57266,7 +57266,7 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -57690,7 +57690,7 @@ "cJj" = ( /obj/structure/catwalk, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -58762,7 +58762,7 @@ "cLS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -61534,7 +61534,7 @@ pixel_y = 30 }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -62360,7 +62360,7 @@ /area/space) "cWe" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -62401,7 +62401,7 @@ /area/eris/rnd/xenobiology) "cWi" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -63129,7 +63129,7 @@ "cXU" = ( /obj/structure/catwalk, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -63167,7 +63167,7 @@ /area/eris/maintenance/section2deck2port) "cXY" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -63195,7 +63195,7 @@ /area/eris/maintenance/section3deck3starboard) "cYa" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -63645,7 +63645,7 @@ /area/shuttle/mining/station) "cYY" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -64273,7 +64273,7 @@ /obj/item/clothing/mask/muzzle, /obj/item/clothing/mask/muzzle, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -65596,7 +65596,7 @@ /area/eris/command/bridgebar) "ddF" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -66055,7 +66055,7 @@ /area/eris/command/captain) "deD" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -66737,7 +66737,7 @@ /area/eris/maintenance/section3deck4starboard) "dgi" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -66822,7 +66822,7 @@ /area/eris/rnd/anomal) "dgr" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -67246,7 +67246,7 @@ /area/eris/command/fo/quarters) "dhe" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -68474,7 +68474,7 @@ /area/eris/rnd/research) "djW" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -68942,7 +68942,7 @@ "dla" = ( /obj/structure/table/woodentable, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -69464,7 +69464,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -70020,7 +70020,7 @@ /area/eris/medical/reception) "dnp" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -70431,7 +70431,7 @@ /area/eris/maintenance/section2deck2port) "dok" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -72213,7 +72213,7 @@ "dsE" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -72285,7 +72285,7 @@ /obj/structure/table/standard, /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -72783,7 +72783,7 @@ /area/eris/maintenance/section3deck4starboard) "dua" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -72848,7 +72848,7 @@ /area/eris/security/checkpoint/medical) "dui" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -73070,7 +73070,7 @@ "duF" = ( /obj/structure/closet/secure_closet/personal/doctor, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -73199,7 +73199,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -74257,7 +74257,7 @@ /area/eris/command/bridge) "dxC" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -75209,7 +75209,7 @@ "dzV" = ( /obj/structure/table/standard, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -75564,7 +75564,7 @@ /obj/structure/table/standard, /obj/item/device/eftpos, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -75796,7 +75796,7 @@ /area/eris/medical/medbay) "dBp" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -76108,7 +76108,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet/medical, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -76600,7 +76600,7 @@ /area/eris/maintenance/section1deck1central) "dDd" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -76714,7 +76714,7 @@ "dDu" = ( /obj/structure/catwalk, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -77855,7 +77855,7 @@ /area/eris/maintenance/section1deck5central) "dGn" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -77957,7 +77957,7 @@ /area/eris/hallway/main/section3) "dGz" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -77998,7 +77998,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -78418,7 +78418,7 @@ /area/eris/maintenance/section3deck4port) "dHE" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -81003,7 +81003,7 @@ "dOs" = ( /obj/structure/closet/secure_closet/reinforced/engineering_chief, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -81443,7 +81443,7 @@ /obj/item/stack/cable_coil, /obj/item/device/radio, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -82012,7 +82012,7 @@ "dRn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -83715,7 +83715,7 @@ /area/eris/medical/chemstor) "dVO" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -84087,7 +84087,7 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -85205,7 +85205,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -85601,7 +85601,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -85985,7 +85985,7 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -86015,7 +86015,7 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -86584,7 +86584,7 @@ /area/eris/rnd/misc_lab) "ecZ" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -87182,7 +87182,7 @@ /area/eris/rnd/anomal) "eeu" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -88210,7 +88210,7 @@ /obj/structure/table/standard, /obj/item/device/lighting/toggleable/lamp, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -88996,7 +88996,7 @@ "eiP" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -89110,7 +89110,7 @@ /area/eris/maintenance/section4deck1central) "ejb" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -90692,7 +90692,7 @@ /area/eris/hallway/side/section3deck2port) "emX" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -90829,7 +90829,7 @@ "enq" = ( /obj/structure/table/standard, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -91875,7 +91875,7 @@ /area/eris/engineering/propulsion/left) "eqc" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -92527,7 +92527,7 @@ /area/eris/crew_quarters/clownoffice) "erz" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -92942,7 +92942,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -94149,7 +94149,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -96856,7 +96856,7 @@ dir = 10 }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -96965,7 +96965,7 @@ /area/eris/engineering/gravity_generator) "eBC" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -97832,7 +97832,7 @@ "eDG" = ( /obj/structure/closet/secure_closet/medicine, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -98933,7 +98933,7 @@ /area/eris/engineering/propulsion/right) "eHd" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -99210,7 +99210,7 @@ /area/eris/maintenance/section3deck2starboard) "ePg" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -100288,7 +100288,7 @@ /area/eris/medical/medbay/organs) "haf" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -101210,7 +101210,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -101515,7 +101515,7 @@ "jwC" = ( /obj/spawner/mob/roaches/low_chance, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -101640,7 +101640,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -102239,7 +102239,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -102970,7 +102970,7 @@ /area/eris/crew_quarters/kitchen) "mFk" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -103767,7 +103767,7 @@ /area/eris/crew_quarters/hydroponics) "oSZ" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -103964,7 +103964,7 @@ "ppW" = ( /obj/structure/table/rack/shelf, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -104279,7 +104279,7 @@ /area/eris/crew_quarters/fitness) "pYm" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -104580,7 +104580,7 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 }, @@ -105557,7 +105557,7 @@ "sRC" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -106342,7 +106342,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -107568,7 +107568,7 @@ "xsu" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, diff --git a/maps/encounters/prisonhulk/prisonhulk.dmm b/maps/encounters/prisonhulk/prisonhulk.dmm index 7cd88ea214..fc6d7a4876 100644 --- a/maps/encounters/prisonhulk/prisonhulk.dmm +++ b/maps/encounters/prisonhulk/prisonhulk.dmm @@ -17,7 +17,7 @@ /area/outpost/prisonhulk/food) "bD" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, diff --git a/maps/submaps/cave_pois/crashed_pod.dmm b/maps/submaps/cave_pois/crashed_pod.dmm index 0385023d70..54186bbad2 100644 --- a/maps/submaps/cave_pois/crashed_pod.dmm +++ b/maps/submaps/cave_pois/crashed_pod.dmm @@ -94,7 +94,7 @@ "as" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; diff --git a/maps/submaps/planetary_ruins/crashed_pod/crashed_pod.dmm b/maps/submaps/planetary_ruins/crashed_pod/crashed_pod.dmm index 4e96a1deb4..5547ca58ee 100644 --- a/maps/submaps/planetary_ruins/crashed_pod/crashed_pod.dmm +++ b/maps/submaps/planetary_ruins/crashed_pod/crashed_pod.dmm @@ -94,7 +94,7 @@ "as" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; diff --git a/maps/submaps/planetary_ruins/ec_old_crash/ec_old_crash.dmm b/maps/submaps/planetary_ruins/ec_old_crash/ec_old_crash.dmm index 89b803895f..3993f22a32 100644 --- a/maps/submaps/planetary_ruins/ec_old_crash/ec_old_crash.dmm +++ b/maps/submaps/planetary_ruins/ec_old_crash/ec_old_crash.dmm @@ -379,7 +379,7 @@ dir = 8 }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; icon_state = "apc0"; pixel_x = 28 }, @@ -611,7 +611,7 @@ }, /obj/structure/closet/l3closet, /obj/machinery/power/apc{ - dir = 4; + dir = 8; icon_state = "apc0"; pixel_y = -28 }, @@ -701,7 +701,7 @@ /area/map_template/ecship/engineering) "cM" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; icon_state = "apc0"; pixel_y = 28 }, diff --git a/maps/submaps/planetary_ruins/hydrobase/hydrobase.dmm b/maps/submaps/planetary_ruins/hydrobase/hydrobase.dmm index 591fec4ee2..7ee569450c 100644 --- a/maps/submaps/planetary_ruins/hydrobase/hydrobase.dmm +++ b/maps/submaps/planetary_ruins/hydrobase/hydrobase.dmm @@ -111,7 +111,7 @@ "as" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "east bump"; pixel_x = 24 }, @@ -367,7 +367,7 @@ /area/map_template/hydrobase/station/growD) "bc" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; name = "south bump"; pixel_y = -24 }, @@ -785,7 +785,7 @@ "cc" = ( /obj/structure/cable/yellow, /obj/machinery/power/apc{ - dir = 4; + dir = 8; icon_state = "apc0"; pixel_x = 25 }, @@ -1061,7 +1061,7 @@ /area/map_template/hydrobase/station/growC) "cS" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; icon_state = "apc0"; pixel_x = 25 }, @@ -1651,7 +1651,7 @@ /area/map_template/hydrobase/station/processing) "eq" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "east bump"; pixel_x = 24 }, @@ -1818,7 +1818,7 @@ tag_interior_door = "solars_inner" }, /obj/machinery/power/apc{ - dir = 1; + dir = 2; icon_state = "apc0"; pixel_x = 0; pixel_y = 25 @@ -1957,7 +1957,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - dir = 4; + dir = 8; icon_state = "apc0"; pixel_x = 25 }, @@ -1967,7 +1967,7 @@ /area/map_template/hydrobase/station/growB) "eS" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; icon_state = "apc0"; pixel_x = -25 }, @@ -2284,7 +2284,7 @@ /area/map_template/hydrobase/station/growA) "fM" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "west bump"; pixel_x = -24 }, @@ -2315,7 +2315,7 @@ "fP" = ( /obj/machinery/washing_machine, /obj/machinery/power/apc{ - dir = 1; + dir = 2; icon_state = "apc0"; pixel_x = 0; pixel_y = 25 @@ -2608,7 +2608,7 @@ pixel_y = 25 }, /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "west bump"; pixel_x = -24 }, diff --git a/maps/submaps/planetary_ruins/playablecolony/colony.dmm b/maps/submaps/planetary_ruins/playablecolony/colony.dmm index ae247f8aa3..47a2ed0767 100644 --- a/maps/submaps/planetary_ruins/playablecolony/colony.dmm +++ b/maps/submaps/planetary_ruins/playablecolony/colony.dmm @@ -424,7 +424,7 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -447,7 +447,7 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -1712,7 +1712,7 @@ /obj/machinery/door/blast/shutters{ id = "colsen"; name = "Hard Storage Shutter"; - + }, /turf/simulated/floor/plating, /area/map_template/colony/command) @@ -1766,7 +1766,7 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -2342,7 +2342,7 @@ /area/map_template/colony/messhall) "gf" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -2632,7 +2632,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/structure/railing/mapped{ dir = 1; @@ -2647,12 +2647,12 @@ dir = 2; frequency = 2222; id_tag = "playablecolonymain_pump_out_external"; - + }, /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/hatch/orange, @@ -2699,7 +2699,7 @@ /area/map_template/colony/atmospherics) "gY" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -2848,7 +2848,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /turf/simulated/floor/exoplanet/concrete, /area/template_noop) @@ -2874,7 +2874,7 @@ /area/map_template/colony) "hv" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -3201,7 +3201,7 @@ "ip" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -3360,7 +3360,7 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -3516,7 +3516,7 @@ /area/map_template/colony/jail) "ji" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -4216,7 +4216,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /turf/simulated/floor/exoplanet/concrete, /area/map_template/colony/mineralprocessing) @@ -4295,7 +4295,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/machinery/conveyor_switch{ id = "colonymine" @@ -4367,7 +4367,7 @@ /area/map_template/colony/jail) "lt" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -4435,7 +4435,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/machinery/computer/mining, /obj/structure/table/steel_reinforced, @@ -4554,7 +4554,7 @@ frequency = 2222; id_tag = "playablecolonymain_pump"; power_rating = 25000; - + }, /turf/simulated/floor/tiled/steel/techfloor, /area/map_template/colony/airlock) @@ -4589,7 +4589,7 @@ frequency = 2222; id_tag = "playablecolonymain_pump"; power_rating = 25000; - + }, /turf/simulated/floor/tiled/steel/techfloor, /area/map_template/colony/airlock) @@ -4815,7 +4815,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/exoplanet/concrete, @@ -4852,12 +4852,12 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/structure/railing/mapped{ dir = 4; icon_state = "railing0-1"; - + }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4976,7 +4976,7 @@ id = "colsen"; name = "Hard Equipment Storage"; pixel_y = 28; - + }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5064,7 +5064,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/machinery/recharge_station, /turf/simulated/floor/exoplanet/concrete, @@ -5430,7 +5430,7 @@ frequency = 2222; id_tag = "playablecolonymain_pump_out_internal"; power_rating = 25000; - + }, /obj/item/device/radio/intercom{ dir = 4; @@ -5494,7 +5494,7 @@ frequency = 2222; id_tag = "playablecolonymain_pump"; power_rating = 25000; - + }, /turf/simulated/floor/tiled/steel/techfloor, /area/map_template/colony/airlock) @@ -5521,7 +5521,7 @@ frequency = 2222; id_tag = "playablecolonymain_pump"; power_rating = 25000; - + }, /turf/simulated/floor/tiled/steel/techfloor, /area/map_template/colony/airlock) @@ -5672,7 +5672,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/structure/cable{ d1 = 4; @@ -5711,7 +5711,7 @@ /obj/structure/railing/mapped{ dir = 4; icon_state = "railing0-1"; - + }, /obj/structure/cable{ d1 = 4; @@ -5858,7 +5858,7 @@ frequency = 2222; id_tag = "playablecolonymain_pump_out_internal"; power_rating = 25000; - + }, /turf/simulated/floor/tiled/steel/techfloor, /area/map_template/colony/airlock) @@ -6104,7 +6104,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -6340,7 +6340,7 @@ /area/map_template/colony/commons) "zV" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -6376,7 +6376,7 @@ dir = 10 }, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -6482,7 +6482,7 @@ "Hy" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -6652,7 +6652,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -6855,7 +6855,7 @@ /obj/structure/railing/mapped{ dir = 8; icon_state = "railing0-1"; - + }, /obj/structure/railing/mapped, /turf/simulated/floor/exoplanet/concrete, @@ -6877,7 +6877,7 @@ /area/map_template/colony/commons) "OV" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -6977,7 +6977,7 @@ "Sr" = ( /obj/structure/table/steel_reinforced, /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; @@ -7077,7 +7077,7 @@ /area/map_template/colony/command) "Xj" = ( /obj/machinery/power/apc{ - dir = 2; + dir = 1; locked = 0; name = "south bump"; operating = 1; diff --git a/maps/testmap/test_map.dmm b/maps/testmap/test_map.dmm index 291a7f3e2e..a68b8693cf 100644 --- a/maps/testmap/test_map.dmm +++ b/maps/testmap/test_map.dmm @@ -477,7 +477,7 @@ /area/testing/first) "cp" = ( /obj/machinery/power/apc{ - dir = 8; + dir = 4; name = "West APC"; pixel_x = -28 }, @@ -492,7 +492,7 @@ /area/testing/first) "gB" = ( /obj/machinery/power/apc{ - dir = 4; + dir = 8; name = "East APC"; pixel_x = 28 }, @@ -613,7 +613,7 @@ /area/testing/first) "xv" = ( /obj/machinery/power/apc{ - dir = 1; + dir = 2; name = "North APC"; pixel_y = 28 },