From a8a1db34bde34214a5b77e98cfd78c80e61a5bcb Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Fri, 6 Sep 2024 06:56:42 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BE=D1=87=D0=B8=20-=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=80=D0=BE=D0=BB=D1=8C=20=D0=BA=D1=80=D1=8B=D1=81?= =?UTF-8?q?,=20=D0=B4=D0=B8=D1=81=D0=BA=D0=B8,=20=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=B8=20=D1=80=D0=B5=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82=20?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D1=8F=D0=BD=D0=B8=D1=8F=20=D0=BA=D1=83=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D0=B0=20(#686)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Большой Крыс Отдыхает * Фикс размера фейк диска * Доработка диска очков РНД * Скоро перейду на райдер * Переводы * Диски одного размера * Респрайт робы и капюшона культа --- .../_white/locales-new/autotranslate-108.ftl | 2 +- .../_white/locales-new/autotranslate-74.ftl | 3 +- .../Entities/Clothing/Head/hoods.yml | 4 +-- .../Entities/Clothing/OuterClothing/misc.yml | 4 +-- .../Prototypes/Entities/Objects/Misc/cds.yml | 4 +++ .../Entities/Objects/Misc/dat_fukken_disk.yml | 2 ++ .../Objects/Specific/Research/disk.yml | 8 +++-- Resources/Prototypes/GameRules/events.yml | 1 + .../Cult/culthood.rsi/equipped-HELMET.png | Bin 0 -> 1074 bytes .../Textures/White/Cult/culthood.rsi/icon.png | Bin 0 -> 367 bytes .../White/Cult/culthood.rsi/inhand-left.png | Bin 0 -> 923 bytes .../White/Cult/culthood.rsi/inhand-right.png | Bin 0 -> 958 bytes .../White/Cult/culthood.rsi/meta.json | 26 +++++++++++++++ .../equipped-OUTERCLOTHING-body-slim.png | Bin 0 -> 2457 bytes .../cultrobes.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2457 bytes .../White/Cult/cultrobes.rsi/icon.png | Bin 0 -> 963 bytes .../White/Cult/cultrobes.rsi/inhand-left.png | Bin 0 -> 1937 bytes .../White/Cult/cultrobes.rsi/inhand-right.png | Bin 0 -> 795 bytes .../White/Cult/cultrobes.rsi/meta.json | 30 ++++++++++++++++++ .../Research/researchdisk.rsi/icon.png | Bin 0 -> 324 bytes .../Research/researchdisk.rsi/meta.json | 14 ++++++++ 21 files changed, 89 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/White/Cult/culthood.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/White/Cult/culthood.rsi/icon.png create mode 100644 Resources/Textures/White/Cult/culthood.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Cult/culthood.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Cult/culthood.rsi/meta.json create mode 100644 Resources/Textures/White/Cult/cultrobes.rsi/equipped-OUTERCLOTHING-body-slim.png create mode 100644 Resources/Textures/White/Cult/cultrobes.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/White/Cult/cultrobes.rsi/icon.png create mode 100644 Resources/Textures/White/Cult/cultrobes.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Cult/cultrobes.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Cult/cultrobes.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-108.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-108.ftl index 087d9c2af5..d2b955634d 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-108.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-108.ftl @@ -13,7 +13,7 @@ ent-HandHeldMassScanner = ручной сканер массы .desc = Ручной сканер массы. ent-Lantern = фонарь .desc = Священный свет освещает путь. -ent-FlippoLighter = зажигалку "Флиппо" +ent-FlippoLighter = зажигалка "Флиппо" .desc = Прочная металлическая зажигалка, служит довольно долго. ent-FlippoEngravedLighter = гравированная зажигалка "Флиппо" .desc = Прочная золотая зажигалка, служит довольно долго. Гравировка не дает никаких тактических преимуществ. diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-74.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-74.ftl index 71fb9d7476..2bee19c60b 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-74.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-74.ftl @@ -38,6 +38,5 @@ ent-MobMoth = Ури́ст МакФлафф ent-MobSkeletonCloset = скелет в шкафу .desc = "скелет в шкафу" ent-MobHumanTerminator = exterminator - .desc = "exterminator" -ent-MobTerminatorEndoskeleton = эндоскелет nt-800 "exterminator" +ent-MobTerminatorEndoskeleton = эндоскелет nt-800 "Экстерминатор" .desc = Внутренняя движущая сила инфильтрационного андроида Susnet. Невероятно прочный сплав внутри, обычная плоть снаружи. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index b62834dd98..9b0482476f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -110,9 +110,9 @@ description: There's no cult without cult hoods. components: - type: Sprite - sprite: Clothing/Head/Hoods/cult.rsi + sprite: White/Cult/culthood.rsi # WD - type: Clothing - sprite: Clothing/Head/Hoods/cult.rsi + sprite: White/Cult/culthood.rsi # WD - type: Tag tags: - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 441920c250..0102a79c2c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -144,9 +144,9 @@ description: There's no cult without classic red/crimson cult robes. components: - type: Sprite - sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + sprite: White/Cult/cultrobes.rsi # WD - type: Clothing - sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + sprite: White/Cult/cultrobes.rsi # WD - type: entity parent: ClothingOuterMiscBase # WD edit diff --git a/Resources/Prototypes/Entities/Objects/Misc/cds.yml b/Resources/Prototypes/Entities/Objects/Misc/cds.yml index a80a7d1d58..7320fcd5cd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/cds.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/cds.yml @@ -4,6 +4,10 @@ id: CoordinatesDisk description: A disk containing the coordinates to a location in space. Necessary for any FTL-traversing vessel to reach their destination. Fits inside shuttle consoles. components: + - type: Item # WD + size: Small + shape: + - 0, 0, 0, 0 - type: Sprite sprite: Objects/Misc/cd.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml index fdcd8455bf..98bf2982fb 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml @@ -46,6 +46,8 @@ - type: Sprite sprite: Objects/Misc/nukedisk.rsi state: icon + - type: Item # WD + size: Tiny - type: StaticPrice price: 1 # it's worth even less than normal items. Perfection. # WD edit sounds start diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index ff12975c6c..1426f8c2e0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -7,9 +7,9 @@ - type: Item size: Small shape: - - 0, 0, 1, 1 + - 0, 0, 0, 0 # WD - type: Sprite - sprite: Objects/Specific/Research/researchdisk.rsi + sprite: White/Objects/Specific/Research/researchdisk.rsi # WD state: icon - type: ResearchDisk - type: GuideHelp @@ -61,6 +61,10 @@ name: technology disk description: A disk for the R&D server containing research technology. components: + - type: Item # WD + size: Small + shape: + - 0, 0, 0, 0 - type: Sprite sprite: Objects/Misc/module.rsi layers: diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 7281063c49..fe73962252 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -169,6 +169,7 @@ path: /Audio/Announcements/attention.ogg startDelay: 10 earliestStart: 15 + minimumPlayers: 15 # WD weight: 6 duration: 50 - type: VentCrittersRule diff --git a/Resources/Textures/White/Cult/culthood.rsi/equipped-HELMET.png b/Resources/Textures/White/Cult/culthood.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..54f688d3bcff580894655f53b02e8e5360c5da85 GIT binary patch literal 1074 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|WCD zPZ!6KiaBp*Ic7_{OSH+K&CvaDrCo<9*ok}LT4uv{YnOj}bokqa{SSjDd%xVe-}(8J zIYqe(^eR>wPmd(L?rH)D4*|f=ilNL;U)MmIfNMxR~_sX2))Yei> z%T3e%UcT&Fb6xPQ4bwF1{Z}(K+{_V@0?KpG^gccJewInZ^hv!_rylw^mnTDW>eo-_ z-e;WMe*E~GjI(K*J>N6=%s6gu$krfVWy|2#qbYMglj}=QBKM7pvkbZ_`2M$ic<3kd z*>=NpZtd=QhB0AXjfQvpgtqC&J}R5^L9!rHvx@bRbuWV~%Nxc-5ym%6{tb5xx^A4l zecFYcG4r0MEXy2;%^frK=I(xw;!tkodfrc-fq!}*yH&paw{)dG3S%GcT1ly_cHG2nu?m1KSzy zhp_z+docSH!+oZjV95v34f$HkHQXP3QycOb_pRjlpnJd^NwGz0+q9YKNr!F1x8KZR z`cOG(%C8qcGB?j;ESbc@uvWz3;jb2_{-e=esnU}esJhx**>#*?0U6JEM6|;VXU-3C7P%ot;y7jwds$i#&aOu^>ZWC+DU3 zU$y&AUyk2zXk2X}XS{LRhc6{|T652o$1ztOTQF5=>$JZL3bK4V?W6?V1QSK}c6guR zKjtLhcCp)_YlofGM80-o-fN5W7uhkyU1P{t>d`xsb^cZEJB;uC8qS@zjqSiyjnU096}amp>?O39#w%t>#!DKVlBD% zT=jaqY`5H5%R^o7A=J?T)*_66+W0AL{X@!`~vR1#j7x`90vvvRndw zcW&zsmk`3i3*b7-eob?KALB2C5I+b0%Cb}TfJ%SD1dsp{Kmz#p03RNRpG)rz&sP8d N002ovPDHLkV1jmYmSO+^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Cult/culthood.rsi/inhand-left.png b/Resources/Textures/White/Cult/culthood.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..aa3d43df179636582de261a0efe97fea20caf463 GIT binary patch literal 923 zcmV;M17!S(P)>hQyB@NMvDzkXri`QegC$FrcX-|> z@6JwUUoS}#{%3sK0&J5TU|WD~aszA&uuX1&Z2`8)4X`c1Hn{<|1=uDxz_tL}q+UOhT<$ER|SmHc?WtqO~{aI8`Z=i!(Eng$z7J`d2GZV-EDMk&bN|`j$7)BAR>Gg5(tu#p$1ng)%jA@OW zo5ZLA>jwv@{^<+g<;d|urPs&Bw}HDt5cYa(2LWNP$6X<4PY|C4qqji&$4vYPxPR#K zmG+pKx}78g1NjJ`b^jAkKaXz=qZRPU9}agLP_f%lDYE8a+yGnrH7h~a$PKV9z&5!7wguS6=t}Uonb_tN;yCgOuq_}9Cf6>`ReTf~0e_0=r-^e0n8ry1Ojd!D2ACu_z_tL}7~K(ak^jB|aszA&u#FS{20hQ? zU8$4+tTmeeC@BGkeFJ~Rw)jc$YHlvM6vqI3o}C3?x7(%D?XnRBtZ1D%4<{<%!R{_M z($`{-f%iht>2~SGG2!0cpl=}4^3aJnpziyGQS>E@BCdb?Myu0dBM4~4F>1=b0VfQ2 zb8z4R&w!^YifF}gzh5Ao2d3#8aN-t7xdWU7x=PBcZLLA;e&2u)nFn>E0sv~Y+7sXd z@O-q@X4<|1mnr~Y4WQ-wAOxz{qviWk^$oaY0Aame-vrLbF`H@f)4XFnWq2% literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Cult/culthood.rsi/inhand-right.png b/Resources/Textures/White/Cult/culthood.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9b7997973bc91c2761ef49aa020b0e72b52a5578 GIT binary patch literal 958 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 UyTj}J2^azlp00i_>zopr0Oj+AfdBvi literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/meta.json b/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/meta.json new file mode 100644 index 0000000000..9b51a6cc1e --- /dev/null +++ b/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} \ No newline at end of file From 510619c78eddc92d394d291808be8f7bf382668c Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Fri, 6 Sep 2024 03:57:46 +0000 Subject: [PATCH 2/4] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 35 ++++++++++++++++++++------ 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 9fa122ebf4..9f0991c930 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,11 +1,4 @@ Entries: -- author: HitPanda - changes: - - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043A\u043D\u043E\u043F\u043E\u043A\ - \ \u043F\u0435\u0434\u0430\u043B\u044F\u043C." - type: Add - id: 37 - time: '2023-01-20T23:43:59.0000000+00:00' - author: HitPanda changes: - message: "\u0424\u0438\u043A\u0441 \u0430\u0434\u043C\u0438\u043D \u0434\u043E\ @@ -8685,3 +8678,31 @@ id: 536 time: '2024-09-04T18:47:35.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/685 +- author: BIG_Zi_348 + changes: + - message: "\u041D\u043E\u0432\u044B\u0439 \u0441\u043F\u0440\u0430\u0439\u0442\ + \ \u0440\u043E\u0431\u044B \u0438 \u043A\u0430\u043F\u044E\u0448\u043E\u043D\ + \u0430 \u043A\u0443\u043B\u044C\u0442\u0430." + type: Add + - message: "\u0421\u043F\u0430\u0432\u043D \u041A\u043E\u0440\u043E\u043B\u044F\ + \ \u041A\u0440\u044B\u0441 \u0442\u0435\u043F\u0435\u0440\u044C \u0442\u043E\ + \u043B\u044C\u043A\u043E \u043F\u0440\u0438 >15 \u0438\u0433\u0440\u043E\u043A\ + \u0430\u0445 \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435." + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0440\u0430\u0437\u043C\u0435\ + \u0440 \u0438 \u0432\u043D\u0435\u0448\u043D\u0438\u0439 \u0432\u0438\u0434\ + \ \u0434\u0438\u0441\u043A\u0430 \u043E\u0447\u043A\u043E\u0432 \u0434\u043B\ + \u044F \u0420\u041D\u0414." + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0440\u0430\u0437\ + \u043C\u0435\u0440 \u0444\u0430\u043B\u044C\u0448\u0438\u0432\u043E\u0433\u043E\ + \ \u0434\u0438\u0441\u043A\u0430 \u044F\u0434\u0435\u0440\u043D\u043E\u0439\ + \ \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u0430\u0446\u0438\u0438." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\ + \u0440\u0435\u0432\u043E\u0434\u044B \u0440\u0430\u0437\u043B\u0438\u0447\u043D\ + \u043E\u0439 \u043C\u0435\u043B\u043E\u0447\u0438." + type: Fix + id: 537 + time: '2024-09-06T03:56:42.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/686 From dc76a9a8894b5c484404e12bdad3ba1731557646 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Fri, 6 Sep 2024 20:18:36 +0300 Subject: [PATCH 3/4] fix (#687) --- .../Systems/SingletonDeviceNetServerSystem.cs | 12 ------- .../Cartridges/MessagesCartridgeSystem.cs | 31 ++++++++++++++----- .../EntitySystems/MessagesServerSystem.cs | 28 ----------------- .../Structures/Machine/messege_server.yml | 10 ++---- 4 files changed, 26 insertions(+), 55 deletions(-) diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs index 8d1291b76d..5fdcad7697 100644 --- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs @@ -29,18 +29,6 @@ public sealed class SingletonDeviceNetServerSystem : EntitySystem return Resolve(serverId, ref serverComponent) && serverComponent.Active; } - /// - /// Set server active. WD EDIT - /// - public bool SetServerActive(EntityUid serverId, bool active, SingletonDeviceNetServerComponent? serverComponent = default) - { - if (!Resolve(serverId, ref serverComponent)) - return false; - - serverComponent.Active = active; - return true; - } - /// /// Returns the address of the currently active server for the given station id if there is one.
/// What kind of server you're trying to get the active instance of is determined by the component type parameter TComp.
diff --git a/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs b/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs index b99c19b88b..b636d83962 100644 --- a/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs +++ b/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs @@ -10,6 +10,8 @@ using Content.Server.DeviceNetwork.Systems; using Content.Shared.DeviceNetwork; using Content.Server.Station.Systems; using Content.Shared._White.CartridgeLoader.Cartridges; +using Content.Shared.Inventory; +using Content.Shared.Mind.Components; namespace Content.Server._White.CartridgeLoader.Cartridges; @@ -22,6 +24,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private readonly InventorySystem _inventorySystem = default!; public override void Initialize() { @@ -33,18 +36,30 @@ public sealed class MessagesCartridgeSystem : EntitySystem SubscribeLocalEvent(OnCartDeactivation); SubscribeLocalEvent(OnCartInsertion); SubscribeLocalEvent(OnRemove); + + SubscribeLocalEvent(OnPlayerSpawned); } - public void Send(EntityUid uid, MessagesCartridgeComponent component) + private void OnPlayerSpawned(PlayerSpawnCompleteEvent ev) { - var stationId = _stationSystem.GetOwningStation(uid); - if (!stationId.HasValue || - !_singletonServerSystem.TryGetActiveServerAddress(stationId.Value, - out var address) || !TryComp(uid, out CartridgeComponent? cartComponent)) + if (!_inventorySystem.TryGetSlotEntity(ev.Mob, "id", out var pdaUid) || !HasComp(ev.Mob)) + return; + MessagesCartridgeComponent? comp = null; + + var programs = _cartridgeLoaderSystem.GetInstalled(pdaUid.Value); + var program = programs.ToList().Find(program => TryComp(program, out comp)); + + if (comp == null) return; - component.UserUid = cartComponent.LoaderUid?.Id; - SendName(uid, component, cartComponent, address); + if (!TryComp(program, out CartridgeComponent? cartComponent)) + return; + + var stationId = _stationSystem.GetOwningStation(pdaUid); + if (!stationId.HasValue || !_singletonServerSystem.TryGetActiveServerAddress(stationId.Value, out var address)) + return; + + SendName(pdaUid.Value, comp, cartComponent, address); } private void OnRemove(EntityUid uid, MessagesCartridgeComponent component, ComponentRemove args) @@ -172,7 +187,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem public void SendName(EntityUid uid, MessagesCartridgeComponent component, CartridgeComponent cartComponent, string? address) { TryGetMessagesUser(component, cartComponent, out var messagesUser); - +; var packet = new NetworkPayload() { [MessagesNetworkKeys.UserId] = component.UserUid, diff --git a/Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs b/Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs index 27967e3049..87a1022624 100644 --- a/Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs +++ b/Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs @@ -1,13 +1,9 @@ using System.Linq; -using Content.Server._White.CartridgeLoader.Cartridges; using Content.Server._White.Radio.Components; using Content.Server.Administration.Logs; using Content.Server.Chat.Systems; -using Content.Server.DeviceNetwork.Components; using Content.Server.DeviceNetwork.Systems; -using Content.Server.Station.Systems; using Content.Shared._White.CartridgeLoader.Cartridges; -using Content.Shared.CartridgeLoader; using Content.Shared.Database; using Content.Shared.DeviceNetwork; @@ -18,37 +14,13 @@ public sealed class MessagesServerSystem : EntitySystem { [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; - [Dependency] private readonly MessagesCartridgeSystem _messagesSystem = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnPacketReceived); - SubscribeLocalEvent(OnInit); - } - - private void OnInit(EntityUid uid, MessagesServerComponent component, MapInitEvent args) - { - if (!TryComp(uid, out DeviceNetworkComponent? device) || !_singletonServerSystem.SetServerActive(uid, true)) - return; - - _deviceNetworkSystem.ConnectDevice(uid, device); - - var stationIdServer = _stationSystem.GetOwningStation(uid); - if (!stationIdServer.HasValue) - return; - - var query = EntityQueryEnumerator(); - - while (query.MoveNext(out var entityUid, out var cartridge)) - { - var stationId = _stationSystem.GetOwningStation(entityUid); - if (stationId.HasValue && stationIdServer == stationId && TryComp(entityUid, out CartridgeComponent? cartComponent)) - _messagesSystem.SendName(entityUid, cartridge, cartComponent, device.Address); - } } /// diff --git a/Resources/Prototypes/_White/Entities/Structures/Machine/messege_server.yml b/Resources/Prototypes/_White/Entities/Structures/Machine/messege_server.yml index 534a6cb2d6..732731c512 100644 --- a/Resources/Prototypes/_White/Entities/Structures/Machine/messege_server.yml +++ b/Resources/Prototypes/_White/Entities/Structures/Machine/messege_server.yml @@ -1,6 +1,6 @@ - type: entity id: MessagesServer - parent: BaseMachinePowered + parent: BaseMachine name: PDA messaging server description: Server that allows PDA messaging to function on the station. components: @@ -9,9 +9,6 @@ layers: - state: server - state: variant-research - - type: ApcPowerReceiver - powerLoad: 200 - - type: ExtensionCableReceiver - type: Destructible thresholds: - trigger: @@ -43,11 +40,11 @@ - type: AmbientOnPowered - type: MessagesServer - type: SingletonDeviceNetServer + available: true - type: DeviceNetwork deviceNetId: Wireless transmitFrequencyId: NTMessagesServer receiveFrequencyId: NTMessagesClient - autoConnect: false - type: StationLimitedNetwork - type: entity @@ -59,5 +56,4 @@ - type: DeviceNetwork deviceNetId: Wireless transmitFrequencyId: SyndicateMessagesServer - receiveFrequencyId: SyndicateMessagesClient - autoConnect: false \ No newline at end of file + receiveFrequencyId: SyndicateMessagesClient \ No newline at end of file From c1b2256928f3dc9e6365819e91251e6fbbe93300 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Fri, 6 Sep 2024 17:19:39 +0000 Subject: [PATCH 4/4] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 9f0991c930..d8ccd6cac4 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,11 +1,4 @@ Entries: -- author: HitPanda - changes: - - message: "\u0424\u0438\u043A\u0441 \u0430\u0434\u043C\u0438\u043D \u0434\u043E\ - \u0441\u0442\u0443\u043F\u043E\u0432" - type: Fix - id: 38 - time: '2023-01-21T11:40:56.0000000+00:00' - author: HitPanda changes: - message: "\u0424\u0438\u043A\u0441 \u0430\u0434\u043C\u0438\u043D-\u0434\u043E\ @@ -8706,3 +8699,13 @@ id: 537 time: '2024-09-06T03:56:42.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/686 +- author: Spatison + changes: + - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0441 \u043D\u0430\u0447\u0430\ + \u043B\u0430 \u0440\u0430\u0443\u043D\u0434\u0430 \u043C\u043E\u0436\u043D\u043E\ + \ \u043D\u0430\u043F\u0438\u0441\u0430\u0442\u044C \u043A\u043E\u043C\u0443\ + \ \u0443\u0433\u043E\u0434\u043D\u043E" + type: Fix + id: 538 + time: '2024-09-06T17:18:36.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/687