From 15b7e7de53c87b1db60880cd21b90aa29cda41b5 Mon Sep 17 00:00:00 2001 From: Vire <66576896+Maurukas@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:23:12 -0700 Subject: [PATCH 1/2] Update Paths through 87866 --- .../OmegaStation.dmm | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/StationMaps/OmegaStation/Modernized+Heads of Staff (2024)/OmegaStation.dmm b/StationMaps/OmegaStation/Modernized+Heads of Staff (2024)/OmegaStation.dmm index 28e142c0..3d1680e1 100644 --- a/StationMaps/OmegaStation/Modernized+Heads of Staff (2024)/OmegaStation.dmm +++ b/StationMaps/OmegaStation/Modernized+Heads of Staff (2024)/OmegaStation.dmm @@ -139,7 +139,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/keycard_auth/directional/north{ +/obj/machinery/keycard_auth/wall_mounted/directional/north{ pixel_y = 26; pixel_x = -4 }, @@ -206,11 +206,11 @@ pixel_y = 4; pixel_x = 2 }, -/obj/item/stock_parts/cell/high{ +/obj/item/stock_parts/power_store/cell/high{ pixel_x = 2; pixel_y = 4 }, -/obj/item/stock_parts/cell/high{ +/obj/item/stock_parts/power_store/cell/high{ pixel_x = 4; pixel_y = 3 }, @@ -663,11 +663,11 @@ "acj" = ( /obj/structure/cable, /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ +/obj/item/cigarette/cigar/cohiba{ pixel_x = 3 }, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/clothing/mask/cigarette/cigar/havana{ +/obj/item/cigarette/cigar, +/obj/item/cigarette/cigar/havana{ pixel_x = -3 }, /turf/open/floor/carpet/royalblack, @@ -2310,7 +2310,7 @@ /obj/machinery/modular_computer/preset/id{ dir = 8 }, -/obj/machinery/keycard_auth/directional/south{ +/obj/machinery/keycard_auth/wall_mounted/directional/south{ pixel_y = -35; pixel_x = -6 }, @@ -2783,7 +2783,7 @@ /obj/effect/mapping_helpers/requests_console/information, /obj/effect/mapping_helpers/requests_console/announcement, /obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/keycard_auth/directional/south, +/obj/machinery/keycard_auth/wall_mounted/directional/south, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/captain/private) "ahI" = ( @@ -4502,8 +4502,8 @@ /obj/structure/table/reinforced, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/rods/fifty, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/cell_charger, @@ -4803,7 +4803,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/keycard_auth/directional/east{ +/obj/machinery/keycard_auth/wall_mounted/directional/east{ pixel_y = -3; pixel_x = 28 }, @@ -5579,8 +5579,8 @@ /turf/open/floor/carpet/green, /area/station/service/lawoffice) "aoF" = ( -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, /obj/machinery/cell_charger, /obj/structure/table/reinforced, /turf/open/floor/iron/dark, @@ -6335,7 +6335,7 @@ /obj/item/flashlight, /obj/item/flashlight/flare, /obj/item/flashlight/flare, -/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/power_store/cell/high, /obj/item/crowbar/red, /obj/effect/turf_decal/bot, /obj/machinery/camera/directional/south{ @@ -7980,7 +7980,7 @@ "ave" = ( /obj/structure/table/wood, /obj/item/clothing/head/fedora, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -8205,8 +8205,8 @@ /area/station/hallway/primary/port) "avY" = ( /obj/structure/table/reinforced, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, /obj/machinery/cell_charger, /obj/machinery/light_switch{ pixel_x = -24; @@ -11752,8 +11752,8 @@ /area/station/engineering/lobby) "aGv" = ( /obj/structure/table/reinforced, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, /obj/machinery/cell_charger, /turf/open/floor/iron, /area/station/hallway/primary/port) @@ -12792,7 +12792,7 @@ /area/station/engineering/gravity_generator) "aJo" = ( /obj/machinery/suit_storage_unit/cmo, -/obj/machinery/keycard_auth/directional/west{ +/obj/machinery/keycard_auth/wall_mounted/directional/west{ pixel_y = 5; pixel_x = -29 }, @@ -17287,7 +17287,7 @@ "aVx" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/power_store/cell/high, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -20722,8 +20722,8 @@ /area/station/science/research) "bem" = ( /obj/structure/table, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, /obj/machinery/cell_charger, /obj/effect/turf_decal/bot, /obj/structure/extinguisher_cabinet/directional/south, @@ -32889,14 +32889,14 @@ dir = 8 }, /obj/structure/mirror/directional/north, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ +/obj/item/cigarette/cigar/cohiba{ pixel_x = 3; pixel_y = 8 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_y = 9 }, -/obj/item/clothing/mask/cigarette/cigar/havana{ +/obj/item/cigarette/cigar/havana{ pixel_x = -3; pixel_y = 11 }, @@ -33155,7 +33155,7 @@ /obj/item/storage/toolbox/electrical, /obj/item/electronics/apc, /obj/item/electronics/airlock, -/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/power_store/cell/high, /obj/machinery/airalarm/directional/east{ pixel_x = 24 }, @@ -33849,7 +33849,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "sMd" = ( -/obj/machinery/keycard_auth/directional/south{ +/obj/machinery/keycard_auth/wall_mounted/directional/south{ pixel_y = -27; pixel_x = 3 }, @@ -34394,7 +34394,7 @@ pixel_y = 32 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/mob/living/simple_animal/bot/floorbot, +/mob/living/basic/bot/repairbot, /turf/open/floor/iron/dark/corner, /area/station/ai_monitored/turret_protected/aisat_interior) "sOs" = ( From 523a4c4ab619a9cf6ada193d878724efba63ece0 Mon Sep 17 00:00:00 2001 From: Vire <66576896+Maurukas@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:25:09 -0700 Subject: [PATCH 2/2] Remove duplicate floor turf --- .../Modernized+Heads of Staff (2024)/OmegaStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/StationMaps/OmegaStation/Modernized+Heads of Staff (2024)/OmegaStation.dmm b/StationMaps/OmegaStation/Modernized+Heads of Staff (2024)/OmegaStation.dmm index 3d1680e1..0e0041b6 100644 --- a/StationMaps/OmegaStation/Modernized+Heads of Staff (2024)/OmegaStation.dmm +++ b/StationMaps/OmegaStation/Modernized+Heads of Staff (2024)/OmegaStation.dmm @@ -14112,7 +14112,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/turf/open/floor/plating, /area/station/maintenance/department/engine) "aMG" = ( /obj/structure/girder,