From a5a694867f21f6d680b7cbbc5847b5e9b046aadc Mon Sep 17 00:00:00 2001 From: konushi <139562134+konushi@users.noreply.github.com> Date: Sun, 19 Jan 2025 21:05:04 +0300 Subject: [PATCH 1/3] NTR & BlueShiled access fix (#1020) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Попытка номер два. Представителю и Щиту добавлены доступы в прямые точки их интереса - кабинеты глав. Пока что только на Кибериаде. Наушник Представителя теперь ловит радиочастоты всех отделов. Небольшой фикс кнопочки в кофейне на Кибериаде - был не привязан id. ## Почему это хорошо для игры НТР есть заноза в задница ## Изображения изменений Локалка, работает ## Тестирование ## Changelog :cl: fix: НТР и БЩ теперь имеют доступы в кабинеты глав на Кибериаде. НТР имеет доступ ко всем радиочастотам станции. Фикс кнопки в кофейне Кибериады. /:cl: --- _maps/map_files/Cyberiad/Cyberiad.dmm | 58 ++++++++++++++----- .../objects/code/items/devices/radio.dm | 2 +- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index ec9b641d03a95..1d1b8a07d0c32 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -3477,7 +3477,7 @@ "aSg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ - id = "JimNorton" + id = "JimNortonKitchen" }, /obj/item/storage/fancy/coffee_condi_display{ pixel_y = 10; @@ -5521,10 +5521,11 @@ id_tag = "ntr_door" }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/command/nanotrasen_representative, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/nanotrasen_representative) "brR" = ( @@ -5746,8 +5747,10 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/hop, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/command/hop, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/hop, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "bvz" = ( @@ -15320,11 +15323,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/supply/qm, /obj/machinery/door/airlock/command/qm, /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/supply/qm, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) "dKW" = ( @@ -16225,7 +16230,9 @@ id_tag = "hos_door" }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/hos, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/security/hos, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "dXD" = ( @@ -25722,11 +25729,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/machinery/door/firedoor/heavy, /obj/machinery/door/airlock/command/rd, /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/science/rd, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) "gxY" = ( @@ -26558,8 +26567,10 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/engineering/ce, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "gKa" = ( @@ -33067,6 +33078,7 @@ dir = 1 }, /obj/effect/landmark/start/assistant, +/obj/machinery/holopad, /turf/open/floor/wood, /area/station/service/cafeteria) "isz" = ( @@ -39409,10 +39421,11 @@ id_tag = "blueshield_door" }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/command/blueshield, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/blueshield) "jZr" = ( @@ -51089,8 +51102,10 @@ /obj/machinery/door/airlock/corporate, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/command/magistrate, /obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/magistrate) "mQo" = ( @@ -60382,7 +60397,7 @@ "phH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ - id = "JimNorton" + id = "JimNortonKitchen" }, /obj/item/reagent_containers/cup/glass/coffee{ pixel_x = -3; @@ -63121,7 +63136,6 @@ "pQj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/command/hop, /obj/machinery/door/airlock/command/hop{ id_tag = "HoP_door" }, @@ -63129,6 +63143,9 @@ /obj/machinery/door/firedoor, /obj/effect/landmark/navigate_destination, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/hop, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "pQs" = ( @@ -64758,7 +64775,9 @@ /obj/structure/cable, /obj/machinery/door/airlock/command/hos, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/hos, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/security/hos, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "qlM" = ( @@ -74789,7 +74808,8 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/command/magistrate, +/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/magistrate) "sMd" = ( @@ -80068,9 +80088,11 @@ id_tag = "CMO_door" }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /obj/structure/cable, /obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/medical/cmo, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "ueH" = ( @@ -86453,6 +86475,10 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window/preopen{ + dir = 4; + id = "JimNortonBottom" + }, /turf/open/floor/wood, /area/station/service/cafeteria) "vMy" = ( @@ -86853,7 +86879,7 @@ "vTw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ - id = "JimNorton" + id = "JimNortonKitchen" }, /obj/structure/desk_bell{ pixel_x = -1; @@ -95336,7 +95362,7 @@ "yan" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ - id = "JimNorton" + id = "JimNortonKitchen" }, /obj/item/modular_computer/laptop/preset/civilian, /obj/structure/table/reinforced, diff --git a/modular_bandastation/objects/code/items/devices/radio.dm b/modular_bandastation/objects/code/items/devices/radio.dm index 17d676ce232ab..6464dbc0b06aa 100644 --- a/modular_bandastation/objects/code/items/devices/radio.dm +++ b/modular_bandastation/objects/code/items/devices/radio.dm @@ -27,7 +27,7 @@ /obj/item/encryptionkey/heads/nanotrasen_representative name = "nanotrasen representative's encryption key" icon_state = "cypherkey_centcom" - channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_JUSTICE = 1) + channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_JUSTICE = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_ENGINEERING = 0, RADIO_CHANNEL_SCIENCE = 0, RADIO_CHANNEL_MEDICAL = 0, RADIO_CHANNEL_SUPPLY = 0, RADIO_CHANNEL_SERVICE = 0) greyscale_config = /datum/greyscale_config/encryptionkey_centcom greyscale_colors = "#1d2657#dca01b" From 6099e9d98d00cd902b4215e10c79a2bac8173719 Mon Sep 17 00:00:00 2001 From: "ss220app[bot]" <167440448+ss220app[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 18:05:25 +0000 Subject: [PATCH 2/3] Automatic changelog for PR #1020 [ci skip] --- html/changelogs/bandastation/AutoChangeLog-pr-1020.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/bandastation/AutoChangeLog-pr-1020.yml diff --git a/html/changelogs/bandastation/AutoChangeLog-pr-1020.yml b/html/changelogs/bandastation/AutoChangeLog-pr-1020.yml new file mode 100644 index 0000000000000..9bac87d202e3f --- /dev/null +++ b/html/changelogs/bandastation/AutoChangeLog-pr-1020.yml @@ -0,0 +1,4 @@ +author: "konushi" +delete-after: True +changes: + - bugfix: "НТР и БЩ теперь имеют доступы в кабинеты глав на Кибериаде. НТР имеет доступ ко всем радиочастотам станции. Фикс кнопки в кофейне Кибериады." \ No newline at end of file From 47e4f357bfdcdb1a257fbe3ec1d5756fd5ca4728 Mon Sep 17 00:00:00 2001 From: Aylong <69762909+AyIong@users.noreply.github.com> Date: Sun, 19 Jan 2025 20:06:49 +0200 Subject: [PATCH 3/3] Simplify module creation (#1019) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Упрощение создания модуля. По сути то что делал фуриор на пару, но с некоторыми улучшениями (Спасибо чатгпт xdd) - Модуль автоматом инклюдится в корневой `.dme`, при этом все инклюды модулей сортируются в алфавитном порядке - В папке модуля создаётся папка icons - В датуме модуля, фуриор заменяется на имя папки юзера ## Тестирование Я заебался удалять тестовые папки ## Summary by Sourcery New Features: - Add a script to simplify the creation of new modules for the project. --- modular_bandastation/create_modpack.bat | 29 +++++++++++++++++++ modular_bandastation/modular_bandastation.dme | 24 ++++++++------- 2 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 modular_bandastation/create_modpack.bat diff --git a/modular_bandastation/create_modpack.bat b/modular_bandastation/create_modpack.bat new file mode 100644 index 0000000000000..432d7fff35f99 --- /dev/null +++ b/modular_bandastation/create_modpack.bat @@ -0,0 +1,29 @@ +@echo off +set /p moduleName="Enter module name: " +set "moduleName=%moduleName: =_%" + +xcopy "example" "%moduleName%" /s /i + +ren "%moduleName%\_example.dm" "_%moduleName%.dm" +ren "%moduleName%\_example.dme" "_%moduleName%.dme" +ren "%moduleName%\code\example.dm" "%moduleName%.dm" + +mkdir "%moduleName%\icons" + +Powershell -Command "(Get-Content '%moduleName%\_%moduleName%.dm') -replace 'Example modpack', '%moduleName%' | Set-Content '%moduleName%\_%moduleName%.dm'" +Powershell -Command "(Get-Content '%moduleName%\_%moduleName%.dm') -replace 'example', '%moduleName%' | Set-Content '%moduleName%\_%moduleName%.dm'" +Powershell -Command "(Get-Content '%moduleName%\_%moduleName%.dme') -replace 'Example modpack', '%moduleName%' | Set-Content '%moduleName%\_%moduleName%.dme'" +Powershell -Command "(Get-Content '%moduleName%\_%moduleName%.dme') -replace 'example', '%moduleName%' | Set-Content '%moduleName%\_%moduleName%.dme'" +Powershell -Command "(Get-Content '%moduleName%\_%moduleName%.dm') -replace 'furior', '%USERNAME%' | Set-Content '%moduleName%\_%moduleName%.dm'" + +Powershell -Command ^ + "$dmeFile = 'modular_bandastation.dme';" ^ + "$newInclude = '#include \"%moduleName%/_%moduleName%.dme\"';" ^ + "$lines = Get-Content $dmeFile;" ^ + "$startIndex = $lines.IndexOf('// --- MODULES START --- //') + 1;" ^ + "$endIndex = $lines.IndexOf('// --- MODULES END --- //');" ^ + "if ($startIndex -eq -1 -or $endIndex -eq -1) { Write-Host 'Error: Comments not found'; exit 1 }" ^ + "$before = $lines[0..($startIndex - 1)];" ^ + "$moduleLines = $lines[$startIndex..($endIndex - 1)] + $newInclude | Sort-Object;" ^ + "$after = $lines[($endIndex)..($lines.Length - 1)];" ^ + "Set-Content $dmeFile -Value ($before + $moduleLines + $after)" diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index f171704432e88..877348e573e6c 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -1,24 +1,26 @@ #include "_modpack.dm" #include "_modpacks.dm" +// --- MODULES START --- // #include "_defines220/_defines220.dme" #include "_helpers220/_helpers220.dme" #include "_rust_utils/_rust_utils.dme" #include "_signals220/_signals220.dme" #include "_singletons/_singletons.dme" -#include "title_screen/_title_screen.dme" #include "admin/_admin.dme" #include "aesthetics/_aesthetics.dme" #include "aesthetics_sounds/_aesthetics_sounds.dme" -#include "automapper/_automapper.dme" #include "ai_laws/_ai_laws.dme" #include "announcers/_announcers.dme" #include "autohiss/_autohiss.dme" +#include "automapper/_automapper.dme" +#include "automatic_crew_transfer/_automatic_crew_transfer.dme" #include "balance/_balance.dme" #include "barsigns/_barsigns.dme" #include "changelog/_changelog.dme" #include "chat_badges/_chat_badges.dme" #include "communication/_communication.dme" +#include "cryosleep/_cryosleep.dme" #include "customization/_customization.dme" #include "cyrillic_fixes/_cyrillic_fixes.dme" #include "database220/_database220.dme" @@ -26,31 +28,31 @@ #include "emote_panel/_emote_panel.dme" #include "examine_panel/_examine_panel.dme" #include "gunhud/_gunhud.dme" +#include "hydroponics/_hydroponics.dme" #include "jobs/_jobs.dme" +#include "jukebox/_jukebox.dme" #include "keybinding/_keybinding.dme" #include "loadout/_loadout.dme" #include "mapping/_mapping.dme" #include "medical/_medical.dme" #include "mobs/_mobs.dme" #include "nanomap/_nanomap.dme" +#include "objects/_objects.dme" +#include "orderables/_orderables.dme" +#include "outfits/_outfits.dme" +#include "overrides/_overrides.dme" #include "pixel_shift/_pixel_shift.dme" +#include "preferences/_preferences.dme" #include "ru_jobs/_ru_jobs.dme" #include "security_levels/_security_levels.dme" #include "species/_species.dme" +#include "title_screen/_title_screen.dme" #include "translations/_translations.dme" #include "tts/_tts.dme" #include "turfs/_turfs.dme" #include "whitelist220/_whitelist220.dme" #include "world_topics/_world_topics.dme" -#include "preferences/_preferences.dme" -#include "jukebox/_jukebox.dme" -#include "cryosleep/_cryosleep.dme" -#include "objects/_objects.dme" -#include "orderables/_orderables.dme" -#include "automatic_crew_transfer/_automatic_crew_transfer.dme" -#include "outfits/_outfits.dme" -#include "overrides/_overrides.dme" -#include "hydroponics/_hydroponics.dme" +// --- MODULES END --- // // --- PRIME --- //