From 95df211df6e33dee6f9b7af7d8cd3082b0ac7646 Mon Sep 17 00:00:00 2001 From: Aylong <69762909+AyIong@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:56:51 +0200 Subject: [PATCH] Add emergency locker on Delta arrival (#1621) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Добавил 2 настенных экстренных шкафчика на шаттл прибытия Дельты Так же анимировал настенные шкафчики, красивое ## Почему это хорошо для игры Анимации - круто Плюс не было шкафчиков в шаттле прибытие только на Дельте, их в целом на дельте мало ## Изображения изменений DIFF ## Тестирование Шкафчики красиво анимируются ## Changelog :cl: add: Дельта: Добавлено 2 экстренных настенных шкафчика в шаттл прибытия tweak: Настенные шкафчики теперь анимированы как обычные /:cl: --- _maps/map_files220/stations/deltastation.dmm | 2 ++ .../aesthetics/wallcloset/code/wallcloset.dm | 11 +++++++---- .../wallcloset/icons/wallclosets.dmi | Bin 1710 -> 2008 bytes 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index b7de768200a5..b000e671ff74 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -1101,6 +1101,7 @@ "ahW" = ( /obj/machinery/light/directional/south, /obj/machinery/hologram/holopad, +/obj/structure/closet/walllocker/emerglocker/south, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aik" = ( @@ -1329,6 +1330,7 @@ /area/space) "aka" = ( /obj/machinery/light/directional/north, +/obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akb" = ( diff --git a/modular_ss220/aesthetics/wallcloset/code/wallcloset.dm b/modular_ss220/aesthetics/wallcloset/code/wallcloset.dm index 6fc01b8817c5..dac85e9d3afb 100644 --- a/modular_ss220/aesthetics/wallcloset/code/wallcloset.dm +++ b/modular_ss220/aesthetics/wallcloset/code/wallcloset.dm @@ -1,10 +1,14 @@ /obj/structure/closet/walllocker icon = 'modular_ss220/aesthetics/wallcloset/icons/wallclosets.dmi' + door_anim_time = 2.0 + enable_door_overlay = TRUE + +/obj/structure/closet/walllocker/emerglocker + door_anim_time = 2.0 /obj/structure/closet/walllocker/firelocker icon_state = "firecloset" - icon_closed = "firecloset" - icon_opened = "firecloset_open" + door_anim_time = 2.0 /obj/structure/closet/walllocker/firelocker/north pixel_y = 32 @@ -31,8 +35,7 @@ /obj/structure/closet/walllocker/medlocker icon_state = "medcloset" - icon_closed = "medcloset" - icon_opened = "medcloset_open" + door_anim_time = 2.0 /obj/structure/closet/walllocker/medlocker/north pixel_y = 32 diff --git a/modular_ss220/aesthetics/wallcloset/icons/wallclosets.dmi b/modular_ss220/aesthetics/wallcloset/icons/wallclosets.dmi index e9dcf2b5e73d34dd1d3460fa6fa95c1f034f4ab6..cd325d1a96048c735b4fa64efa3301a044cc8265 100644 GIT binary patch literal 2008 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 Ef