Merge remote-tracking branch 'upstream/master' into upstream-sync

.github/workflows/update-wiki.yml

@@ -70,3 +70,12 @@ jobs:
         username: ${{ secrets.WIKI_BOT_USER }}
         password: ${{ secrets.WIKI_BOT_PASS }}
 
+    - name: Upload entity_prototypes.json to wiki
+      uses: jtmullen/[email protected]
+      with:
+        wiki_text_file: ./bin/Content.Server/data/entity_prototypes.json
+        edit_summary: Update entity_prototypes.json via GitHub Actions
+        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/entity_prototypes.json"
+        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+        username: ${{ secrets.WIKI_BOT_USER }}
+        password: ${{ secrets.WIKI_BOT_PASS }}

Content.Server/Corvax/GuideGenerator/EntityEntry.cs

@@ -0,0 +1,35 @@
+using System.Linq;
+using System.Text.Json.Serialization;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.GuideGenerator;
+
+public sealed class EntityEntry
+{
+    [JsonPropertyName("id")]
+    public string Id { get; }
+
+    [JsonPropertyName("name")]
+    public string Name { get; }
+
+    [JsonPropertyName("desc")]
+    public string Description { get; }
+
+    public EntityEntry(EntityPrototype proto)
+    {
+        Id = proto.ID;
+        if (proto.Name.Length > 1)
+        {
+            Name = char.ToUpper(proto.Name[0]) + proto.Name.Remove(0, 1);
+        }
+        else if (proto.Name.Length == 1)
+        {
+            Name = char.ToUpper(proto.Name[0]).ToString(); // xD
+        }
+        else
+        {
+            Name = proto.Name;
+        }
+        Description = proto.Description;
+    }
+}

Content.Server/Corvax/GuideGenerator/EntityJsonGenerator.cs

@@ -0,0 +1,32 @@
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.GuideGenerator;
+
+public sealed class EntityJsonGenerator
+{
+    public static void PublishJson(StreamWriter file)
+    {
+        var prototype = IoCManager.Resolve<IPrototypeManager>();
+        var prototypes =
+            prototype
+                .EnumeratePrototypes<EntityPrototype>()
+                .Where(x => !x.Abstract)
+                .Select(x => new EntityEntry(x))
+                .ToDictionary(x => x.Id, x => x);
+
+        var serializeOptions = new JsonSerializerOptions
+        {
+            WriteIndented = true,
+        };
+
+        file.Write(JsonSerializer.Serialize(prototypes, serializeOptions));
+    }
+}

Content.Server/Entry/EntryPoint.cs

@@ -138,6 +138,11 @@ public override void PostInit()
                 file = resourceManager.UserData.OpenWriteText(resPath.WithName("react_" + dest));
                 ReactionJsonGenerator.PublishJson(file);
                 file.Flush();
+                // Corvax-Wiki-Start
+                file = resourceManager.UserData.OpenWriteText(resPath.WithName("entity_" + dest));
+                EntityJsonGenerator.PublishJson(file);
+                file.Flush();
+                // Corvax-Wiki-End
                 IoCManager.Resolve<IBaseServer>().Shutdown("Data generation done");
             }
             else

Content.Server/GuideGenerator/ChemistryJsonGenerator.cs

@@ -38,6 +38,7 @@ public static void PublishJson(StreamWriter file)
         var serializeOptions = new JsonSerializerOptions
         {
             WriteIndented = true,
+            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals, // Corvax-Wiki
             Converters =
             {
                 new UniversalJsonConverter<ReagentEffect>(),

Content.Server/GuideGenerator/ReactionJsonGenerator.cs

@@ -22,6 +22,7 @@ public static void PublishJson(StreamWriter file)
         var serializeOptions = new JsonSerializerOptions
         {
             WriteIndented = true,
+            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals, // Corvax-Wiki
             Converters =
             {
                 new UniversalJsonConverter<ReagentEffect>(),

Content.Server/RoundEnd/RoundEndSystem.cs

@@ -146,29 +146,16 @@ public void RequestRoundEnd(TimeSpan countdownTime, EntityUid? requester = null,
                units = "eta-units-minutes";
             }
 
-            if (autoCall)
-            {
-                _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text,
-                    ("time", time),
-                    ("units", Loc.GetString(units))),
-                    name,
-                    false,
-                    null,
-                    Color.Gold);
-                SoundSystem.Play("/Audio/Corvax/Announcements/crew_s_called.ogg", Filter.Broadcast(), AudioParams.Default.AddVolume(-4)); // Corvax-Announcements
-            }
-            else
-            {
-                _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text,
-                    ("time", time),
-                    ("units", Loc.GetString(units))),
-                    name,
-                    false,
-                    null,
-                    Color.Gold);
-            }
+            _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text,
+                ("time", time),
+                ("units", Loc.GetString(units))),
+                name,
+                false,
+                null,
+                Color.Gold);
 
