From 362521131d990f321e51937931f4a905582748a2 Mon Sep 17 00:00:00 2001 From: VINNET <179967236+lesTYP@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:56:21 +0300 Subject: [PATCH] Fix electrochromic windows (#1745) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Исправляет затемняющиеся окна и шлюзы на картах. 1. Керберос: Просматриваемая допросная, Лаборатория клонирования 2. Цереброн: Офис КМа, Церковь, Офис ГСБ, Лаборатория клонирования 3. Кибериада: Комната суда Часть исправлений в виде изменений дальности действий кнопок, часть - изменения зоны, часть - изменения id ## Почему это хорошо для игры Тонировка это круто, поэтому должна работать как нужно. ## Изображения изменений ![image](https://github.com/user-attachments/assets/f1a3584b-096e-4bbd-9703-0e5130dd293a) ![image](https://github.com/user-attachments/assets/9eb775c5-d1fe-4327-8add-fe8855ecd7d7) ## Тестирование Локалка ## Changelog :cl: fix: На всех картах исправлены неработающие затемняющиеся окна и шлюзы. /:cl: ## Summary by Sourcery Bug Fixes: - Fixed broken electrochromic windows and airlocks across all maps. --- _maps/map_files220/stations/boxstation.dmm | 3 +- _maps/map_files220/stations/deltastation.dmm | 13 +++--- _maps/map_files220/stations/metastation.dmm | 42 ++++++++++++-------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index d213cd603737..1afbe6bd86a1 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -9643,7 +9643,8 @@ /obj/machinery/button/windowtint{ id = "Courtroom"; pixel_y = -12; - req_one_access = list(74,3) + req_one_access = list(74,3); + range = 6 }, /turf/simulated/floor/carpet/black, /area/station/legal/courtroom) diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index a1d85b2b5bc5..3dc27e0de972 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -4791,7 +4791,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/security/processing) +/area/station/security/interrogation/observation) "axt" = ( /obj/structure/cable{ icon_state = "4-8" @@ -51492,7 +51492,7 @@ }, /obj/structure/cable, /turf/simulated/floor/plating, -/area/station/security/processing) +/area/station/security/interrogation/observation) "ffH" = ( /obj/effect/landmark/start/chemist, /turf/simulated/floor/plasteel{ @@ -73448,7 +73448,8 @@ /area/station/medical/medbay) "mbz" = ( /obj/machinery/button/windowtint/east{ - id = "Cloning Room" + id = "Cloning Room"; + range = 6 }, /obj/machinery/camera{ c_tag = "Medbay Cloning"; @@ -96021,7 +96022,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/simulated/floor/plasteel/dark, -/area/station/security/processing) +/area/station/security/interrogation/observation) "sYf" = ( /turf/simulated/floor/plasteel, /area/station/supply/sorting) @@ -108114,7 +108115,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/station/security/processing) +/area/station/security/interrogation/observation) "wVi" = ( /obj/machinery/economy/vending/cart, /turf/simulated/floor/plasteel{ @@ -108313,7 +108314,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/security/processing) +/area/station/security/interrogation/observation) "wWZ" = ( /obj/structure/cable{ icon_state = "1-2" diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 202f84fb9fd3..4739e6e2e1a1 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -4024,6 +4024,9 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/supply/qm, /obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "qm" + }, /turf/simulated/floor/plasteel, /area/station/supply/qm) "ayI" = ( @@ -32977,7 +32980,8 @@ }, /obj/machinery/button/windowtint/south{ pixel_x = -24; - id = "clon" + id = "clon"; + range = 5 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -42727,7 +42731,7 @@ "eak" = ( /obj/structure/cable/yellow, /obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "Processing" + id = "qm" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -43937,7 +43941,7 @@ /area/station/security/storage) "eEy" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "Processing" + id = "qm" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -53613,7 +53617,7 @@ icon_state = "2-4" }, /obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "Processing" + id = "qm" }, /turf/simulated/floor/plating, /area/station/supply/qm) @@ -55725,7 +55729,7 @@ /area/station/engineering/control) "kBn" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "Processing" + id = "qm" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -64528,6 +64532,12 @@ icon_state = "white" }, /area/station/medical/medbay) +"oQm" = ( +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "CHAP" + }, +/turf/simulated/floor/plating, +/area/station/service/chapel) "oQz" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -74735,7 +74745,7 @@ icon_state = "1-2" }, /obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "Processing" + id = "qm" }, /turf/simulated/floor/plating, /area/station/supply/qm) @@ -75761,7 +75771,7 @@ }, /obj/structure/cable/yellow, /turf/simulated/floor/plating, -/area/station/security/range) +/area/station/command/office/hos) "uKm" = ( /obj/effect/spawner/airlock/e_to_w, /turf/simulated/wall, @@ -80240,7 +80250,7 @@ /area/station/hallway/primary/aft) "xdC" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "Processing" + id = "CHAP2" }, /turf/simulated/floor/plating, /area/station/service/chapel) @@ -105707,7 +105717,7 @@ gDK cFD bdq oiv -xdC +oQm aaa aaa aaa @@ -105964,7 +105974,7 @@ cDc cFD cUX oiv -xdC +oQm aaa aaa aaa @@ -106221,7 +106231,7 @@ cJM cyN cUK cqj -xdC +oQm aaa aaa aaa @@ -106478,7 +106488,7 @@ csw cFD cUX oiv -xdC +oQm aaa aaa aaa @@ -106735,7 +106745,7 @@ xJB cFD bdq oiv -xdC +oQm aaa aaa aaa @@ -113043,7 +113053,7 @@ hFF ugM tio cKm -esA +avc czl sdX pWM @@ -113300,7 +113310,7 @@ usg dHE aXp tvd -esA +avc aUG sYR liS @@ -113557,7 +113567,7 @@ adX vKy oyY tSX -esA +avc uos wRh stW