Merge branch 'master' into SpaceSecOrder

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;
+        }
+    }
+}

Content.Server/Body/Components/BloodstreamComponent.cs

@@ -6,10 +6,11 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Server.Hemophilia;
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(BloodstreamSystem), (typeof(ChemistrySystem)))]
+    [RegisterComponent, Access(typeof(BloodstreamSystem), (typeof(ChemistrySystem)), (typeof(HemophiliaSystem)))]
     public sealed partial class BloodstreamComponent : Component
     {
         public static string DefaultChemicalsSolutionName = "chemicals";

Content.Server/Research/Systems/ResearchSystem.Console.cs

@@ -38,12 +38,14 @@ private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component,
         if (!UnlockTechnology(uid, args.Id, ent))
             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)

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;
+
+
+}

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'

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.

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 = Ваша кровь сворачивается крайне плохо.

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl

@@ -337,3 +337,15 @@ ent-ADTPosterPlasmaMan = Плазма(мены)
 
 ent-ADTPosterContrabandRoza = Роза
     .desc = Символ Атмосии.
+
+ent-ADTPosterError = Что-то здесь не так
+    .desc = Кажется кто-то забыл добавить сюда осмысленное изображение
+
+ent-ADTPosterNoBad = Где-то, но не здесь
+    .desc = Вы могли бы быть там, если бы не работали на НТ
+
+ent-ADTPosterNoGood = Где-то, но не тут
+    .desc = Вы могли бы быть там, если бы вы не работали на НТ
+
+ent-ADTPosterGasAttack = Газовая атака!
+    .desc = НТ предупреждает о тритиевых гранатах у синдиката, а так же о саботаже атмоса от вражеских агентов!

Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml

@@ -398,6 +398,7 @@
     sprite: ADT/Clothing/Head/Hats/beret_CE.rsi
   - type: Tag
     tags:
+      - ClothMade
       - HamsterWearable
 
 - type: entity

Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml

@@ -796,4 +796,45 @@
   components:
   - type: Sprite
     sprite: ADT/Structures/Wallmounts/space_sec_poster.rsi
-    state: poster_spacesec
+    state: poster_spacesec
+
+# Странные постеры
+- type: entity
+  parent: PosterBase
+  id: ADTPosterError
+  name: Error Poster
+  description: This is an error poster.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Decoration/poster_syndicate.rsi
+    state: error
+
+- type: entity
+  parent: PosterBase
+  id: ADTPosterNoBad
+  name: No Bad
+  description: This poster promotes good behavior.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Decoration/poster_syndicate.rsi
+    state: nobad
+
+- type: entity
+  parent: PosterBase
+  id: ADTPosterNoGood
+  name: No Good
+  description: This poster warns against bad behavior.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Decoration/poster_syndicate.rsi
+    state: nogood
+
+- type: entity
+  parent: PosterBase
+  id: ADTPosterGasAttack
+  name: Gas Attack
+  description: This poster warns about gas attacks.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Decoration/poster_syndicate.rsi
+    state: gasattack

Resources/Prototypes/ADT/Traits/neutral.yml

@@ -3,4 +3,12 @@
   name: trait-moth-accent-name
   description: trait-moth-accent-desc
   components:
-    - type: MothAccent
+    - type: MothAccent
+
+- type: trait
+  id: ADTHemophilia
+  name: trait-hemophilia-name
+  description: trait-hemophilia-desc
+  components:
+    - type: Hemophilia
+      modifier: 0.01

Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml

@@ -103,6 +103,8 @@
       - ADTPosterLustyMoth
       - ADTPosterWatchOutChem
       - ADTPosterPanem
+      - ADTPosterGasAttack
+      - ADTPosterNoGood
     chance: 1
 
 - type: entity
@@ -172,4 +174,6 @@
       - ADTPosterDontTalkToArty
       - ADTPosterWorkUnderWay
       - ADTPosterPlasmaMan
+      - ADTPosterError
+      - ADTPosterNoBad
     chance: 1

Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by discord:unlumy для Времени Приключений МРП сервер",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "error"
+        },
+        {
+            "name": "nobad" 
+        },
+        {
+            "name": "nogood"
+        },
+        {
+            "name": "gasattack"
+        }
+    ]
+}

Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json

@@ -8,17 +8,23 @@
   },
   "states": [
     {
-	  "name": "assembly"
-	},
-	{
-	  "name": "bolted_unlit"
-	},
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "bolted_open_unlit"
+    },
     {
       "name": "closed"
     },
 	{
 	  "name": "closed_unlit"
 	},
+    {
+      "name": "open_unlit"
+    },
     {
       "name": "closing",
       "delays": [
@@ -61,8 +67,8 @@
 	{
 	  "name": "open",
 	  "delays": [
-	    [ 
-		  1 
+	    [
+		  1
 		]
 	  ]
 	},
@@ -105,6 +111,9 @@
         ]
       ]
     },
+    {
+      "name": "panel_closed"
+    },
     {
       "name": "panel_open",
       "delays": [
@@ -162,6 +171,9 @@
           0.4
         ]
       ]
+    },
+    {
+      "name": "emergency_open_unlit"
     }
   ]
-}
+}