Skip to content

Commit

Permalink
Merge branch 'master' into cyberiad-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
CallmeHouston authored Jan 19, 2025
2 parents d709ae6 + 47e4f35 commit 4396a47
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 28 deletions.
58 changes: 42 additions & 16 deletions _maps/map_files/Cyberiad/Cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -33062,6 +33073,7 @@
dir = 1
},
/obj/effect/landmark/start/assistant,
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/station/service/cafeteria)
"isz" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -51094,8 +51107,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" = (
Expand Down Expand Up @@ -60387,7 +60402,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;
Expand Down Expand Up @@ -63126,14 +63141,16 @@
"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"
},
/obj/effect/mapping_helpers/airlock/autoname,
/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" = (
Expand Down Expand Up @@ -64763,7 +64780,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" = (
Expand Down Expand Up @@ -74810,7 +74829,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" = (
Expand Down Expand Up @@ -80101,9 +80121,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" = (
Expand Down Expand Up @@ -86491,6 +86513,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" = (
Expand Down Expand Up @@ -86891,7 +86917,7 @@
"vTw" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
id = "JimNorton"
id = "JimNortonKitchen"
},
/obj/structure/desk_bell{
pixel_x = -1;
Expand Down Expand Up @@ -95388,7 +95414,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,
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/bandastation/AutoChangeLog-pr-1020.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "konushi"
delete-after: True
changes:
- bugfix: "НТР и БЩ теперь имеют доступы в кабинеты глав на Кибериаде. НТР имеет доступ ко всем радиочастотам станции. Фикс кнопки в кофейне Кибериады."
29 changes: 29 additions & 0 deletions modular_bandastation/create_modpack.bat
Original file line number Diff line number Diff line change
@@ -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)"
24 changes: 13 additions & 11 deletions modular_bandastation/modular_bandastation.dme
Original file line number Diff line number Diff line change
@@ -1,56 +1,58 @@
#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"
#include "discord/_discord.dme"
#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 --- //
Expand Down
2 changes: 1 addition & 1 deletion modular_bandastation/objects/code/items/devices/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 4396a47

Please sign in to comment.