diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 530dc00da76..923c4e3618a 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -277,11 +277,23 @@ private void SendAdminChat(ICommonSession player, string message) _adminLogger.Add(LogType.Chat, LogImpact.Extreme, $"{player:Player} attempted to send admin message but was not admin"); return; } + // Start-ADT Schrodinger Tweak: Отсюда сможем получить инфу о префиксе админа + var senderAdmin = _adminManager.GetAdminData(player); + if (senderAdmin == null) + { + return; + } + var senderName = player.Name; // Добавил переменную senderName, в ней содержиться player.Name и приставляем префикс к имени + if (!string.IsNullOrEmpty(senderAdmin.Title)) + { + senderName += $"\\[{senderAdmin.Title}\\]"; + } + // End-ADT Tweak var clients = _adminManager.ActiveAdmins.Select(p => p.Channel); var wrappedMessage = Loc.GetString("chat-manager-send-admin-chat-wrap-message", ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), - ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message))); + ("playerName", senderName), ("message", FormattedMessage.EscapeText(message))); // ADT Tweak тут заменил player.Name на senderName foreach (var client in clients) { diff --git a/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs b/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs index ed746c3d50e..5e4c51eef6a 100644 --- a/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs +++ b/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs @@ -16,6 +16,9 @@ public sealed class TTSVoicePrototype : IPrototype [DataField("name")] public string Name { get; } = string.Empty; + [DataField("description")] + public string Description { get; } = string.Empty; + [DataField("sex", required: true)] public Sex Sex { get; } = default!; diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml index 488edc48229..845bb58cf3a 100644 --- a/Resources/Changelog/1ChangelogADT.yml +++ b/Resources/Changelog/1ChangelogADT.yml @@ -2813,3 +2813,37 @@ Entries: - {message: Подтянуты коммиты с корвакса 06.09.2024, type: Add} time: '2024-09-06T23:18:41Z' id: 327 + - author: Inconnu + changes: + - {message: 'Добавлено Хачапуре, рецепт приготовления и перевод.', type: Add} + time: '2024-09-07T00:22:04Z' + id: 328 + - author: Friskis + changes: + - {message: 'Благодаря стараниям флота, значительное количество космического + мусора было уничтожено', type: Fix} + - {message: Хотфикс игры за ИИ от Коти, type: Fix} + - {message: Добавлены роли СБ борга на карты, type: Add} + time: '2024-09-07T06:56:16Z' + id: 329 + - author: Шрёдька + changes: + - {message: Админ префикс для админ-чата починен., type: Fix} + time: '2024-09-07T09:23:21Z' + id: 330 + - author: KashRas2 + changes: + - {message: Теперь в Керфуса можно класть разные вещи. Готовьте своих робо-котиков + к работе официантом., type: Tweak} + - {message: Роботехнический отдел обучили настройке медицинских модулей для + Керфуса., type: Tweak} + - {message: Керфуса теперь точно можно собрать., type: Fix} + time: '2024-09-07T11:54:08Z' + id: 331 + - author: KashRas2 + changes: + - {message: Добавлен модуль с экспериментальным РРТ для боргов., type: Add} + - {message: 'В связи с добавлением нового модуля, цена технологии увеличена + с 10000 до 10500', type: Tweak} + time: '2024-09-07T14:14:07Z' + id: 332 diff --git a/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_modules.ftl index 8be2a022302..7fad7cbf8b2 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_modules.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_modules.ftl @@ -1,6 +1,8 @@ ent-ADTBorgModuleDetention = модуль задержания - .desc = сожержит вспышку, кабельные стяжки и телескопическую дубинку. + .desc = { ent-BaseBorgModule.desc } ent-ADTBorgModuleHarm = модуль вреда - .desc = сожержит самозарядную лазерную винтовку и дубину для нанесения тяжких телесных повреждений. + .desc = { ent-BaseBorgModule.desc } ent-ADTBorgModuleDisabler = модуль дизаблера - .desc = сожержит дизаблер и кабельные стяжки. \ No newline at end of file + .desc = { ent-BaseBorgModule.desc } +ent-ADTBorgModuleRPD = РРТ-модуль киборга + .desc = { ent-BaseBorgModule.desc } diff --git a/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.ftl b/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.ftl index bae1aa3ff3d..d416afe96ec 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.ftl @@ -4,5 +4,5 @@ ent-ADTLeftLegBorgSecurity = левая нога киборга-офицера ent-ADTRightLegBorgSecurity = правая нога киборга-офицера ent-ADTHeadBorgSecurity = голова киборга-офицера ent-ADTTorsoBorgSecurity = туловище киборга-офицера -ent-ADTTorsoBorgKerfusNT = голова керфуса -ent-ADTHeadBorgKerfusNT = туловище керфуса +ent-ADTTorsoBorgKerfusNT = туловище керфуса +ent-ADTHeadBorgKerfusNT = голова керфуса diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/silicon.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/silicon.ftl new file mode 100644 index 00000000000..8df54bd71e3 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/silicon.ftl @@ -0,0 +1,3 @@ +ent-ADTPlayerBorgKerfusNT = { ent-ADTBorgChassisKerfusNT } + .desc = { ent-ADTBorgChassisKerfusNT.desc } + .suffix = Батарея, инструменты diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/tools.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/tools.ftl index 1d1fa8a53a2..2ace77f2f99 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/tools.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/tools.ftl @@ -5,3 +5,6 @@ ent-ADTRPDAmmo = консервированная материя ent-ADTRPDEmpty = { ent-ADTRPD } .desc = { ent-ADTRPD.desc } .suffix = Пустой +ent-ADTRPDRecharging = экспериментальный РРТ + .desc = Блюспейс-улучшенный РРТ, пассивно регенерирующий заряды. + .suffix = Автозарядка diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml b/Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml index 29490dddf54..a89b2362987 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml @@ -5083,8 +5083,6 @@ entities: pos: 64.5,-23.5 parent: 2 - type: DeviceList - # configurators: - # - invalid devices: - 7833 - 7834 @@ -5124,8 +5122,6 @@ entities: pos: 68.5,-19.5 parent: 2 - type: DeviceList - # configurators: - # - invalid devices: - 496 - 7833 @@ -5150,8 +5146,6 @@ entities: pos: 63.5,-9.5 parent: 2 - type: DeviceList - # configurators: - # - invalid devices: - 7835 - 7840 @@ -5756,8 +5750,6 @@ entities: pos: 14.5,46.5 parent: 2 - type: DeviceList - # configurators: - # - invalid devices: - 7968 - 7965 @@ -5960,8 +5952,6 @@ entities: pos: 44.5,-9.5 parent: 2 - type: DeviceList - # configurators: - # - invalid devices: - 445 - 8018 @@ -6278,8 +6268,6 @@ entities: pos: 59.5,28.5 parent: 2 - type: DeviceList - # configurators: - # - invalid devices: - 8141 - 8142 @@ -7522,7 +7510,7 @@ entities: pos: 70.5,-27.5 parent: 2 - type: Door - secondsUntilStateChange: -5933.1836 + secondsUntilStateChange: -6152.204 state: Opening - type: DeviceLinkSource lastSignals: @@ -7595,7 +7583,7 @@ entities: pos: 84.5,57.5 parent: 2 - type: Door - secondsUntilStateChange: -16036.741 + secondsUntilStateChange: -16255.762 state: Opening - type: DeviceLinkSource lastSignals: @@ -8049,7 +8037,7 @@ entities: pos: 43.5,33.5 parent: 2 - type: Door - secondsUntilStateChange: -13371.057 + secondsUntilStateChange: -13590.077 state: Opening - type: DeviceLinkSource lastSignals: @@ -48170,8 +48158,6 @@ entities: pos: 58.5,33.5 parent: 2 - type: DeviceList - # configurators: - # - invalid devices: - 8076 - 8075 @@ -48394,7 +48380,7 @@ entities: - 7710 - 80 - type: Door - secondsUntilStateChange: -38988.836 + secondsUntilStateChange: -39207.855 state: Closing - type: Firelock emergencyCloseCooldown: 85100.4006158 @@ -48418,7 +48404,7 @@ entities: - 81 - 7711 - type: Door - secondsUntilStateChange: -39387.836 + secondsUntilStateChange: -39606.855 state: Closing - type: Firelock emergencyCloseCooldown: 86093.4281942 @@ -49127,7 +49113,7 @@ entities: pos: 66.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -37754.125 + secondsUntilStateChange: -37973.145 state: Closing - type: DeviceNetwork deviceLists: @@ -49592,7 +49578,7 @@ entities: pos: 82.5,45.5 parent: 2 - type: Door - secondsUntilStateChange: -39477.895 + secondsUntilStateChange: -39696.914 state: Closing - type: DeviceNetwork deviceLists: @@ -50425,7 +50411,7 @@ entities: pos: 21.5,23.5 parent: 2 - type: Door - secondsUntilStateChange: -24403.965 + secondsUntilStateChange: -24622.986 state: Closing - type: DeviceNetwork deviceLists: @@ -50507,7 +50493,7 @@ entities: pos: 16.5,5.5 parent: 2 - type: Door - secondsUntilStateChange: -24748.535 + secondsUntilStateChange: -24967.557 state: Closing - type: DeviceNetwork deviceLists: @@ -50587,7 +50573,7 @@ entities: pos: 32.5,-2.5 parent: 2 - type: Door - secondsUntilStateChange: -37389.953 + secondsUntilStateChange: -37608.973 state: Closing - type: DeviceNetwork deviceLists: @@ -51224,7 +51210,7 @@ entities: pos: 58.5,23.5 parent: 2 - type: Door - secondsUntilStateChange: -14234.729 + secondsUntilStateChange: -14453.749 state: Closing - type: DeviceNetwork deviceLists: @@ -51336,7 +51322,7 @@ entities: pos: 82.5,62.5 parent: 2 - type: Door - secondsUntilStateChange: -15811.47 + secondsUntilStateChange: -16030.49 state: Closing - uid: 8082 components: @@ -51459,7 +51445,7 @@ entities: pos: 64.5,36.5 parent: 2 - type: Door - secondsUntilStateChange: -26385.248 + secondsUntilStateChange: -26604.27 state: Closing - type: DeviceNetwork deviceLists: @@ -51909,7 +51895,7 @@ entities: pos: 40.5,73.5 parent: 2 - type: Door - secondsUntilStateChange: -30458.215 + secondsUntilStateChange: -30677.236 state: Closing - type: Firelock emergencyCloseCooldown: 82208.0035082 @@ -96811,6 +96797,13 @@ entities: - type: Transform pos: 74.5,38.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 18126 + components: + - type: Transform + pos: 36.5,55.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 14901 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_astra.yml b/Resources/Maps/ADTMaps/ADTStations/adt_astra.yml index dfc931109d4..b3d05eb0ac6 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_astra.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_astra.yml @@ -115283,7 +115283,7 @@ entities: pos: 29.5,-30.5 parent: 2 - type: Door - secondsUntilStateChange: -1696.3945 + secondsUntilStateChange: -1728.3838 state: Closing - uid: 17086 components: @@ -181870,43 +181870,6 @@ entities: rot: -1.5707963267948966 rad pos: -64.73485,-33.68395 parent: 2 -- proto: RiotBulletShield - entities: - - uid: 26828 - components: - - type: Transform - pos: 65.3617,-4.430693 - parent: 2 - - uid: 26829 - components: - - type: Transform - pos: 65.68115,-4.421434 - parent: 2 - - uid: 26830 - components: - - type: Transform - pos: 65.500595,-4.6019893 - parent: 2 - - uid: 26831 - components: - - type: Transform - pos: 45.59504,7.4947042 - parent: 2 - - uid: 26832 - components: - - type: Transform - pos: 45.25129,7.4790792 - parent: 2 - - uid: 26833 - components: - - type: Transform - pos: 45.43879,7.3697042 - parent: 2 - - uid: 37166 - components: - - type: Transform - pos: 6.4677124,-10.531189 - parent: 36616 - proto: RiotLaserShield entities: - uid: 14335 @@ -188608,6 +188571,13 @@ entities: - type: Transform pos: -55.5,-37.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 26828 + components: + - type: Transform + pos: 56.5,-3.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 27779 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_avrite.yml b/Resources/Maps/ADTMaps/ADTStations/adt_avrite.yml index ac508cf33e1..ade77449fa2 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_avrite.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_avrite.yml @@ -155692,7 +155692,7 @@ entities: pos: -12.5,61.5 parent: 2 - type: Door - secondsUntilStateChange: -378933.62 + secondsUntilStateChange: -378976.16 state: Closing - proto: CurtainsPurple entities: @@ -301765,33 +301765,6 @@ entities: - type: Transform pos: -79.51644,24.63629 parent: 2 -- proto: RiotBulletShield - entities: - - uid: 40461 - components: - - type: Transform - pos: -54.43207,-28.538687 - parent: 2 - - uid: 40462 - components: - - type: Transform - pos: -54.43207,-28.538687 - parent: 2 - - uid: 40463 - components: - - type: Transform - pos: -54.43207,-28.538687 - parent: 2 - - uid: 40464 - components: - - type: Transform - pos: -94.4883,50.405964 - parent: 2 - - uid: 55152 - components: - - type: Transform - pos: 6.4677124,-10.531189 - parent: 54608 - proto: RiotLaserShield entities: - uid: 40465 @@ -312871,6 +312844,13 @@ entities: - type: Transform pos: 36.5,-59.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 40461 + components: + - type: Transform + pos: -37.5,-29.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 42184 @@ -392638,7 +392618,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -140003.8 + secondsUntilStateChange: -140046.33 state: Opening - uid: 53257 components: diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_bagel.yml b/Resources/Maps/ADTMaps/ADTStations/adt_bagel.yml index e86caf74619..e70cf89c4a1 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_bagel.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_bagel.yml @@ -128801,6 +128801,13 @@ entities: - type: Transform pos: 38.5,-9.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 24525 + components: + - type: Transform + pos: -28.5,-4.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 19432 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_box.yml b/Resources/Maps/ADTMaps/ADTStations/adt_box.yml index 8ea98803e42..0725a2f3223 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_box.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_box.yml @@ -11778,7 +11778,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -4480.5684 + secondsUntilStateChange: -4527.1733 state: Opening - type: DeviceLinkSource lastSignals: @@ -84687,7 +84687,7 @@ entities: pos: 41.5,-13.5 parent: 8364 - type: Door - secondsUntilStateChange: -1093.0336 + secondsUntilStateChange: -1139.6385 state: Closing - type: Firelock emergencyCloseCooldown: 53864.6889944 @@ -144154,6 +144154,13 @@ entities: - type: Transform pos: 44.5,-19.5 parent: 8364 +- proto: SpawnPointADTSecborg + entities: + - uid: 22528 + components: + - type: Transform + pos: 14.5,34.5 + parent: 8364 - proto: SpawnPointAtmos entities: - uid: 17809 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_cluster.yml b/Resources/Maps/ADTMaps/ADTStations/adt_cluster.yml index bc6adc96635..0e55f354366 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_cluster.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_cluster.yml @@ -7477,11 +7477,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,21.5 parent: 2 - # - type: DeviceNetwork - # configurators: - # - invalid - # deviceLists: - # - 88 - proto: AltarSpawner entities: - uid: 361 @@ -35163,11 +35158,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,21.5 parent: 2 - # - type: DeviceNetwork - # configurators: - # - invalid - # deviceLists: - # - 88 - proto: FirelockEdge entities: - uid: 5360 @@ -50587,11 +50577,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,20.5 parent: 2 - # - type: DeviceNetwork - # configurators: - # - invalid - # deviceLists: - # - 88 - type: AtmosPipeColor color: '#0000FFFF' - uid: 7461 @@ -51417,11 +51402,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,21.5 parent: 2 - # - type: DeviceNetwork - # configurators: - # - invalid - # deviceLists: - # - 88 - type: AtmosPipeColor color: '#FF0000FF' - uid: 7565 @@ -67634,6 +67614,13 @@ entities: - type: Transform pos: -24.5,14.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 12726 + components: + - type: Transform + pos: 18.5,9.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 10330 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_core.yml b/Resources/Maps/ADTMaps/ADTStations/adt_core.yml index a6fd2edc865..0dbf6c6b049 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_core.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_core.yml @@ -14343,7 +14343,7 @@ entities: pos: -10.5,-16.5 parent: 2 - type: Door - secondsUntilStateChange: -1096.7141 + secondsUntilStateChange: -1126.8413 state: Opening - type: DeviceLinkSource lastSignals: @@ -16985,8 +16985,6 @@ entities: pos: 33.5,-10.5 parent: 2 - type: DeviceNetwork - # configurators: - # - invalid deviceLists: - 62 - uid: 615 @@ -118318,6 +118316,13 @@ entities: - type: Transform pos: 51.5,-10.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 13553 + components: + - type: Transform + pos: -6.5,32.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 17357 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_delta.yml b/Resources/Maps/ADTMaps/ADTStations/adt_delta.yml index 6581ef25e67..d8967e3cde9 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_delta.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_delta.yml @@ -33527,7 +33527,7 @@ entities: pos: 19.5,-2.5 parent: 2 - type: Door - secondsUntilStateChange: -30478.014 + secondsUntilStateChange: -30500.414 state: Opening - type: DeviceLinkSource lastSignals: @@ -33672,7 +33672,7 @@ entities: pos: 49.5,4.5 parent: 2 - type: Door - secondsUntilStateChange: -1958.5243 + secondsUntilStateChange: -1980.9243 state: Opening - type: DeviceLinkSource lastSignals: @@ -33875,7 +33875,7 @@ entities: pos: 49.5,22.5 parent: 2 - type: Door - secondsUntilStateChange: -76968.08 + secondsUntilStateChange: -76990.48 state: Opening - type: DeviceLinkSource lastSignals: @@ -133246,8 +133246,6 @@ entities: pos: -15.5,25.5 parent: 2 - type: DeviceList - # configurators: - # - invalid devices: - 17608 - 17560 @@ -220381,6 +220379,13 @@ entities: - type: Transform pos: 6.5,-49.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 25023 + components: + - type: Transform + pos: 55.5,1.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 29154 @@ -232728,9 +232733,6 @@ entities: - type: Transform pos: -13.5,25.5 parent: 2 - # - type: DeviceNetwork - # configurators: - # - invalid - uid: 31053 components: - type: Transform diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_fland.yml b/Resources/Maps/ADTMaps/ADTStations/adt_fland.yml index e61620fdaf6..a24177f81e0 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_fland.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_fland.yml @@ -115254,7 +115254,7 @@ entities: pos: 56.5,25.5 parent: 2 - type: Door - secondsUntilStateChange: -882.8422 + secondsUntilStateChange: -924.95465 state: Closing - uid: 17726 components: @@ -151880,8 +151880,6 @@ entities: pos: 97.5,4.5 parent: 2 - type: DeviceNetwork - # configurators: - # - invalid deviceLists: - 21523 - type: AtmosPipeColor @@ -189587,6 +189585,13 @@ entities: - type: Transform pos: 4.5,40.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 26036 + components: + - type: Transform + pos: 35.5,14.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 28648 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_gemini.yml b/Resources/Maps/ADTMaps/ADTStations/adt_gemini.yml index de33f84695c..4d93d7d5c78 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_gemini.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_gemini.yml @@ -12651,7 +12651,7 @@ entities: pos: -9.5,60.5 parent: 2 - type: Door - secondsUntilStateChange: -9726.785 + secondsUntilStateChange: -9754.118 state: Opening - uid: 160 components: @@ -14198,7 +14198,7 @@ entities: pos: 0.5,-22.5 parent: 2 - type: Door - secondsUntilStateChange: -91167.47 + secondsUntilStateChange: -91194.805 state: Opening - uid: 439 components: @@ -14505,7 +14505,7 @@ entities: pos: -1.5,10.5 parent: 2 - type: Door - secondsUntilStateChange: -114127.78 + secondsUntilStateChange: -114155.12 state: Opening - proto: AirlockResearchDirectorLocked entities: @@ -14516,7 +14516,7 @@ entities: pos: -2.5,11.5 parent: 2 - type: Door - secondsUntilStateChange: -114127.414 + secondsUntilStateChange: -114154.75 state: Opening - proto: AirlockSalvageGlassLocked entities: @@ -14552,7 +14552,7 @@ entities: pos: 24.5,72.5 parent: 2 - type: Door - secondsUntilStateChange: -112681.55 + secondsUntilStateChange: -112708.88 state: Opening - uid: 501 components: @@ -14579,7 +14579,7 @@ entities: pos: 18.5,68.5 parent: 2 - type: Door - secondsUntilStateChange: -128554.97 + secondsUntilStateChange: -128582.305 state: Opening - uid: 505 components: @@ -14594,7 +14594,7 @@ entities: pos: 23.5,72.5 parent: 2 - type: Door - secondsUntilStateChange: -112681.984 + secondsUntilStateChange: -112709.32 state: Opening - uid: 507 components: @@ -14624,7 +14624,7 @@ entities: pos: 10.5,6.5 parent: 2 - type: Door - secondsUntilStateChange: -114130.34 + secondsUntilStateChange: -114157.68 state: Opening - uid: 511 components: @@ -14632,7 +14632,7 @@ entities: pos: -0.5,15.5 parent: 2 - type: Door - secondsUntilStateChange: -114124.05 + secondsUntilStateChange: -114151.38 state: Opening - uid: 512 components: @@ -14642,7 +14642,7 @@ entities: pos: 2.5,7.5 parent: 2 - type: Door - secondsUntilStateChange: -113585.016 + secondsUntilStateChange: -113612.35 state: Opening - uid: 513 components: @@ -14651,7 +14651,7 @@ entities: pos: 11.5,3.5 parent: 2 - type: Door - secondsUntilStateChange: -151345.44 + secondsUntilStateChange: -151372.77 state: Opening - uid: 514 components: @@ -14659,7 +14659,7 @@ entities: pos: 5.5,19.5 parent: 2 - type: Door - secondsUntilStateChange: -114140.15 + secondsUntilStateChange: -114167.484 state: Opening - uid: 515 components: @@ -14667,7 +14667,7 @@ entities: pos: -0.5,16.5 parent: 2 - type: Door - secondsUntilStateChange: -114124.28 + secondsUntilStateChange: -114151.62 state: Opening - uid: 516 components: @@ -14675,7 +14675,7 @@ entities: pos: 13.5,13.5 parent: 2 - type: Door - secondsUntilStateChange: -114138.58 + secondsUntilStateChange: -114165.914 state: Opening - uid: 517 components: @@ -14683,7 +14683,7 @@ entities: pos: 14.5,13.5 parent: 2 - type: Door - secondsUntilStateChange: -114138.88 + secondsUntilStateChange: -114166.22 state: Opening - proto: AirlockScienceLocked entities: @@ -14693,7 +14693,7 @@ entities: pos: 27.5,13.5 parent: 2 - type: Door - secondsUntilStateChange: -114100.38 + secondsUntilStateChange: -114127.72 state: Opening - uid: 519 components: @@ -14701,7 +14701,7 @@ entities: pos: 30.5,13.5 parent: 2 - type: Door - secondsUntilStateChange: -114098.81 + secondsUntilStateChange: -114126.15 state: Opening - uid: 520 components: @@ -14710,7 +14710,7 @@ entities: pos: 17.5,15.5 parent: 2 - type: Door - secondsUntilStateChange: -114137.55 + secondsUntilStateChange: -114164.88 state: Opening - uid: 521 components: @@ -14718,7 +14718,7 @@ entities: pos: 30.5,12.5 parent: 2 - type: Door - secondsUntilStateChange: -114099.08 + secondsUntilStateChange: -114126.414 state: Opening - uid: 522 components: @@ -14726,7 +14726,7 @@ entities: pos: 27.5,12.5 parent: 2 - type: Door - secondsUntilStateChange: -114100.68 + secondsUntilStateChange: -114128.016 state: Opening - uid: 523 components: @@ -14734,7 +14734,7 @@ entities: pos: 15.5,19.5 parent: 2 - type: Door - secondsUntilStateChange: -155431.28 + secondsUntilStateChange: -155458.61 state: Opening - uid: 524 components: @@ -14742,7 +14742,7 @@ entities: pos: 11.5,19.5 parent: 2 - type: Door - secondsUntilStateChange: -114141.945 + secondsUntilStateChange: -114169.28 state: Opening - uid: 525 components: @@ -14751,7 +14751,7 @@ entities: pos: 17.5,14.5 parent: 2 - type: Door - secondsUntilStateChange: -114137.81 + secondsUntilStateChange: -114165.15 state: Opening - uid: 526 components: @@ -14760,7 +14760,7 @@ entities: pos: 22.5,15.5 parent: 2 - type: Door - secondsUntilStateChange: -114136.08 + secondsUntilStateChange: -114163.414 state: Opening - uid: 527 components: @@ -14769,7 +14769,7 @@ entities: pos: 22.5,14.5 parent: 2 - type: Door - secondsUntilStateChange: -114135.81 + secondsUntilStateChange: -114163.15 state: Opening - proto: AirlockSecurity entities: @@ -83692,7 +83692,7 @@ entities: pos: 19.5,62.5 parent: 2 - type: Door - secondsUntilStateChange: -151926.66 + secondsUntilStateChange: -151953.98 state: Closing - uid: 12990 components: @@ -84018,7 +84018,7 @@ entities: pos: -4.5,-15.5 parent: 2 - type: Door - secondsUntilStateChange: -5042.043 + secondsUntilStateChange: -5069.3765 state: Closing - uid: 13054 components: @@ -120420,7 +120420,7 @@ entities: pos: 29.5,63.5 parent: 2 - type: Door - secondsUntilStateChange: -127697.266 + secondsUntilStateChange: -127724.6 state: Opening - proto: HospitalCurtainsOpen entities: @@ -139098,13 +139098,6 @@ entities: - type: Transform pos: -50.547672,-1.2422137 parent: 2 -- proto: RiotBulletShield - entities: - - uid: 21460 - components: - - type: Transform - pos: 49.31745,-14.434636 - parent: 2 - proto: RiotShield entities: - uid: 21461 @@ -144876,6 +144869,13 @@ entities: - type: Transform pos: -54.5,-28.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 979 + components: + - type: Transform + pos: 51.5,-2.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 22302 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_marathon.yml b/Resources/Maps/ADTMaps/ADTStations/adt_marathon.yml index decd2c3499c..63ce89c4559 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_marathon.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_marathon.yml @@ -11310,7 +11310,7 @@ entities: pos: -20.5,-5.5 parent: 2 - type: Door - secondsUntilStateChange: -23039.807 + secondsUntilStateChange: -23063.307 state: Opening - type: DeviceLinkSource lastSignals: @@ -116283,6 +116283,13 @@ entities: - type: Transform pos: -23.5,-4.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 22096 + components: + - type: Transform + pos: -30.5,59.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 17797 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_meta.yml b/Resources/Maps/ADTMaps/ADTStations/adt_meta.yml index 1f048e57579..512987b9e34 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_meta.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_meta.yml @@ -10927,7 +10927,7 @@ entities: pos: -42.5,29.5 parent: 2 - type: Door - secondsUntilStateChange: -2444.2253 + secondsUntilStateChange: -2463.1914 state: Opening - type: DeviceLinkSink invokeCounter: 2 @@ -138621,6 +138621,13 @@ entities: - type: Transform pos: -14.5,-50.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 26747 + components: + - type: Transform + pos: 2.5,37.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 21134 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_oasis.yml b/Resources/Maps/ADTMaps/ADTStations/adt_oasis.yml index 91c2bbe6d39..bc4fdad3d20 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_oasis.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_oasis.yml @@ -14896,7 +14896,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -13298.633 + secondsUntilStateChange: -13334.3 state: Opening - uid: 561 components: @@ -14908,7 +14908,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -13301.267 + secondsUntilStateChange: -13336.934 state: Opening - uid: 562 components: @@ -14920,7 +14920,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -13300.116 + secondsUntilStateChange: -13335.783 state: Opening - uid: 563 components: @@ -14931,7 +14931,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -13299.333 + secondsUntilStateChange: -13335 state: Opening - proto: AirlockTheatreLocked entities: @@ -92996,7 +92996,7 @@ entities: pos: -13.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -4622.6123 + secondsUntilStateChange: -4658.279 state: Closing - type: DeviceNetwork deviceLists: @@ -137031,7 +137031,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -41454.47 + secondsUntilStateChange: -41490.137 state: Opening - uid: 15856 components: @@ -158059,6 +158059,13 @@ entities: - type: Transform pos: -3.5,-27.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 22971 + components: + - type: Transform + pos: 37.5,-33.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 18877 @@ -184950,7 +184957,7 @@ entities: pos: 24.5,2.5 parent: 22975 - type: Door - secondsUntilStateChange: -386659.1 + secondsUntilStateChange: -386694.75 state: Opening - proto: WoodenBench entities: diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_origin.yml b/Resources/Maps/ADTMaps/ADTStations/adt_origin.yml index c3d2075ad4f..9063a0925be 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_origin.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_origin.yml @@ -12675,7 +12675,7 @@ entities: pos: 19.5,16.5 parent: 2 - type: Door - secondsUntilStateChange: -29618.51 + secondsUntilStateChange: -29645.676 state: Opening - uid: 196 components: @@ -14479,7 +14479,7 @@ entities: pos: 51.5,-3.5 parent: 2 - type: Door - secondsUntilStateChange: -28432.328 + secondsUntilStateChange: -28459.494 state: Opening - uid: 499 components: @@ -14488,7 +14488,7 @@ entities: pos: 52.5,-3.5 parent: 2 - type: Door - secondsUntilStateChange: -28431.111 + secondsUntilStateChange: -28458.277 state: Opening - uid: 500 components: @@ -158941,18 +158941,6 @@ entities: - type: Transform pos: -32.424732,6.232961 parent: 2 -- proto: RiotBulletShield - entities: - - uid: 24224 - components: - - type: Transform - pos: 29.760902,32.66437 - parent: 2 - - uid: 24225 - components: - - type: Transform - pos: 29.635902,32.492496 - parent: 2 - proto: RockGuitarInstrument entities: - uid: 24226 @@ -164600,6 +164588,13 @@ entities: - type: Transform pos: -13.5,-65.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 24224 + components: + - type: Transform + pos: 24.5,18.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 24994 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_packed.yml b/Resources/Maps/ADTMaps/ADTStations/adt_packed.yml index d72a3761353..7aac963cd62 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_packed.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_packed.yml @@ -8978,6 +8978,42 @@ entities: - type: Transform pos: 35.5,7.5 parent: 2 +- proto: AlwaysPoweredWallLight + entities: + - uid: 13342 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,36.5 + parent: 2 + - uid: 13343 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,33.5 + parent: 2 + - uid: 13344 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,36.5 + parent: 2 + - uid: 13345 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,33.5 + parent: 2 + - uid: 13346 + components: + - type: Transform + pos: 55.5,31.5 + parent: 2 + - uid: 13347 + components: + - type: Transform + pos: 57.5,31.5 + parent: 2 - proto: AmeController entities: - uid: 419 @@ -9647,6 +9683,11 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,25.5 parent: 2 + - uid: 13357 + components: + - type: Transform + pos: 55.5,35.5 + parent: 2 - proto: APCSuperCapacity entities: - uid: 508 @@ -19249,6 +19290,46 @@ entities: - type: Transform pos: 9.5,-41.5 parent: 2 + - uid: 13363 + components: + - type: Transform + pos: 55.5,35.5 + parent: 2 + - uid: 13364 + components: + - type: Transform + pos: 55.5,34.5 + parent: 2 + - uid: 13365 + components: + - type: Transform + pos: 56.5,34.5 + parent: 2 + - uid: 13366 + components: + - type: Transform + pos: 56.5,33.5 + parent: 2 + - uid: 13367 + components: + - type: Transform + pos: 56.5,32.5 + parent: 2 + - uid: 13368 + components: + - type: Transform + pos: 56.5,31.5 + parent: 2 + - uid: 13369 + components: + - type: Transform + pos: 56.5,30.5 + parent: 2 + - uid: 13370 + components: + - type: Transform + pos: 56.5,29.5 + parent: 2 - proto: CableApcStack entities: - uid: 2373 @@ -24215,6 +24296,31 @@ entities: - type: Transform pos: 13.5,-52.5 parent: 2 + - uid: 13352 + components: + - type: Transform + pos: 52.5,36.5 + parent: 2 + - uid: 13353 + components: + - type: Transform + pos: 53.5,36.5 + parent: 2 + - uid: 13354 + components: + - type: Transform + pos: 53.5,37.5 + parent: 2 + - uid: 13355 + components: + - type: Transform + pos: 53.5,38.5 + parent: 2 + - uid: 13356 + components: + - type: Transform + pos: 54.5,38.5 + parent: 2 - proto: CableHVStack entities: - uid: 3365 @@ -28530,6 +28636,31 @@ entities: - type: Transform pos: 11.5,7.5 parent: 2 + - uid: 13358 + components: + - type: Transform + pos: 54.5,38.5 + parent: 2 + - uid: 13359 + components: + - type: Transform + pos: 54.5,37.5 + parent: 2 + - uid: 13360 + components: + - type: Transform + pos: 54.5,36.5 + parent: 2 + - uid: 13361 + components: + - type: Transform + pos: 54.5,35.5 + parent: 2 + - uid: 13362 + components: + - type: Transform + pos: 55.5,35.5 + parent: 2 - proto: CableMVStack entities: - uid: 4229 @@ -28585,6 +28716,12 @@ entities: rot: 3.141592653589793 rad pos: 112.5,-18.5 parent: 2 + - uid: 13349 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,36.5 + parent: 2 - proto: CandlePurpleSmall entities: - uid: 32 @@ -33708,9 +33845,6 @@ entities: - type: Transform pos: 20.48783,5.539976 parent: 2 - # - type: DeviceNetwork - # configurators: - # - invalid - proto: ClownRecorder entities: - uid: 5128 @@ -34118,6 +34252,12 @@ entities: rot: 3.141592653589793 rad pos: 61.5,8.5 parent: 2 + - uid: 13371 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,36.5 + parent: 2 - proto: ComputerSalvageExpedition entities: - uid: 5193 @@ -40513,7 +40653,7 @@ entities: pos: 49.5,-19.5 parent: 2 - type: Door - secondsUntilStateChange: -1587.6932 + secondsUntilStateChange: -1793.3597 state: Closing - uid: 6182 components: @@ -53482,6 +53622,13 @@ entities: - type: Transform pos: 67.46306,3.7913218 parent: 2 +- proto: GeneratorBasic15kW + entities: + - uid: 13351 + components: + - type: Transform + pos: 52.5,36.5 + parent: 2 - proto: Girder entities: - uid: 7939 @@ -57961,7 +58108,7 @@ entities: pos: 65.5,2.5 parent: 2 - type: Door - secondsUntilStateChange: -2087.8643 + secondsUntilStateChange: -2293.5308 state: Closing - uid: 8824 components: @@ -66565,6 +66712,16 @@ entities: - Pressed: Toggle 10226: - Pressed: Toggle + - uid: 13341 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,37.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 650: + - Pressed: Toggle - proto: SignalButtonDirectional entities: - uid: 10246 @@ -67530,6 +67687,11 @@ entities: - type: Transform pos: 3.5,-34.5 parent: 2 + - uid: 13348 + components: + - type: Transform + pos: 53.5,37.5 + parent: 2 - proto: SmokingPipeFilledTobacco entities: - uid: 10393 @@ -68330,6 +68492,13 @@ entities: - type: Transform pos: 73.5,-2.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 13336 + components: + - type: Transform + pos: 35.5,19.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 10539 @@ -69202,6 +69371,11 @@ entities: loadingNetworkDemand: 60.000237 currentReceiving: 60.000237 currentSupply: 60.000237 + - uid: 13350 + components: + - type: Transform + pos: 54.5,38.5 + parent: 2 - proto: SubstationWallBasic entities: - uid: 10672 @@ -69441,6 +69615,29 @@ entities: - SurveillanceCameraCommand nameSet: True id: Bridge Entrance + - uid: 13337 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,35.5 + parent: 2 + - uid: 13338 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,35.5 + parent: 2 + - uid: 13339 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 56.5,38.5 + parent: 2 + - uid: 13340 + components: + - type: Transform + pos: 58.5,29.5 + parent: 2 - proto: SurveillanceCameraEngineering entities: - uid: 10701 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_saltern.yml b/Resources/Maps/ADTMaps/ADTStations/adt_saltern.yml index bdd5dc28144..f26e65604d0 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_saltern.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_saltern.yml @@ -58047,6 +58047,13 @@ entities: - type: Transform pos: 15.5,-15.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 9623 + components: + - type: Transform + pos: -12.5,15.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 9256 diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_train.yml b/Resources/Maps/ADTMaps/ADTStations/adt_train.yml index 0e52b43ada8..e610083aa20 100644 --- a/Resources/Maps/ADTMaps/ADTStations/adt_train.yml +++ b/Resources/Maps/ADTMaps/ADTStations/adt_train.yml @@ -76693,7 +76693,7 @@ entities: pos: 8.5,-176.5 parent: 2 - type: Door - secondsUntilStateChange: -148266.53 + secondsUntilStateChange: -148300.11 state: Closing - uid: 11227 components: @@ -89372,6 +89372,13 @@ entities: - type: Transform pos: -3.5,-173.5 parent: 2 +- proto: SpawnPointADTSecborg + entities: + - uid: 17428 + components: + - type: Transform + pos: -7.5,-339.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 17062 diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml index 51f3beffd25..dd8550ab593 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -119,7 +119,7 @@ - state: seniorofficer - type: entity - id: SpawnADTSecborg + id: SpawnPointADTSecborg parent: ADTSpawnPointJobBase name: secborg components: diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml index 1518700ad5e..96ac75929bc 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -54,24 +54,6 @@ - Science - type: TTS voice: sentrybot -- type: entity - id: ADTPlayerSecBorgGeneric - parent: ADTBorgChassisSec - suffix: Battery, Tools - components: - - type: ContainerFill - containers: - borg_brain: - - PositronicBrain - borg_module: - - ADTBorgModuleDetention - - type: ItemSlots - slots: - cell_slot: - name: power-cell-slot-component-slot-name-default - startingItem: PowerCellMedium - - type: RandomMetadata - nameSegments: [names_borg] - type: entity id: ADTBorgChassisKerfusNT @@ -97,6 +79,7 @@ - BorgModuleGeneric - BorgModuleService - BorgModuleJanitor + - BorgModuleMedical hasMindState: kerfusNT_e noMindState: kerfus_e_r - type: BorgTransponder @@ -129,7 +112,7 @@ - Service - Supply - type: AccessReader - access: [["Command"], ["Research"]] + access: [["Command"], ["Research"], ["Service"], ["Medical"]] - type: Inventory templateId: borgTall - type: InteractionPopup @@ -137,5 +120,20 @@ interactFailureString: petting-failure-kerfus interactSuccessSound: path: /Audio/ADT/Ambience/Objects/minecraft_cat.ogg - - type: RandomMetadata - nameSegments: [names_borg] + - type: Storage + grid: + - 0,0,6,3 + maxItemSize: Huge + storageOpenSound: /Audio/Machines/id_insert.ogg + storageCloseSound: /Audio/Machines/id_insert.ogg + clickInsert: false + - type: UserInterface + interfaces: + enum.SiliconLawsUiKey.Key: + type: SiliconLawBoundUserInterface + enum.BorgUiKey.Key: + type: BorgBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Player/silicon.yml new file mode 100644 index 00000000000..e79dfe1d25f --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Player/silicon.yml @@ -0,0 +1,37 @@ +- type: entity + id: ADTPlayerBorgKerfusNT + parent: ADTBorgChassisKerfusNT + suffix: Battery, Tools + components: + - type: ContainerFill + containers: + borg_brain: + - PositronicBrain + borg_module: + - BorgModuleTool + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellMedium + - type: RandomMetadata + nameSegments: [names_borg] + +- type: entity + id: ADTPlayerSecBorgGeneric + parent: ADTBorgChassisSec + suffix: Battery, Tools + components: + - type: ContainerFill + containers: + borg_brain: + - PositronicBrain + borg_module: + - ADTBorgModuleDetention + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellMedium + - type: RandomMetadata + nameSegments: [names_borg] diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml index 1fa0c4c7cd3..1ef0331d210 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -49,3 +49,16 @@ items: - ADTInfCablecuffs - ADTWeaponDisablerBorg + +- type: entity + id: ADTBorgModuleRPD + parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ] + name: RPD cyborg module + components: + - type: Sprite + layers: + - state: engineering + - state: icon-rcd + - type: ItemBorgModule + items: + - ADTRPDRecharging diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml index 8a2b5b66f17..373ee5faffa 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml @@ -2,7 +2,7 @@ id: ADTRPD parent: BaseItem name: RPD - description: Rapid Pipe Dispenser is used to quickly build structures for atmosphere operation and disposal. + description: The rapid pipe dispenser is used to quickly build structures for atmosphere operation and disposal. components: - type: RPD availablePrototypes: @@ -100,3 +100,16 @@ components: - type: LimitedCharges charges: 0 + +- type: entity + id: ADTRPDRecharging + parent: ADTRPD + name: experimental RPD + description: A bluespace-enhanced rapid pipe dispenser that passively generates its own compressed matter. + suffix: Recharging + components: + - type: LimitedCharges + maxCharges: 20 + charges: 20 + - type: AutoRecharge + rechargeDuration: 10 diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/robotics.yml b/Resources/Prototypes/ADT/Recipes/Lathes/robotics.yml index a3013a20c95..3aa7b5f42da 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/robotics.yml @@ -102,3 +102,14 @@ materials: Steel: 1750 Glass: 1500 + +- type: latheRecipe + id: ADTBorgModuleRPD + result: ADTBorgModuleRPD + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 250 + Gold: 50 diff --git a/Resources/Prototypes/Corvax/tts-voices.yml b/Resources/Prototypes/Corvax/tts-voices.yml index 4dd28f9795d..581e370f2a8 100644 --- a/Resources/Prototypes/Corvax/tts-voices.yml +++ b/Resources/Prototypes/Corvax/tts-voices.yml @@ -1,789 +1,1049 @@ - type: ttsVoice - name: tts-voice-name-papich + name: Папич + description: Голос популярного стримера Папича sex: Male speaker: papich id: papich - type: ttsVoice - name: tts-voice-name-bebey + name: Бэбэй + description: Голос популярного стримера Бэбэя sex: Male speaker: bebey id: bebey - type: ttsVoice - name: tts-voice-name-puchkow + name: Дмитрий Пучков + description: "" sex: Male speaker: puchkow id: puchkow - type: ttsVoice - name: tts-voice-name-moriarti + name: Мориарти + description: "" sex: Male speaker: moriarti id: moriarti - type: ttsVoice - name: tts-voice-name-charlotte + name: Шарлотта + description: Голос виртуального ютубера Charlotte Ch sex: Female speaker: charlotte id: charlotte - type: ttsVoice - name: tts-voice-name-planya + name: Планя + description: Голос виртуального ютубера Planya Ch sex: Female speaker: planya id: planya - type: ttsVoice - name: tts-voice-name-mana + name: Мана + description: Голос виртуального ютубера Mana Renewal sex: Female speaker: mana id: mana - type: ttsVoice - name: tts-voice-name-amina + name: Амина + description: Голос виртуального ютубера St. Amina Renewal sex: Female speaker: amina id: amina - type: ttsVoice - name: tts-voice-name-biden + name: Джо Байден + description: Голос американского президента Джо Байдена sex: Male speaker: biden id: biden - type: ttsVoice - name: tts-voice-name-obama + name: Барак Обама + description: Голос американского президента Барака Обамы sex: Male speaker: obama id: obama - type: ttsVoice - name: tts-voice-name-trump + name: Дональд Трамп + description: Голос американского президента Дональда Трампа sex: Male speaker: trump id: trump - type: ttsVoice - name: tts-voice-name-dbkn + name: Добакин + description: Голос начинающего диктора Добакина sex: Male speaker: dbkn id: dbkn - type: ttsVoice - name: tts-voice-name-xrenoid + name: Хреноид + description: Голос начинающего диктора Хреноида sex: Male speaker: xrenoid id: xrenoid - type: ttsVoice - name: tts-voice-name-valtos + name: Валтос + description: Голос начинающего диктора Валтоса sex: Female speaker: valtos id: valtos - type: ttsVoice - name: tts-voice-name-briman + name: Уоллес Брин + description: Голос персонажа Уоллес Брин из игры Half-Life 2 sex: Male speaker: briman id: briman - type: ttsVoice - name: tts-voice-name-father_grigori + name: Отец Григорий + description: Голос персонажа Отец Григорий из игры Half-Life 2 sex: Male speaker: father_grigori id: father_grigori - type: ttsVoice - name: tts-voice-name-kleiner + name: Доктор Кляйнер + description: Голос персонажа Доктор Кляйнер из игры Half-Life 2 sex: Male speaker: kleiner id: kleiner - type: ttsVoice - name: tts-voice-name-mossman + name: Джудит Моссман + description: Голос персонажа Джудит Моссман из игры Half-Life 2 sex: Female speaker: mossman id: mossman - type: ttsVoice - name: tts-voice-name-vance + name: Илай Вэнс + description: Голос персонажа Илай Вэнс из игры Half-Life 2 sex: Male speaker: vance id: vance - type: ttsVoice - name: tts-voice-name-alyx + name: Аликс Вэнс + description: Голос персонажа Аликс Вэнс из игры Half-Life 2 sex: Female speaker: alyx id: alyx - type: ttsVoice - name: tts-voice-name-gman + name: G-Man + description: Голос персонажа G-Man из игры Half-Life 2 sex: Male speaker: gman id: gman - roundStart: false - type: ttsVoice - name: tts-voice-name-barni + name: Барни Калхун + description: Голос персонажа Барни Калхун из игры Half-Life 2 sex: Male speaker: barni id: barni - type: ttsVoice - name: tts-voice-name-neco + name: Неко-Арк + description: Голос персонажа Неко-Арк из Fate sex: Female speaker: neco id: neco - type: ttsVoice - name: tts-voice-name-neco_arc_2 + name: Неко-Арк 2 + description: Голос персонажа Неко-Арк из Fate sex: Female speaker: neco_arc_2 id: neco_arc_2 - type: ttsVoice - name: tts-voice-name-angry_neco_arc + name: Злая Неко-Арк + description: Злой голос персонажа Неко-Арк из Fate sex: Female speaker: angry_neco_arc id: angry_neco_arc - type: ttsVoice - name: tts-voice-name-squidward + name: Сквидвард + description: Голос персонажа Сквидвард из мультфильма Губка Боб sex: Male speaker: squidward id: squidward - type: ttsVoice - name: tts-voice-name-sentrybot + name: SentryBot + description: Голос персонажа SentryBot из Fallout 3 sex: Male speaker: sentrybot id: sentrybot - roundStart: false - type: ttsVoice - name: tts-voice-name-moira_brown + name: Мойра Браун + description: Голос персонажа Мойра Браун из Fallout 3 sex: Female speaker: moira_brown id: moira_brown - type: ttsVoice - name: tts-voice-name-robert_maccready + name: Робер МакКриди + description: Голос персонажа Робер МакКриди из Fallout 3 sex: Male speaker: robert_maccready id: robert_maccready - type: ttsVoice - name: tts-voice-name-threedog + name: Тридогнайт + description: Голос персонажа Тридогнайт из Fallout 3 sex: Male speaker: threedog id: threedog - type: ttsVoice - name: tts-voice-name-threedog_radio + name: Тридогнайт Радио + description: Голос персонажа Тридогнайт версия по радио из Fallout 3 sex: Male speaker: threedog_radio id: threedog_radio - type: ttsVoice - name: tts-voice-name-polina + name: Мистер Помощник + description: Голос персонажа Мистер Помощник из Fallout 3 + sex: Male + speaker: mister_handy_fl3 + id: mister_handy_fl3 + +- type: ttsVoice + name: Мистер Храбрец + description: Голос персонажа Мистер Храбрец из Fallout 3 + sex: Male + speaker: mister_gutsy_fl3 + id: mister_gutsy_fl3 + +- type: ttsVoice + name: Джерико + description: Голос персонажа Джерико из Fallout 3 + sex: Male + speaker: jericho_fl3 + id: jericho_fl3 + +- type: ttsVoice + name: Старейшина Лайонс + description: Голос персонажа Старейшина Лайонс из Fallout 3 + sex: Male + speaker: elder_lyons_fl3 + id: elder_lyons_fl3 + +- type: ttsVoice + name: Сара Лайонс + description: Голос персонажа Сара Лайонс из Fallout 3 + sex: Female + speaker: sarah_lyons_fl3 + id: sarah_lyons_fl3 + +- type: ttsVoice + name: Колин Мориарти + description: Голос персонажа Колин Мориарти из Fallout 3 + sex: Male + speaker: colin_moriarty_fl3 + id: colin_moriarty_fl3 + +- type: ttsVoice + name: Полина Морозова + description: Голос персонажа Полина Морозова из игры Tiny Bunny sex: Female speaker: polina id: polina - type: ttsVoice - name: tts-voice-name-romka + name: Рома Пятифанов + description: Голос персонажа Рома Пятифанов из игры Tiny Bunny sex: Male speaker: romka id: romka - type: ttsVoice - name: tts-voice-name-boris_petrov_father_tb + name: Борис Петров + description: Голос персонажа Борис Петров из игры Tiny Bunny sex: Male speaker: boris_petrov_father_tb id: boris_petrov_father_tb - type: ttsVoice - name: tts-voice-name-karina_petrova_tb + name: Карина Петрова + description: Голос персонажа Карина Петрова из игры Tiny Bunny sex: Female speaker: karina_petrova_tb id: karina_petrova_tb - type: ttsVoice - name: tts-voice-name-kate_smirnova_tb + name: Катя Смирнова + description: Голос персонажа Катя Смирнова из игры Tiny Bunny sex: Female speaker: kate_smirnova_tb id: kate_smirnova_tb - type: ttsVoice - name: tts-voice-name-semen_baburin_tb + name: Семён Бабурин + description: Голос персонажа Семён Бабурин из игры Tiny Bunny sex: Male speaker: semen_baburin_tb id: semen_baburin_tb - type: ttsVoice - name: tts-voice-name-tihonov_tb + name: Лейтенант Тихонов + description: Голос персонажа Лейтенант Тихонов из игры Tiny Bunny sex: Male speaker: tihonov_tb id: tihonov_tb - type: ttsVoice - name: tts-voice-name-cicero + name: Цицерон + description: Голос персонажа Цицерон из игры TES 5 Skyrim sex: Male speaker: cicero id: cicero - type: ttsVoice - name: tts-voice-name-sheogorath + name: Шеогорат + description: Голос персонажа Шеогорат из игры TES 5 Skyrim sex: Male speaker: sheogorath id: sheogorath - type: ttsVoice - name: tts-voice-name-kodlakwhitemane + name: Кодлак Белая Грива + description: Голос персонажа Кодлак Белая Грива из игры TES 5 Skyrim sex: Male speaker: kodlakwhitemane id: kodlakwhitemane - type: ttsVoice - name: tts-voice-name-khajiit + name: Каджит + description: Голос персонажа Каджит из игры TES 5 Skyrim sex: Male speaker: khajiit id: khajiit - type: ttsVoice - name: tts-voice-name-elenwen + name: Эленвен + description: Голос персонажа Эленвен из игры TES 5 Skyrim sex: Female speaker: elenwen id: elenwen - type: ttsVoice - name: tts-voice-name-emperor + name: Тит Мид II + description: Голос персонажа Тит Мид II из игры TES 5 Skyrim sex: Male speaker: emperor id: emperor - type: ttsVoice - name: tts-voice-name-guard + name: Стражник + description: Голос Стражников из игры TES 5 Skyrim sex: Male speaker: guard id: guard - type: ttsVoice - name: tts-voice-name-hagraven + name: Ворожея + description: Голос Ворожей из игры TES 5 Skyrim sex: Male speaker: hagraven id: hagraven - type: ttsVoice - name: tts-voice-name-hermaeus_mora + name: Хермеус Мора + description: Голос персонажа Хермеус Мора из игры TES 5 Skyrim sex: Male speaker: hermaeus_mora id: hermaeus_mora - type: ttsVoice - name: tts-voice-name-nord + name: Норд + description: Голос Нордов из игры TES 5 Skyrim sex: Male speaker: nord id: nord - type: ttsVoice - name: tts-voice-name-ulfric + name: Ульфрик Буревестник + description: Голос персонажа Ульфрик Буревестник из игры TES 5 Skyrim sex: Male speaker: ulfric id: ulfric - type: ttsVoice - name: tts-voice-name-astrid + name: Астрид + description: Голос персонажа Астрид из игры TES 5 Skyrim sex: Female speaker: astrid id: astrid - type: ttsVoice - name: tts-voice-name-maven + name: Мавен Чёрный Вереск + description: Голос персонажа Мавен Чёрный Вереск из игры TES 5 Skyrim sex: Female speaker: maven id: maven - type: ttsVoice - name: tts-voice-name-nazir + name: Назир + description: Голос персонажа Назир из игры TES 5 Skyrim sex: Male speaker: nazir id: nazir - type: ttsVoice - name: tts-voice-name-female_commander + name: Женщина командир + description: Голос женских персонажей командиров из игры TES 5 Skyrim sex: Female speaker: female_commander id: female_commander - type: ttsVoice - name: tts-voice-name-lord_harkon + name: Лорд Харкон + description: Голос персонажа Лорд Харкон из игры TES 5 Skyrim sex: Male speaker: lord_harkon id: lord_harkon - type: ttsVoice - name: tts-voice-name-serana + name: Серана + description: Голос персонажа Серана из игры TES 5 Skyrim sex: Female speaker: serana id: serana - type: ttsVoice - name: tts-voice-name-glados + name: GLaDOS + description: Голос персонажа GLaDOS из игры Portal 2 sex: Female speaker: glados id: glados - roundStart: false - type: ttsVoice - name: tts-voice-name-adventure_core + name: Модуль Приключений + description: Голос персонажа Модуль Приключений из игры Portal 2 sex: Male speaker: adventure_core id: adventure_core - roundStart: false - type: ttsVoice - name: tts-voice-name-fact_core + name: Модуль Фактов + description: Голос персонажа Модуль Фактов из игры Portal 2 sex: Male speaker: fact_core id: fact_core - roundStart: false - type: ttsVoice - name: tts-voice-name-space_core + name: Модуль Космоса + description: Голос персонажа Модуль Космоса из игры Portal 2 sex: Male speaker: space_core id: space_core - roundStart: false - type: ttsVoice - name: tts-voice-name-turret_floor + name: Турель + description: Голос персонажа Турель из игры Portal 2 sex: Female speaker: turret_floor id: turret_floor - roundStart: false - type: ttsVoice - name: tts-voice-name-geralt + name: Геральт из Ривии + description: Голос персонажа Геральт из Ривии из игры The Witcher 3 sex: Male speaker: geralt id: geralt - type: ttsVoice - name: tts-voice-name-cirilla + name: Цирилла + description: Голос персонажа Цирилла из игры The Witcher 3 sex: Female speaker: cirilla id: cirilla - type: ttsVoice - name: tts-voice-name-cerys + name: Керис ан Крайт + description: Голос персонажа Керис ан Крайт из игры The Witcher 3 sex: Female speaker: cerys id: cerys - type: ttsVoice - name: tts-voice-name-lambert + name: Ламберт + description: Голос персонажа Ламберт из игры The Witcher 3 sex: Male speaker: lambert id: lambert - type: ttsVoice - name: tts-voice-name-triss + name: Трисс + description: Голос персонажа Трисс из игры The Witcher 3 sex: Female speaker: triss id: triss - type: ttsVoice - name: tts-voice-name-azir + name: Ковир Ноблеман + description: Голос персонажа Ковир Ноблеман из игры The Witcher 3 + sex: Male + speaker: kovir_nobleman + id: kovir_nobleman + +- type: ttsVoice + name: Золтан Хивай + description: Голос персонажа Золтан Хивай из игры The Witcher 3 + sex: Male + speaker: zoltan_chivay + id: zoltan_chivay + +- type: ttsVoice + name: Азир + description: Голос персонажа Азир из игры League of Legends sex: Male speaker: azir id: azir - type: ttsVoice - name: tts-voice-name-ekko + name: Экко + description: Голос персонажа Экко из игры League of Legends sex: Male speaker: ekko id: ekko - type: ttsVoice - name: tts-voice-name-twitch + name: Твич + description: Голос персонажа Твич из игры League of Legends sex: Male speaker: twitch id: twitch - type: ttsVoice - name: tts-voice-name-ziggs + name: Зиггс + description: Голос персонажа Зиггс из игры League of Legends sex: Male speaker: ziggs id: ziggs - type: ttsVoice - name: tts-voice-name-caitlyn + name: Кэйтлин + description: Голос персонажа Кэйтлин из игры League of Legends sex: Female speaker: caitlyn id: caitlyn - type: ttsVoice - name: tts-voice-name-arthas + name: Артас Менетил + description: Голос персонажа Артас Менетил из игры Warcraft 3 sex: Male speaker: arthas id: arthas - type: ttsVoice - name: tts-voice-name-illidan + name: Иллидан Ярость Бури + description: Голос персонажа Иллидан Ярость Бури из игры Warcraft 3 sex: Male speaker: illidan id: illidan - type: ttsVoice - name: tts-voice-name-rexxar + name: Рексар + description: Голос персонажа Рексар из игры Warcraft 3 sex: Male speaker: rexxar id: rexxar - type: ttsVoice - name: tts-voice-name-voljin + name: Вол'джин + description: Голос персонажа Вол'джин из игры Warcraft 3 sex: Male speaker: voljin id: voljin - type: ttsVoice - name: tts-voice-name-bandit + name: Бандит + description: Голос персонажа Бандита из игры S.T.A.L.K.E.R. sex: Male speaker: bandit id: bandit - type: ttsVoice - name: tts-voice-name-forester + name: Лесник + description: Голос персонажа Лесник из игры S.T.A.L.K.E.R. sex: Male speaker: forester id: forester - type: ttsVoice - name: tts-voice-name-sidorovich + name: Сидорович + description: Голос персонажа Сидорович из игры S.T.A.L.K.E.R. sex: Male speaker: sidorovich id: sidorovich - type: ttsVoice - name: tts-voice-name-strelok + name: Стрелок + description: Голос персонажа Стрелок из игры S.T.A.L.K.E.R. sex: Male speaker: strelok id: strelok - type: ttsVoice - name: tts-voice-name-tracer + name: Трэйсер + description: Голос персонажа Трэйсер из игры Overwatch sex: Female speaker: tracer id: tracer - type: ttsVoice - name: tts-voice-name-soldier + name: Солдат + description: Голос персонажа Солдат из Team Fortress 2 из английской озвучки sex: Male speaker: soldier id: soldier - type: ttsVoice - name: tts-voice-name-engineer + name: Инженер + description: Голос персонажа Инженер из игры Team Fortress 2 sex: Male speaker: engineer id: engineer - type: ttsVoice - name: tts-voice-name-heavy + name: Хэви + description: Голос персонажа Хэви из игры Team Fortress 2 sex: Male speaker: heavy id: heavy - type: ttsVoice - name: tts-voice-name-medic + name: Медик + description: Голос персонажа Медик из игры Team Fortress 2 sex: Male speaker: medic id: medic - type: ttsVoice - name: tts-voice-name-demoman + name: Подрывник + description: Голос персонажа Подрывник из игры Team Fortress 2 sex: Male speaker: demoman id: demoman - type: ttsVoice - name: tts-voice-name-sniper + name: Снайпер + description: Голос персонажа Снайпер из игры Team Fortress 2 sex: Male speaker: sniper id: sniper - type: ttsVoice - name: tts-voice-name-spy + name: Шпион + description: Голос персонажа Шпион из игры Team Fortress 2 sex: Male speaker: spy id: spy - type: ttsVoice - name: tts-voice-name-punisher + name: Каратель + description: Голос персонажа Каратель из игры The Punisher sex: Male speaker: punisher id: punisher - type: ttsVoice - name: tts-voice-name-johnny + name: Джонни Сильверхенд + description: Голос персонажа Джонни Сильверхенд из игры Cyberpunk 2077 sex: Male speaker: johnny id: johnny - type: ttsVoice - name: tts-voice-name-panam + name: Панам Палмер + description: Голос персонажа Панам Палмер из игры Cyberpunk 2077 sex: Female speaker: panam id: panam - type: ttsVoice - name: tts-voice-name-v_female + name: Ви + description: Голос персонажа Ви из игры Cyberpunk 2077 sex: Female speaker: v_female id: v_female - type: ttsVoice - name: tts-voice-name-judy + name: Джуди Альварес + description: Голос персонажа Джуди Альварес из игры Cyberpunk 2077 sex: Female speaker: judy id: judy - type: ttsVoice - name: tts-voice-name-mitch + name: Митч Андерсон + description: Голос персонажа Митч Андерсон из игры Cyberpunk 2077 sex: Male speaker: mitch id: mitch - type: ttsVoice - name: tts-voice-name-skippy + name: Скиппи + description: Голос персонажа Скиппи из игры Cyberpunk 2077 sex: Male speaker: skippy id: skippy - roundStart: false - type: ttsVoice - name: tts-voice-name-jackie + name: Джеки Уэллс + description: Голос персонажа Джеки Уэллс из игры Cyberpunk 2077 sex: Male speaker: jackie id: jackie - type: ttsVoice - name: tts-voice-name-dornan + name: Майко Маэда + description: Голос персонажа Майко Маэда из игры Cyberpunk 2077 + sex: Female + speaker: maiko + id: maiko + +- type: ttsVoice + name: Брендан + description: Голос персонажа Брендан из игры Cyberpunk 2077 + sex: Male + speaker: brendan + id: brendan + +- type: ttsVoice + name: Нэнси Хартли + description: Голос персонажа Нэнси Хартли из игры Cyberpunk 2077 + sex: Female + speaker: nancy_hartley + id: nancy_hartley + +- type: ttsVoice + name: Освальд Форрест + description: Голос персонажа Освальд Форрест из игры Cyberpunk 2077 + sex: Male + speaker: oswald_forrest + id: oswald_forrest + +- type: ttsVoice + name: Стив Санчес + description: Голос персонажа Стив Санчес из игры Cyberpunk 2077 + sex: Male + speaker: steve + id: steve + +- type: ttsVoice + name: Сержант Дорнан + description: Голос персонажа Сержант Дорнан из игры Fallout 2 sex: Male speaker: dornan id: dornan - roundStart: false - type: ttsVoice - name: tts-voice-name-officer_enclave + name: Офицер Анклава + description: Голос персонажа Офицер Анклава из игры Fallout 2 sex: Male speaker: officer_enclave id: officer_enclave - type: ttsVoice - name: tts-voice-name-richardson + name: Дик Ричардсон + description: Голос персонажа Ричард «Дик» Ричардсон из игры Fallout 2 sex: Male speaker: richardson id: richardson - type: ttsVoice - name: tts-voice-name-butch + name: Бутч Харрис + description: Голос персонажа Бутч Харрис из игры Fallout 2 sex: Male speaker: butch id: butch - type: ttsVoice - name: tts-voice-name-marcus + name: Маркус + description: Голос персонажа Маркус из игры Fallout 2 sex: Male speaker: marcus id: marcus - type: ttsVoice - name: tts-voice-name-sulik + name: Сулик + description: Голос персонажа Сулик из игры Fallout 2 sex: Male speaker: sulik id: sulik - type: ttsVoice - name: tts-voice-name-myron + name: Майрон + description: Голос персонажа Майрон из игры Fallout 2 sex: Male speaker: myron id: myron - type: ttsVoice - name: tts-voice-name-good_thalya + name: Добрая Талия + description: Голос персонажа Добрая Талия из игры Dungeons 3 sex: Female speaker: good_thalya id: good_thalya - type: ttsVoice - name: tts-voice-name-evil_thalya + name: Злая Талия + description: Голос персонажа Злая Талия из игры Dungeons 3 sex: Female speaker: evil_thalya id: evil_thalya - type: ttsVoice - name: tts-voice-name-narrator_d3 + name: Рассказчик + description: Голос персонажа Рассказчик из игры Dungeons 3 sex: Male speaker: narrator_d3 id: narrator_d3 - type: ttsVoice - name: tts-voice-name-dude + name: Чувак + description: Голос персонажа Чувак из игры Postal 2 sex: Male speaker: dude id: dude - type: ttsVoice - name: tts-voice-name-anduin + name: Андуин Ринн + description: Голос персонажа Андуин Ринн из игры Hearthstone sex: Male speaker: anduin id: anduin - type: ttsVoice - name: tts-voice-name-brukan + name: Бру'кан + description: Голос персонажа Бру'кан из игры Hearthstone sex: Male speaker: brukan id: brukan - type: ttsVoice - name: tts-voice-name-garrosh + name: Гаррош Адский Крик + description: Голос персонажа Гаррош Адский Крик из игры Hearthstone sex: Male speaker: garrosh id: garrosh - type: ttsVoice - name: tts-voice-name-jaina + name: Джайна Праудмур + description: Голос персонажа Джайна Праудмур из игры Hearthstone sex: Female speaker: jaina id: jaina - type: ttsVoice - name: tts-voice-name-uther_hs + name: Утер Светоносный + description: Голос персонажа Утер Светоносный из игры Hearthstone sex: Male speaker: uther_hs id: uther_hs - type: ttsVoice - name: tts-voice-name-adjutant + name: Адъютант + description: Голос персонажа Адъютант из игры StarCraft 2 sex: Female speaker: adjutant id: adjutant - roundStart: false - type: ttsVoice - name: tts-voice-name-hanson + name: Ариэль Хэнсон + description: Голос персонажа Ариэль Хэнсон из игры StarCraft 2 sex: Female speaker: hanson id: hanson - type: ttsVoice - name: tts-voice-name-bralik + name: Бралик + description: Голос персонажа Бралик из игры StarCraft 2 sex: Male speaker: bralik id: bralik - type: ttsVoice - name: tts-voice-name-horner + name: Мэтт Хорнер + description: Голос персонажа Мэтт Хорнер из игры StarCraft 2 sex: Male speaker: horner id: horner - type: ttsVoice - name: tts-voice-name-tosh + name: Габриэль Тош + description: Голос персонажа Габриэль Тош из игры StarCraft 2 sex: Male speaker: tosh id: tosh - type: ttsVoice - name: tts-voice-name-tychus + name: Тайкус Финдли + description: Голос персонажа Тайкус Финдли из игры StarCraft 2 sex: Male speaker: tychus id: tychus - type: ttsVoice - name: tts-voice-name-amitkakkar + name: Амит Таккар + description: Голос персонажа Амит Таккар из игры Hogwarts Legacy sex: Male speaker: amitkakkar id: amitkakkar - type: ttsVoice - name: tts-voice-name-eleazarfig + name: Элеазар Фиг + description: Голос персонажа Элеазар Фиг из игры Hogwarts Legacy sex: Male speaker: eleazarfig id: eleazarfig - type: ttsVoice - name: tts-voice-name-ernielark + name: Эрни Ларк + description: Голос персонажа Эрни Ларк из игры Hogwarts Legacy sex: Male speaker: ernielark id: ernielark - type: ttsVoice - name: tts-voice-name-ignatiaflootravel + name: Игнатия Уайлдсмит + description: Голос персонажа Игнатия Уайлдсмит из игры Hogwarts Legacy sex: Female speaker: ignatiaflootravel id: ignatiaflootravel - type: ttsVoice - name: tts-voice-name-lodgok + name: Лодгок + description: Голос персонажа Лодгок из игры Hogwarts Legacy sex: Male speaker: lodgok id: lodgok - type: ttsVoice - name: tts-voice-name-phineasblack + name: Финеас Найджелус Блэк + description: Голос персонажа Финеас Найджелус Блэк из игры Hogwarts Legacy sex: Male speaker: phineasblack id: phineasblack - type: ttsVoice - name: tts-voice-name-ranrak + name: Ранрок + description: Голос персонажа Ранрок из игры Hogwarts Legacy sex: Male speaker: ranrak id: ranrak - type: ttsVoice - name: tts-voice-name-victorrookwood + name: Виктор Руквуд + description: Голос персонажа Виктор Руквуд из игры Hogwarts Legacy sex: Male speaker: victorrookwood id: victorrookwood - type: ttsVoice - name: tts-voice-name-zenobianoke + name: Зенобия Ноук + description: Голос персонажа Зенобия Ноук из игры Hogwarts Legacy sex: Female speaker: zenobianoke id: zenobianoke - type: ttsVoice - name: tts-voice-name-gladwinmoon + name: Глэдвин Мун + description: Голос персонажа Глэдвин Мун из игры Hogwarts Legacy sex: Male speaker: gladwinmoon id: gladwinmoon - type: ttsVoice - name: tts-voice-name-matildaweasley + name: Матильда Уизли + description: Голос персонажа Матильда Уизли из игры Hogwarts Legacy sex: Female speaker: matildaweasley id: matildaweasley - type: ttsVoice - name: tts-voice-name-natsaionai + name: Натсай Онай + description: Голос персонажа Натсай Онай из игры Hogwarts Legacy sex: Female speaker: natsaionai id: natsaionai - type: ttsVoice - name: tts-voice-name-ominisgaunt + name: Оминис Мракс + description: Голос персонажа Оминис Мракс из игры Hogwarts Legacy sex: Male speaker: ominisgaunt id: ominisgaunt - type: ttsVoice - name: tts-voice-name-poppysweeting + name: Поппи Добринг + description: Голос персонажа Поппи Добринг из игры Hogwarts Legacy sex: Female speaker: poppysweeting id: poppysweeting + +- type: ttsVoice + name: Гоблин В + description: Голос персонажа Гоблин В из игры Hogwarts Legacy + sex: Male + speaker: generic_goblin_c + id: generic_goblin_c + +- type: ttsVoice + name: Дина Гекат + description: Голос персонажа Дина Гекат из игры Hogwarts Legacy + sex: Female + speaker: dinah_hecat + id: dinah_hecat + +- type: ttsVoice + name: Эзоп Шарп + description: Голос персонажа Эзоп Шарп из игры Hogwarts Legacy + sex: Male + speaker: aesop_sharp + id: aesop_sharp + +- type: ttsVoice + name: Абрахам Ронен + description: Голос персонажа Абрахам Ронен из игры Hogwarts Legacy + sex: Male + speaker: abraham_ronen + id: abraham_ronen + +- type: ttsVoice + name: Саманта Дейл + description: Голос персонажа Саманта Дейл из игры Hogwarts Legacy + sex: Female + speaker: samantha_dale + id: samantha_dale + +- type: ttsVoice + name: Сирона Райан + description: Голос персонажа Сирона Райан из игры Hogwarts Legacy + sex: Female + speaker: sirona_ryan + id: sirona_ryan + +- type: ttsVoice + name: Софрония Франклин + description: Голос персонажа Софрония Франклин из игры Hogwarts Legacy + sex: Female + speaker: sophronia_franklin + id: sophronia_franklin diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml index 3fff3a1db1b..e545d70aca3 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml @@ -258,8 +258,8 @@ #ADT secborg end # ADT-Kerfus-Start kerfusNT: - - ADTTorsoBorgKerfusNT - - ADTHeadBorgKerfusNT + - ADTBorgKerfusNTTorso + - ADTBorgKerfusNTHead # ADT-Kerfus-End - type: Construction graph: Cyborg diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c02c420b69b..4005d7a216f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -693,6 +693,7 @@ - BorgModuleAdvancedTool - BorgModuleGPS - BorgModuleRCD + - ADTBorgModuleRPD # ADT-RPD - BorgModuleArtifact - BorgModuleAnomaly - BorgModuleGardening diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index cdac90a83c4..d2df86fd887 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -57,7 +57,7 @@ components: - type: GameRule - type: BasicStationEventScheduler - minimumTimeUntilFirstEvent: 300 # 5 min + minimumTimeUntilFirstEvent: 1200 # 20 min ADT-Tweak minMaxEventTiming: min: 750 # 12.5 min max: 930 # 17.5 min @@ -70,7 +70,7 @@ components: - type: GameRule - type: BasicStationEventScheduler - minimumTimeUntilFirstEvent: 300 # 5 min + minimumTimeUntilFirstEvent: 1200 # 20 min ADT-Tweak minMaxEventTiming: min: 750 # 12.5 min max: 930 # 17.5 min @@ -108,7 +108,7 @@ - type: StationEvent weight: 44 earliestStart: 2 - minimumPlayers: 0 + minimumPlayers: 20 # ADT-Tweak - type: MeteorSwarm announcement: null announcementSound: null @@ -128,7 +128,7 @@ components: - type: StationEvent weight: 22 - minimumPlayers: 0 + minimumPlayers: 30 # ADT-Tweak - type: MeteorSwarm announcement: station-event-space-dust-start-announcement announcementSound: /Audio/Announcements/attention.ogg @@ -148,7 +148,7 @@ components: - type: StationEvent weight: 18 - minimumPlayers: 15 + minimumPlayers: 20 # ADT-Tweak - type: MeteorSwarm meteors: MeteorSmall: 7 diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 8e11f661a84..425add6fdf4 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -159,13 +159,14 @@ state: icon discipline: Industrial tier: 2 - cost: 10000 + cost: 10500 # ADT-RPD recipeUnlocks: - WelderExperimental - PowerDrill - JawsOfLife - BorgModuleAdvancedTool - BorgModuleRCD + - ADTBorgModuleRPD # ADT-RPD - type: technology id: MassExcavation diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index dc6f3a9b4bc..ca575fd1f8d 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -8,15 +8,11 @@ - !type:RoleTimeRequirement role: JobBorg time: 18000 # 5 hrs - # ADT secborg start - - !type:RoleTimeRequirement - role: ADTJobSecBorg - time: 18000 # 5 hrs - # ADT secborg end canBeAntag: false icon: JobIconStationAi supervisors: job-supervisors-rd jobEntity: StationAiBrain + containerInsert: true # ADT station AI spawn fix - type: job id: Borg diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 8696289a6f8..8cf1efcc3c8 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -78,8 +78,7 @@ description: extended-description rules: - BasicStationEventScheduler - - MeteorSwarmScheduler - - SpaceTrafficControlEventScheduler + - SpaceTrafficControlFriendlyEventScheduler - BasicRoundstartVariation - type: gamePreset @@ -91,7 +90,7 @@ showInVote: true #ADT_Tweak description: greenshift-description rules: - - SpaceTrafficControlFriendlyEventScheduler + - SpaceTrafficControlFriendlyEventScheduler - BasicRoundstartVariation - type: gamePreset @@ -126,7 +125,7 @@ showInVote: false #Admin Use description: secret-description rules: - - SpaceTrafficControlFriendlyEventScheduler + - SpaceTrafficControlFriendlyEventScheduler - BasicRoundstartVariation - type: gamePreset diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET.png index ee9a5d6bf46..5e3a26e3236 100644 Binary files a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET.png and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/off-equipped-HELMET-vulp.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/off-equipped-HELMET-vulp.png index d62306fba71..b7e3167239d 100644 Binary files a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/off-equipped-HELMET-vulp.png and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/off-equipped-HELMET-vulp.png differ