Upstream and fixes (#214)

* Enemies and Allies Content Port (#956)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This is a batch of changes I made for Floof station being ported over to
the upstream branch


---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added new neutral xenos, events, and reagent slimes

---------

Signed-off-by: fenndragon <[email protected]>
Signed-off-by: SleepyScarecrow <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: SleepyScarecrow <[email protected]>

* Automatic Changelog Update (#956)

* Remove InteractionPopup From IPCs (#961)

# Description
Grrrr, I may have forgotten to remove it as a part of #733.

Signed-off-by: Mnemotechnican <[email protected]>

* переводы

* Переводы

* фиксы

* фикс

* да боже

* фикс

* add ahelp prefixes by backmen

* ООС админам

* фиксы

---------

Signed-off-by: fenndragon <[email protected]>
Signed-off-by: SleepyScarecrow <[email protected]>
Signed-off-by: Mnemotechnican <[email protected]>
Co-authored-by: fenndragon <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: SleepyScarecrow <[email protected]>
Co-authored-by: SimpleStation Changelogs <[email protected]>
Co-authored-by: Mnemotechnican <[email protected]>

Content.Server/Administration/Systems/BwoinkSystem.cs

@@ -395,14 +395,20 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
             var escapedText = FormattedMessage.EscapeText(message.Text);
 
             string bwoinkText;
+            string adminPrefix = "";
+
+            if (_config.GetCVar(CCVars.AhelpAdminPrefix) && senderAdmin is not null && senderAdmin.Title is not null)
+            {
+                adminPrefix = $"[bold]\\[{senderAdmin.Title}\\][/bold] ";
+            }
 
             if (senderAdmin is not null && senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently.
             {
-                bwoinkText = $"[color=purple]{senderSession.Name}[/color]";
+                bwoinkText = $"[color=purple]{adminPrefix}{senderSession.Name}[/color]";
             }
             else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp))
             {
-                bwoinkText = $"[color=red]{senderSession.Name}[/color]";
+                bwoinkText = $"[color=red]{adminPrefix}{senderSession.Name}[/color]";
             }
             else
             {
@@ -425,6 +431,12 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                 RaiseNetworkEvent(msg, channel);
             }
 
+            string adminPrefixWebhook = "";
+            if (_config.GetCVar(CCVars.AhelpAdminPrefixWebhook) && senderAdmin is not null && senderAdmin.Title is not null)
+            {
+                adminPrefixWebhook = $"[bold]\\[{senderAdmin.Title}\\][/bold] ";
+            }
+
             // Notify player
             if (_playerManager.TryGetSessionById(message.UserId, out var session))
             {
@@ -437,11 +449,11 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                         // Doing the same thing as above, but with the override name. Theres probably a better way to do this.
                         if (senderAdmin is not null && senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently.
                         {
-                            overrideMsgText = $"[color=purple]{_overrideClientName}[/color]";
+                            overrideMsgText = $"[color=purple]{adminPrefixWebhook}{_overrideClientName}[/color]";
                         }
                         else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp))
                         {
-                            overrideMsgText = $"[color=red]{_overrideClientName}[/color]";
+                            overrideMsgText = $"[color=red]{adminPrefixWebhook}{_overrideClientName}[/color]";
                         }
                         else
                         {

Content.Server/Chat/Managers/ChatManager.cs

@@ -262,6 +262,18 @@ private void SendOOC(ICommonSession player, string message)
             }
 #endif
 
+            // c4llv07e fix admins OOC names {{
+            var adminData = _adminManager.GetAdminData(player);
+            if (adminData != null)
+            {
+                var title = adminData.Title ?? "Admin";
+                // We don't use admin color here because it will be overrided anyway
+                wrappedMessage = Loc.GetString(
+                    "chat-manager-send-ooc-admin-wrap-message", ("adminTitle", title),
+                    ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
+            }
+            // c4llv07e }}
+
             //TODO: player.Name color, this will need to change the structure of the MsgChatMessage
             ChatMessageToAll(ChatChannel.OOC, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride, author: player.UserId);
             _mommiLink.SendOOCMessage(player.Name, message);

Content.Shared/Access/Components/IdCardConsoleComponent.cs

@@ -92,6 +92,9 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "ChiefJustice",  // DeltaV - Add Chief Justice access
         "Justice",  // DeltaV - Add Justice access
         "Prosecutor", // Delta V - Add Prosecutor access
+        "EVA", // lpp
+        "Gateway", // lpp
+        "LPPExpeditor", // lpp
     };
 
     [Serializable, NetSerializable]

Content.Shared/CCVar/CCVars.cs

@@ -2506,5 +2506,25 @@ public static readonly CVarDef<float>
 
         #endregion
 
+        #region AHelp Prefix
+
+        /// <summary>
+        /// Should the administrator's position be displayed in ahelp.
+        /// If it is is false, only the admin's ckey will be displayed in the ahelp.
+        /// </summary>
+        /// <seealso cref="AdminUseCustomNamesAdminRank"/>
+        /// <seealso cref="AhelpAdminPrefixWebhook"/>
+        public static readonly CVarDef<bool> AhelpAdminPrefix =
+            CVarDef.Create("ahelp.admin_prefix", true, CVar.SERVERONLY);
+        /// <summary>
+        /// Should the administrator's position be displayed in the webhook.
+        /// If it is is false, only the admin's ckey will be displayed in webhook.
+        /// </summary>
+        /// <seealso cref="AdminUseCustomNamesAdminRank"/>
+        /// <seealso cref="AhelpAdminPrefix"/>
+        public static readonly CVarDef<bool> AhelpAdminPrefixWebhook =
+            CVarDef.Create("ahelp.admin_prefix_webhook", true, CVar.SERVERONLY);
+
+        #endregion
     }
 }

Resources/Changelog/Changelog.yml

@@ -6665,3 +6665,10 @@ Entries:
   id: 6388
   time: '2024-09-25T05:09:06.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/959
+- author: fenndragon
+  changes:
+    - type: Add
+      message: Added new neutral xenos, events, and reagent slimes
+  id: 6389
+  time: '2024-09-26T15:06:54.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/956

Resources/Locale/en-US/station-events/events/vent-critters.ftl

@@ -2,7 +2,14 @@
 station-event-slimes-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
 station-event-vent-critters-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
 station-event-spider-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
-
+station-event-reagentslime-vents-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
+station-event-meat-vents-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
+station-event-neutral-xeno-vents-announcement = Confirmed sightings of alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to investigate the threat as soon as possible.
+station-event-tick-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
+station-event-argocyte-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
+station-event-light-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
+station-event-carp-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
+station-event-space-vents-announcement = Confirmed sightings of hostile wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
 # Weak
 station-event-slimes-spawn-weak-announcement = Attention. A moderate influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
 station-event-spider-spawn-weak-announcement = Attention. A moderate influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.

Resources/Locale/ru-RU/_LostParadise/DiamondCrusher.ftl

@@ -1,4 +1,4 @@
 diamond-crusher-verb-start-crushing = Начать обработку
 artifact-crusher-examine-no-autolocks = Блокировщики [color=green]отключены[/color].
 artifact-crusher-examine-autolocks = Блокировщики [color=red]включены[/color].
-artifact-crusher-autolocks-enable = Блокировщики машины захлопнулись!
+artifact-crusher-autolocks-enable = Блокировщики машины захлопнулись!

Resources/Locale/ru-RU/_LostParadise/DiamondThings.ftl

@@ -8,4 +8,4 @@ lppresearch-technology-diamond-processing = Обработка алмазов
 ent-LPPAdvResearchAndDevelopmentPointSourceCircuitBoard = продвинутый источник исследований (машинная плата)
     .desc = Плата для создания продвинутого источника исследований РнД. Имеет этикетку "BL CORP technology".
 ent-LPPAdvResearchAndDevelopmentPointSource = продвинутый источник исследований
-    .desc = Продвинутый источник очков исследований для ускорения производства. Создано корпорацией BL CORP во благо науки. Имеет этикетку "BL CORP technology".
+    .desc = Продвинутый источник очков исследований для ускорения производства. Создано корпорацией BL CORP во благо науки. Имеет этикетку "BL CORP technology".

Resources/Locale/ru-RU/_LostParadise/diamond.ftl

@@ -18,4 +18,4 @@ ent-LPPWallRockChromiteOreDiamond = { ent-WallRockChromite }
     .suffix = не обработанный алмаз
 ent-LPPWallRockAndesiteOreDiamond = { ent-WallRockAndesite }
     .desc = Каменная стена. Что это торчит из неё?
-    .suffix = не обработанный алмаз
+    .suffix = не обработанный алмаз

Resources/Locale/ru-RU/_LostParadise/misc/fibers.ftl

@@ -1 +1 @@
-lppfibers-nitrile-insulative = нитрилово-изолирующие
+lppfibers-nitrile-insulative = нитрилово-изолирующие

Resources/Locale/ru-RU/_LostParadise/prototypes/entities/mobs/player/ipc.ftl

@@ -1,4 +1,3 @@
 ent-MobIpc = Урист МакПозитроник
     .desc = Позитронный мозг в металлическом теле.
-
 ipc-board-name = системный блок КПБ

Resources/Locale/ru-RU/_LostParadise/research.ftl

@@ -12,3 +12,7 @@ lppresearch-technology-advanced-design-hardsuit-eng = Конструирован
 lppresearch-technology-advanced-design-hardsuit-cargo = Конструирование скафандров снабжения
 lppresearch-technology-additional-disciplines = Дополнительные дисциплины
 lppresearch-technology-advanced-research-generation = Продвинутая генерация исследований
+lppresearch-technology-combat-utility = Боевая медицина
+lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов
+lppresearch-technology-basic-tracking = Базовое отслеживание
+lppresearch-technology-advanced-tracking = Продвинутое отслеживание

Resources/Locale/ru-RU/accent/italian.ftl

@@ -1,6 +1,7 @@
 # This should probably use the same prefix system as the mobster accent.
 # For the record, these do not work right now - even when uncommented.
 
+
 # accent-italian-prefix-1 = Ravioli, ravioli, give me the formuoli!
 # accent-italian-prefix-2 = Mamma-mia!
 # accent-italian-prefix-3 = Mamma-mia! That's a spicy meat-ball!

Resources/Locale/ru-RU/accent/pirate.ftl

@@ -1,7 +1,6 @@
 accent-pirate-prefix-1 = Арргх
 accent-pirate-prefix-2 = Гарр
 accent-pirate-prefix-3 = Йарр
-accent-pirate-prefix-4 = Йарргх
 accent-pirate-replaced-1 = my
 accent-pirate-replacement-1 = me
 accent-pirate-replaced-2 = you

Resources/Locale/ru-RU/accessories/human-hair.ftl

@@ -55,7 +55,6 @@ marking-HumanHairCornrows2 = Корнроу 2
 marking-HumanHairCornrowbun = Корнроу (Пучок)
 marking-HumanHairCornrowbraid = Корнроу (Косичка)
 marking-HumanHairCornrowtail = Корнроу (Хвостик)
-marking-HumanHairSpookyLong = Длинная (Зловещая)
 marking-HumanHairCrewcut = Крю-кат
 marking-HumanHairCrewcut2 = Крю-кат 2
 marking-HumanHairCurls = Завитки

Resources/Locale/ru-RU/accessories/vox-facial-hair.ftl

@@ -3,4 +3,3 @@ marking-VoxFacialHairFu = Вокс, Перья Фу
 marking-VoxFacialHairNeck = Вокс, Шейные перья
 marking-VoxFacialHairBeard = Вокс, Перьевая борода
 marking-VoxFacialHairRuffBeard = Ершовая Борода
-marking-VoxFacialHairMane = Вокс, Борода (Грива)

Resources/Locale/ru-RU/accessories/vox-hair.ftl

@@ -1,26 +1,13 @@
 marking-VoxHairShortQuills = Вокс, Короткие перья
-marking-VoxHairBraids = Вокс, Косички
-marking-VoxHairCrestedQuills = Вокс, Гребнистые перья
-marking-VoxHairEmperorQuills = Вокс, Императорские перья
 marking-VoxHairYasuhiro = Вокс, Ясухиро
-marking-VoxHairFlowing = Вокс, Струящаяся
-marking-VoxHairHawk = Вокс, Ястреб
 marking-VoxHairKingly = Вокс, Королевская
 marking-VoxHairCropped = Вокс, Обрезанная
 marking-VoxHairRuffhawk = Вокс, Раффхок
 marking-VoxHairRows = Вокс, Строки
-marking-VoxHairKeelQuills = Вокс, Килевые перья
-marking-VoxHairKeetQuills = Вокс, Перья цесарки
 marking-VoxHairAfro = Вокс, Афро
-marking-VoxHairLongBraid = Вокс, Длинная коса
 marking-VoxHairMohawk = Вокс, Могавк
 marking-VoxHairHorns = Вокс, Рога
 marking-VoxHairNights = Вокс, Ночная
-marking-VoxHairRazorClipped = Вокс, Бритва (Обрезанные)
-marking-VoxHairRazor = Вокс, Бритва
-marking-VoxHairSortBraid = Вокс, Короткая коса
 marking-VoxHairSurf = Вокс, Сёрфер
-marking-VoxHairTielQuills = Вокс, Тилские перья
-marking-VoxHairYasu = Вокс, Ясухиро
 marking-VoxHairMange = Вокс, Лишай
 marking-VoxHairPony = Вокс, Пони

Resources/Locale/ru-RU/actions/actions/actions-commands.ftl

@@ -1,5 +1,6 @@
 ## Actions Commands loc
 
+
 ## Upgradeaction command loc
 
 upgradeaction-command-need-one-argument = upgradeaction needs at least one argument, the action entity uid. The second optional argument is a specified level.

Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl

@@ -1,5 +1,6 @@
 # UI
 
+
 ## Window
 
 air-alarm-ui-access-denied = Недостаточный уровень доступа!
@@ -30,6 +31,7 @@ air-alarm-ui-mode-none = Нет
 
 ## Widgets
 
+
 ### General
 
 air-alarm-ui-widget-enable = Включено

Resources/Locale/ru-RU/atmos/gas-canister-component.ftl

@@ -1,5 +1,6 @@
 ## UI
 
+
 # Bound Interface
 
 gas-canister-bound-user-interface-title = Газовый баллон

Resources/Locale/ru-RU/barsign/barsign-component.ftl

@@ -4,6 +4,7 @@ barsign-ui-set-label = Выбрать вывеску:
 
 # Bar signs prototypes
 
+
 ## The Harmbaton
 
 barsign-prototype-name-harmbaton = Хармбатон

Resources/Locale/ru-RU/chat/managers/chat-manager.ftl

@@ -27,6 +27,7 @@ chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][Bubble
 chat-manager-entity-me-wrap-message = [italic]{ $entityName } { $message }[/italic]
 chat-manager-entity-looc-wrap-message = LOOC: [bold]{ $entityName }:[/bold] { $message }
 chat-manager-send-ooc-wrap-message = OOC: [bold]{ $playerName }:[/bold] { $message }
+chat-manager-send-ooc-admin-wrap-message = OOC: [bold]\[{ $adminTitle }\] { $playerName }:[/bold] { $message }
 chat-manager-send-dead-chat-wrap-message = { $deadChannelName }: [bold][BubbleHeader]{ $playerName }[/BubbleHeader]:[/bold] [BubbleContent]{ $message }[/BubbleContent]
 chat-manager-send-ooc-patron-wrap-message = OOC: [bold][color={ $patronColor }]{ $playerName }[/color]:[/bold] { $message }
 chat-manager-send-admin-dead-chat-wrap-message = { $adminChannelName }: [bold]([BubbleHeader]{ $userName }[/BubbleHeader]):[/bold] [BubbleContent]{ $message }[/BubbleContent]

Resources/Locale/ru-RU/climbing/glass-table-component.ftl

@@ -1,5 +1,6 @@
 ### Tables which take damage when a user is dragged onto them
 
+
 ## Showed to users other than the climber
 
 glass-table-shattered-others = { CAPITALIZE($table) } ломается под весом { $climber }!

Resources/Locale/ru-RU/connection-messages.ftl

@@ -35,7 +35,3 @@ panic-bunker-account-denied = Этот сервер находится в реж
 panic-bunker-account-denied-reason = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже Причина: "{ $reason }"
 panic-bunker-account-reason-account = Ваш аккаунт Space Station 14 слишком новый. Он должен быть старше { $minutes } минут
 panic-bunker-account-reason-overall = Необходимо минимальное отыгранное Вами время на сервере — { $hours } час(-ов)
-baby-jail-account-denied = Этот молодой сервер предназначен для новичков и тех, кто хочет им помочь. Подключения со стороны учетных записей, которые слишком старые или не находятся в белом списке, не принимаются. Посетите некоторые другие сервера и узнайте все, что может предложить Space Station 14. Веселитесь!
-baby-jail-account-denied-reason = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun! Reason: "{ $reason }"
-baby-jail-account-reason-account = Your Space Station 14 account is too old. It must be younger than { $minutes } minutes
-baby-jail-account-reason-overall = Your overall playtime on the server must be younger than { $minutes } $minutes