Merge branch 'master' of https://github.com/Ratyyy/space_station into…

… upstream # Conflicts: # Content.Server/Body/Components/BloodstreamComponent.cs # Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs # Resources/Prototypes/ADT/Entities/Objects/Misc/secretbook.yml
AdventureTimeSS14 · Jun 27, 2024 · da4bfbc · da4bfbc
2 parents 5cfeda6 + 0aea3d3
commit da4bfbc
Show file tree

Hide file tree

Showing 38 changed files with 253 additions and 46 deletions.
diff --git a/Content.Server/ADT/Hemophilia/HemophiliaSystem.cs b/Content.Server/ADT/Hemophilia/HemophiliaSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Body.Components;
+using Content.Shared.Traits;
+
+namespace Content.Server.Hemophilia;
+
+public sealed partial class HemophiliaSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HemophiliaComponent, MapInitEvent>(OnInitHemophilia);
+        SubscribeLocalEvent<HemophiliaComponent, ComponentShutdown>(OnShutdown);
+
+    }
+
+    private void OnInitHemophilia(EntityUid uid, HemophiliaComponent component, MapInitEvent args)
+    {
+        if (TryComp<BloodstreamComponent>(uid, out var bldcomp))
+        {
+            bldcomp.BleedReductionAmount *= component.Modifier;
+        }
+    }
+    private void OnShutdown(EntityUid uid, HemophiliaComponent component, ComponentShutdown args)
+    {
+        if (TryComp<BloodstreamComponent>(uid, out var bldcomp))
+        {
+            bldcomp.BleedReductionAmount /= component.Modifier;
+        }
+    }
+}
diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
@@ -7,12 +7,12 @@
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Server.Hemophilia;
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem))]
+    [RegisterComponent, Access(typeof(BloodstreamSystem), (typeof(ChemistrySystem)), (typeof(HemophiliaSystem))), typeof(ReactionMixerSystem))]
     public sealed partial class BloodstreamComponent : Component
     {
         public static string DefaultChemicalsSolutionName = "chemicals";

diff --git a/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs b/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
@@ -56,6 +56,7 @@ public bool SendStationGoal(StationGoalPrototype goal)
                     new List<StampDisplayInfo>
                     {
                         new() { StampedName = Loc.GetString("stamp-component-stamped-name-centcom"), StampedColor = Color.FromHex("#006600") },
+                        /// ADT colour fix
                     });
                 _faxSystem.Receive(fax.Owner, printout, null, fax);
 

diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@@ -37,12 +37,14 @@ private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component,
         if (!UnlockTechnology(uid, args.Id, act))
             return;
 
+
+        /// try to fix in robust v224.0.0; thanks to languages
         /*var message = Loc.GetString("research-console-unlock-technology-radio-broadcast",
             ("technology", Loc.GetString(technologyPrototype.Name)),
             ("amount", technologyPrototype.Cost));
-        _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid);
+        _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid);*/
         SyncClientWithServer(uid);
-        UpdateConsoleInterface(uid, component);*/
+        UpdateConsoleInterface(uid, component);
     }
 
     private void OnConsoleBeforeUiOpened(EntityUid uid, ResearchConsoleComponent component, BeforeActivatableUIOpenEvent args)

diff --git a/Content.Shared/ADT/hemophilia/HemophiliaComponent.cs b/Content.Shared/ADT/hemophilia/HemophiliaComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Traits;
+
+[RegisterComponent]
+public sealed partial class HemophiliaComponent : Component
+{
+    [DataField]
+    public float Modifier = 0.3f;
+
+
+}
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1889,3 +1889,10 @@ Entries:
   - { message: "Добавлена фигурка Офицера Синего Щита.", type: Add}
   id: 55760 #костыль отображения в Обновлениях
   time: '2024-06-09T18:59:00.0000000+00:00'
+
+- author: Torgovec
+  changes:
+  - {message: Добавлено 4 новых плаката, type: Add}
+  - {message: Теперь нианы могут сьесть берет СИ, type: Fix}
+  id: 55761 #костыль отображения в Обновлениях
+  time: '2024-06-23T04:19:00.0000000+00:00'
diff --git a/Resources/Locale/en-US/ADT/traits/traits.ftl b/Resources/Locale/en-US/ADT/traits/traits.ftl
@@ -0,0 +1,2 @@
+trait-hemophilia-name = Hemophilia
+trait-hemophilia-desc = Your blood is clotting extremely badly.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl
@@ -58,3 +58,7 @@ ent-BookJourney = a journey of music, mountains, and self-discovery
     .desc = The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery."
 ent-BookInspiration = finding inspiration - a writer's journey through the woods
     .desc = The book is in a new condition with a cover depicting a serene forest scene with a waterfall and colorful wildflowers. The title of the book "Finding Inspiration - A Writer's Journey Through the Woods" and the author's name are prominently displayed at the bottom.
+ent-ADTBookPhilosophyArtifact = The philosophy of the Artifact
+    .desc = The book is in new condition, the cover depicts an artifact in the depths of space debris.
+ent-ADTSecretBookPhilosophyArtifact = The philosophy of the Artifact
+    .desc = The book is in new condition, the cover depicts an artifact in the depths of space debris.
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl b/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl
@@ -85,6 +85,12 @@ ent-ClothingShoesBootsWinterSci = зимние ботинки учёного
 ent-ClothingShoesBootsWinterSec = зимние ботинки СБ
     .desc = Пушистые сапоги помогут пережить даже самую холодную зиму.
 
+ent-ClothingShoesBootsWinterSyndicate = зимние ботинки синдиката
+    .desc = Прочные тяжелые ботинки, похожи на мерч из "Синдиленда"
+
+ent-ClothingShoesBootsWinterWeb = зимние ботинки из паутины
+    .desc = Сапоги из плотной паутины помогут пережить даже самую холодную зиму.
+
 ent-ADTClothingFootSportBoots = сапоги STEP "Cold"
     .desc = Сапоги серии STEP "Cold" созданы специально для пробежек по улицам в холодную погоду. Сугробы им не помеха!
 ent-ADTClothingFootSportRoseShoes = ботинки STEP "Rose"

diff --git a/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl b/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl
@@ -4,3 +4,6 @@ trait-monochromacy-description = Ваши глаза получили необр
 trait-nearsighted-name = Близорукость
 trait-nearsighted-description = Вам требуются очки, чтобы нормально видеть.
 trait-nearsighted-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} глаза довольно расфокусированы. Не похоже, что {SUBJECT($target)} может видеть вещи настолько хорошо.[/color]
+
+trait-hemophilia-name = Гемофилия
+trait-hemophilia-desc = Ваша кровь сворачивается крайне плохо.