-            if (!autoCall) SoundSystem.Play("/Audio/Announcements/shuttlecalled.ogg", Filter.Broadcast(), AudioParams.Default.AddVolume(-4)); // Corvax-Announcements: Custom sound for auto-called
+            if (!AutoCalledBefore) SoundSystem.Play("/Audio/Announcements/shuttlecalled.ogg", Filter.Broadcast(), AudioParams.Default.AddVolume(-4)); // Corvax-Announcements: Custom sound for auto-called
+            else SoundSystem.Play("/Audio/Corvax/Announcements/crew_s_called.ogg", Filter.Broadcast(), AudioParams.Default.AddVolume(-4)); // Corvax-Announcements
 
             LastCountdownStart = _gameTiming.CurTime;
             ExpectedCountdownEnd = _gameTiming.CurTime + countdownTime;
@@ -290,8 +277,8 @@ public override void Update(float frameTime)
             {
                 if (!_shuttle.EmergencyShuttleArrived && ExpectedCountdownEnd is null)
                 {
+                    AutoCalledBefore = true; // Corvax-Announcements: Move before call RequestRoundEnd to play correct announcement sound type
                     RequestRoundEnd(null, false, "round-end-system-shuttle-auto-called-announcement");
-                    AutoCalledBefore = true;
                 }
 
                 // Always reset auto-call in case of a recall.

Content.Shared/Humanoid/HumanoidCharacterAppearance.cs

@@ -241,8 +241,8 @@ public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearanc
                 }
 
                 markingSet.EnsureSpecies(species, skinColor, markingManager);
-                markingSet.FilterSponsor(sponsorMarkings, markingManager); // Corvax-Sponsors
                 markingSet.EnsureSexes(sex, markingManager);
+                markingSet.FilterSponsor(sponsorMarkings, markingManager); // Corvax-Sponsors
             }
 
             return new HumanoidCharacterAppearance(

Content.Shared/Humanoid/Markings/MarkingPrototype.cs

@@ -20,14 +20,14 @@ public sealed class MarkingPrototype : IPrototype
         [DataField("speciesRestriction")]
         public List<string>? SpeciesRestrictions { get; private set; }
 
+        [DataField("sexRestriction")]
+        public Sex? SexRestriction { get; private set; }
+
         // Corvax-Sponsors-Start
         [DataField("sponsorOnly")]
         public bool SponsorOnly = false;
         // Corvax-Sponsors-End
 
-        [DataField("sexRestriction")]
-        public Sex? SexRestriction { get; private set; }
-
         [DataField("followSkinColor")]
         public bool FollowSkinColor { get; private set; } = false;
 

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/quiver.ftl

@@ -0,0 +1,2 @@
+ent-ClothingBeltQuiver = quiver
+    .desc = Can hold up to 15 arrows, and fits snug around your waist.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl

@@ -1,3 +1,5 @@
+ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsBase }
+    .desc = { ent-ClothingHandsBase.desc }
 ent-ClothingHandsGlovesColorPurple = purple gloves
     .desc = Regular purple gloves that do not keep you from frying.
 ent-ClothingHandsGlovesColorRed = red gloves

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl

@@ -35,9 +35,9 @@ ent-ClothingHandsGlovesFingerlessInsulated = fingerless insulated gloves
     .desc = Insulated gloves resistant to shocks, or at least they used to.
 ent-ClothingHandsGlovesMercFingerless = mercenary fingerless gloves
     .desc = Gloves that may not protect you from finger burns, but will make you cooler.
-ent-ThievingGloves = black gloves
-    .desc = Regular black gloves that do not keep you from frying.
+ent-ThievingGloves = { ent-ClothingHandsGlovesColorBlack }
     .suffix = Thieving
+    .desc = { ent-ClothingHandsGlovesColorBlack.desc }
 ent-ClothingHandsGlovesCluwne = cluwne hands
     .desc = A cursed pair of cluwne hands.
     .suffix = Unremoveable

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/suits.ftl

@@ -7,7 +7,7 @@ ent-ClothingOuterSuitAtmosFire = atmos fire suit
 ent-ClothingOuterSuitRad = radiation suit
     .desc = A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'
 ent-ClothingOuterSuitSpaceNinja = space ninja suit
-    .desc = This black technologically advanced, cybernetically-enhanced suit provides good protection and many abilities like invisibility or teleportation.
+    .desc = This black technologically advanced, cybernetically-enhanced suit provides many abilities like invisibility or teleportation.
 ent-ClothingOuterSuitChicken = chicken suit
     .desc = Bok bok bok!
 ent-ClothingOuterSuitShrineMaiden = shrine maiden outfit

Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/trash.ftl

@@ -1,2 +1,6 @@
 ent-RandomSpawner = Trash Spawner
+    .suffix = 50
     .desc = { ent-MarkerBase.desc }
+ent-RandomSpawner100 = { ent-RandomSpawner }
+    .suffix = 100
+    .desc = { ent-RandomSpawner.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/regalrat.ftl

@@ -9,3 +9,11 @@ ent-ActionRatKingRaiseArmy = Raise Army
     .desc = Spend some hunger to summon an allied rat to help defend you.
 ent-ActionRatKingDomain = Rat King's Domain
     .desc = Spend some hunger to release a cloud of miasma into the air.
+ent-ActionRatKingOrderStay = Stay
+    .desc = Command your army to stand in place.
+ent-ActionRatKingOrderFollow = Follow
+    .desc = Command your army to follow you around.
+ent-ActionRatKingOrderCheeseEm = Cheese 'Em
+    .desc = Command your army to attack whoever you point at.
+ent-ActionRatKingOrderLoose = Loose
+    .desc = Command your army to act at their own will.

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl

@@ -52,3 +52,5 @@ ent-FoodSaladWatermelonFruitBowl = melon fruit bowl
     .desc = The only salad where you can eat the bowl.
 ent-FoodMealTaco = taco
     .desc = Take a bite!
+ent-FoodMealCornInButter = corn in butter
+    .desc = Buttery.

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl

@@ -1,2 +1,2 @@
-ent-NukeOpsDeclarationOfWar = the declaration of war
+ent-NukeOpsDeclarationOfWar = declaration of war
     .desc = Use to send a declaration of hostilities to the target, delaying your shuttle departure while they prepare for your assault. Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. Must be used at start of mission, or your benefactors will lose interest.

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl

@@ -64,6 +64,8 @@ ent-PillTricordrazine = tricordrazine pill (10u)
     .desc = { ent-Pill.desc }
 ent-PillBicaridine = bicaridine pill (10u)
     .desc = { ent-Pill.desc }
+ent-PillCharcoal = charcoal pill (10u)
+    .desc = { ent-Pill.desc }
 ent-PillRomerol = romerol pill
     .desc = { ent-Pill.desc }
 ent-PillAmbuzol = ambuzol pill
@@ -86,5 +88,13 @@ ent-SyringeIpecac = ipecac syringe
     .desc = { ent-BaseSyringe.desc }
 ent-SyringeAmbuzol = ambuzol syringe
     .desc = { ent-BaseSyringe.desc }
+ent-SyringeSigynate = sigynate syringe
+    .desc = { ent-BaseSyringe.desc }
+ent-SyringeEthylredoxrazine = ethylredoxrazine syringe
+    .desc = { ent-BaseSyringe.desc }
+ent-SyringePhalanximine = phalanximine syringe
+    .desc = { ent-BaseSyringe.desc }
+ent-SyringeSaline = saline syringe
+    .desc = { ent-BaseSyringe.desc }
 ent-SyringeRomerol = romerol syringe
     .desc = { ent-BaseSyringe.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl

@@ -9,12 +9,14 @@ ent-ChemicalMedipen = chemical medipen
     .desc = A sterile injector for rapid administration of drugs to patients. This one can't be refilled.
 ent-EmergencyMedipen = emergency medipen
     .desc = A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Beware, as it's easy to overdose on epinephrine and tranexmic acid.
-ent-AntiPoisonMedipen = anti-poison medipen
+ent-AntiPoisonMedipen = poison auto-injector
     .desc = A rapid dose of anti-poison. Contains ultravasculine and epinephrine.
 ent-BruteAutoInjector = brute auto-injector
     .desc = A rapid dose of bicaridine and tranexamic acid, intended for combat applications
 ent-BurnAutoInjector = burn auto-injector
     .desc = A rapid dose of dermaline and leporazine, intended for combat applications
+ent-RadAutoInjector = rad auto-injector
+    .desc = A rapid dose of anti-radiation. Contains arithrazine and bicardine.
 ent-SpaceMedipen = space medipen
     .desc = Contains a mix of chemicals that protect you from the deadly effects of space.
 ent-Stimpack = stimulant injector

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/bow/bow.ftl

@@ -0,0 +1,4 @@
+ent-BaseBow = bow
+    .desc = The original rooty tooty point and shooty.
+ent-BowImprovised = { ent-BaseBow }
+    .desc = { ent-BaseBow.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/arrows.ftl

@@ -0,0 +1,6 @@
+ent-BaseArrow = { ent-BaseItem }
+    .desc = { ent-BaseItem.desc }
+ent-ArrowRegular = arrow
+    .desc = You can feel the power of the steppe within you.
+ent-ArrowImprovised = glass shard arrow
+    .desc = The greyshirt's preferred projectile.

Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/railing.ftl

@@ -4,3 +4,5 @@ ent-RailingCorner = railing
     .desc = Basic railing meant to protect idiots like you from falling.
 ent-RailingCornerSmall = railing
     .desc = Basic railing meant to protect idiots like you from falling.
+ent-RailingRound = railing
+    .desc = Basic railing meant to protect idiots like you from falling.

Resources/Locale/ru-RU/administration/antag.ftl

@@ -9,4 +9,3 @@ admin-verb-text-make-traitor = Сделать предателем
 admin-verb-text-make-zombie = Сделать зомби
 admin-verb-text-make-nuclear-operative = Сделать ядерным оперативником
 admin-verb-text-make-pirate = Сделать пиратом
-admin-verb-text-make-space-ninja = Сделать космическим ниндзя

Resources/Locale/ru-RU/administration/ui/ban-list.ftl

@@ -1,6 +1,10 @@
 # UI
+ban-list-bans = Баны
+ban-list-role-bans = Баны ролей
+# UI
 ban-list-header-ids = ID
 ban-list-header-reason = Причина
+ban-list-header-role = Роль
 ban-list-header-time = Длительность бана
 ban-list-header-expires = Истекает
 ban-list-header-banning-admin = Забанил
@@ -10,6 +14,6 @@ ban-list-id = ID: { $id }
 ban-list-ip = IP: { $ip }
 ban-list-hwid = HWID: { $hwid }
 ban-list-guid = GUID: { $guid }
-ban-list-permanent = PERMANENT
+ban-list-permanent = НАВСЕГДА
 ban-list-unbanned = Разбанен: { $date }
 ban-list-unbanned-by = Разбанил { $unbanner }

Resources/Locale/ru-RU/animals/rat-king/rat-king.ftl

@@ -1,2 +1,3 @@
 rat-king-domain-popup = В воздух поднимается облако миазм.
 rat-king-too-hungry = Вы слишком голодны, чтобы использовать эту способность!
+rat-king-rummage-text = Обшарить

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

@@ -19,6 +19,9 @@ command-description-stations-addgrid = Adds a grid to the given station.
 command-description-stations-rmgrid = Removes a grid from the given station.
 command-description-stations-rename = Renames the given station.
 command-description-stations-largestgrid = Returns the largest grid the given station has, if any.
+command-description-stationevent-lsprob = Lists the probability of different station events occuring out of the entire pool.
+command-description-stationevent-lsprobtime = Lists the probability of different station events occuring based on the specified length of a round.
+command-description-stationevent-prob = Returns the probability of a single station event occuring out of the entire pool.
 command-description-admins-active = Returns a list of active admins.
 command-description-admins-all = Returns a list of ALL admins, including deadmined ones.
 command-description-marked = Returns the value of $marked as a List<EntityUid>.

Resources/Locale/ru-RU/ghost/ghost-gui.ftl

@@ -4,6 +4,8 @@ ghost-gui-ghost-roles-button = Роли призраков ({ $count })
 ghost-gui-toggle-ghost-visibility-popup = Видимость других призраков была изменена.
 ghost-gui-toggle-lighting-manager-popup = Рендеринг света был переключён.
 ghost-gui-toggle-fov-popup = Поле зрения было переключено.
+ghost-gui-toggle-hearing-popup-on = You can now hear all messages.
+ghost-gui-toggle-hearing-popup-off = You can now only hear radio and nearby messages.
 ghost-target-window-title = Телепорт призрака
 ghost-target-window-current-button = Телепорт в: { $name }
 ghost-roles-window-title = Роли призраков

Resources/Locale/ru-RU/markings/arachnid.ftl

@@ -26,6 +26,9 @@ marking-ArachnidAppendagesHarvest-harvest_secondary = Полосы
 marking-ArachnidAppendagesShort = Придатки (Короткие)
 marking-ArachnidAppendagesShort-short_primary = Придаток
 marking-ArachnidAppendagesShort-short_secondary = Полосы
+marking-ArachnidAppendagesFreaky = Appendages (Freaky long)
+marking-ArachnidAppendagesFreaky-freaky_primary = Appendage
+marking-ArachnidAppendagesFreaky-freaky_secondary = Stripes
 marking-ArachnidTorsoStripes = Полосы
 marking-ArachnidTorsoStripes-stripes = Дизайн
 marking-ArachnidTorsoSlashes = Косые срезы

Resources/Locale/ru-RU/materials/materials.ftl

@@ -20,5 +20,6 @@ materials-uranium = уран
 materials-bananium = бананиум
 materials-meat = мясо
 materials-web = шёлк
+materials-bones = bone
 # Material Reclaimer
 material-reclaimer-upgrade-process-rate = скорость переработки

Resources/Locale/ru-RU/nukeops/nuke-ops.ftl

@@ -0,0 +1,2 @@
+nuke-ops-no-more-threat-announcement-shuttle-call = Based on our scans from our long-range sensors, the nuclear threat is now eliminated. We will call emergency shuttle that will arrive shortly. ETA: { $time } { $units }. You can recall the shuttle to extend the shift.
+nuke-ops-no-more-threat-announcement = Based on our scans from our long-range sensors, the nuclear threat is now eliminated. Shuttle is already called.

Resources/Locale/ru-RU/nutrition/components/drink-component.ftl

@@ -1,7 +1,6 @@
 drink-component-on-use-is-empty = { $owner } пуст!
-drink-component-on-examine-is-empty = Пуст
-drink-component-on-examine-is-opened = Открыт
-drink-component-on-examine-details-text = [color={ $colorName }]{ $text }[/color]
+drink-component-on-examine-is-empty = [color=gray]Пусто[/color]
+drink-component-on-examine-is-opened = [color=yellow]Открыто[/color]
 drink-component-on-examine-is-full = Полон
 drink-component-on-examine-is-mostly-full = Почти полон
 drink-component-on-examine-is-half-full = Наполовину полон

Resources/Locale/ru-RU/objectives/conditions/doorjack.ftl

@@ -1,4 +1,5 @@
-objective-condition-doorjack-title = Взломайте { $count } { $count ->
+objective-condition-doorjack-title =
+    Взломайте { $count } { $count ->
         [one] дверь
         [few] двери
        *[other] дверей

Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl

@@ -33,6 +33,8 @@ humanoid-profile-editor-preference-duffelbag = Вещмешок
 humanoid-profile-editor-jobs-amount-in-department-tooltip = { $departmentName }
 humanoid-profile-editor-department-jobs-label = { $departmentName }
 humanoid-profile-editor-antags-tab = Антагонисты
+humanoid-profile-editor-antag-preference-yes-button = Да
+humanoid-profile-editor-antag-preference-no-button = Нет
 humanoid-profile-editor-traits-tab = Черты персонажа
 humanoid-profile-editor-job-priority-high-button = Высокий
 humanoid-profile-editor-job-priority-medium-button = Средний