Content.Client/DeltaV/Hologram/HologramSystem.cs

@@ -17,7 +17,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        _shader = _protoMan.Index<ShaderPrototype>("Hologram").InstanceUnique();
+        _shader = _protoMan.Index<ShaderPrototype>("HologramDeltaV").InstanceUnique();
         SubscribeLocalEvent<HologramComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<HologramComponent, ComponentStartup>(OnStartup);
     }

Content.Server/DeltaV/Storage/EntitySystems/MouthStorageSystem.cs

@@ -1,4 +1,3 @@
-using Content.Server.Nutrition;
 using Content.Server.Speech;
 using Content.Server.Speech.EntitySystems;
 using Content.Shared.DeltaV.Storage.Components;
@@ -10,12 +9,12 @@ namespace Content.Server.DeltaV.Storage.EntitySystems;
 public sealed class MouthStorageSystem : SharedMouthStorageSystem
 {
     [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<MouthStorageComponent, AccentGetEvent>(OnAccent);
-        SubscribeLocalEvent<MouthStorageComponent, IngestionAttemptEvent>(OnIngestAttempt);
     }
 
     // Force you to mumble if you have items in your mouth
@@ -24,18 +23,4 @@ private void OnAccent(EntityUid uid, MouthStorageComponent component, AccentGetE
         if (IsMouthBlocked(component))
             args.Message = _replacement.ApplyReplacements(args.Message, "mumble");
     }
-
-    // Attempting to eat or drink anything with items in your mouth won't work
-    private void OnIngestAttempt(EntityUid uid, MouthStorageComponent component, IngestionAttemptEvent args)
-    {
-        if (!IsMouthBlocked(component))
-            return;
-
-        if (!TryComp<StorageComponent>(component.MouthId, out var storage))
-            return;
-
-        var firstItem = storage.Container.ContainedEntities[0];
-        args.Blocker = firstItem;
-        args.Cancel();
-    }
 }

Content.Shared/DeltaV/Storage/EntitySystems/SharedMouthStorageSystem.cs

@@ -4,6 +4,7 @@
 using Content.Shared.DeltaV.Storage.Components;
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Nutrition;
 using Content.Shared.Standing;
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
@@ -27,6 +28,7 @@ public override void Initialize()
         SubscribeLocalEvent<MouthStorageComponent, DisarmedEvent>(DropAllContents);
         SubscribeLocalEvent<MouthStorageComponent, DamageChangedEvent>(OnDamageModified);
         SubscribeLocalEvent<MouthStorageComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<MouthStorageComponent, IngestionAttemptEvent>(OnIngestAttempt);
     }
 
     protected bool IsMouthBlocked(MouthStorageComponent component)
@@ -81,4 +83,18 @@ private void OnExamined(EntityUid uid, MouthStorageComponent component, Examined
             args.PushMarkup(Loc.GetString("mouth-storage-examine-condition-occupied", ("entity", subject)));
         }
     }
+
+    // Attempting to eat or drink anything with items in your mouth won't work
+    private void OnIngestAttempt(EntityUid uid, MouthStorageComponent component, IngestionAttemptEvent args)
+    {
+        if (!IsMouthBlocked(component))
+            return;
+
+        if (!TryComp<StorageComponent>(component.MouthId, out var storage))
+            return;
+
+        var firstItem = storage.Container.ContainedEntities[0];
+        args.Blocker = firstItem;
+        args.Cancel();
+    }
 }

Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs

@@ -1,16 +1,14 @@
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Abilities.Psionics;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class MindSwapPowerComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class MindSwapPowerComponent : Component
-    {
-        [DataField("mindSwapActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? MindSwapActionId = "ActionMindSwap";
+    [DataField]
+    public EntProtoId? MindSwapActionId = "ActionMindSwap";
 
-        [DataField("mindSwapActionEntity")]
-        public EntityUid? MindSwapActionEntity;
-    }
+    [DataField]
+    public EntityUid? MindSwapActionEntity;
 }

Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl

@@ -3,7 +3,6 @@ flavor-base-acidic = acidic
 flavor-complex-nuggie = like "chicken"
 flavor-complex-enthralling = enthralling
 flavor-complex-sublime = sublime
-flavor-complex-holy = heavenly
 flavor-base-seeds = seeds
 flavor-complex-vanilla = like vanilla
 flavor-complex-soju = like bold, alcoholic rice

Resources/Maps/hammurabi.yml

@@ -26135,7 +26135,7 @@ entities:
           name: null
           reagents:
           - data: null
-            ReagentId: HolyWater
+            ReagentId: Holywater
             Quantity: 60
 - proto: AnomalyScanner
   entities:

Resources/Maps/tortuga.yml

@@ -19581,7 +19581,7 @@ entities:
           name: null
           reagents:
           - data: null
-            ReagentId: HolyWater
+            ReagentId: Holywater
             Quantity: 10
   - uid: 28285
     components:

Resources/Prototypes/DeltaV/Flavors/flavors.yml

@@ -10,11 +10,6 @@
   flavorType: Complex
   description: flavor-complex-sublime
 
-- type: flavor
-  id: holy
-  flavorType: Complex
-  description: flavor-complex-holy
-
 - type: flavor
   id: seeds
   flavorType: Base

Resources/Prototypes/DeltaV/shaders.yml

@@ -1,6 +1,6 @@
 # hologram
 - type: shader
-  id: Hologram
+  id: HologramDeltaV
   kind: source
   path: "/Textures/DeltaV/Shaders/hologram.swsl"
   params:
@@ -11,4 +11,4 @@
 - type: shader
   id: Crispy
   kind: source
-  path: "/Textures/Shaders/crispy.swsl"
+  path: "/Textures/Shaders/crispy.swsl"

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -1908,7 +1908,7 @@
       state: slug
       sprite: Mobs/Animals/slug.rsi
   - type: Carriable #DeltaV
-    freeHandsRequired: 1 
+    freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2396,7 +2396,6 @@
   - MobGiantSpider
   - MobSpiderAngryBase
   id: MobGiantSpiderAngry
->>>>>>> 18fe8b9df0 (Sprite Movement working with AI movement (#33494))
 
 - type: entity
   name: clown spider

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -2054,7 +2054,7 @@
           Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
-        - ReagentId: HolyWater # DeltaV - use our holy water
+        - ReagentId: Holywater
           Quantity: 10
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/holymelon.rsi
@@ -2119,7 +2119,7 @@
           Quantity: 2
         - ReagentId: Vitamin
           Quantity: 1
-        - ReagentId: HolyWater # DeltaV - use our holy water
+        - ReagentId: Holywater
           Quantity: 2
   - type: Extractable
     juiceSolution:

Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml

@@ -23,7 +23,7 @@
       collection: Punch
     damage:
       types:
-        Holy: 25
+        Holy: 10 # DeltaV: was 25
         Blunt: 1
   - type: Prayable
     bibleUserOnly: true
@@ -49,11 +49,6 @@
     interfaces:
       enum.StorageUiKey.Key:
         type: StorageBoundUserInterface
-  - type: MeleeWeapon # Nyanotrasen - Bibles do Holy damage
-    damage:
-      types:
-        Blunt: 3
-        Holy: 10
   - type: Tag
     tags:
     - Book

Resources/Prototypes/Hydroponics/seeds.yml

@@ -1668,7 +1668,7 @@
       Min: 1
       Max: 10
       PotencyDivisor: 10
-    HolyWater: # DeltaV - use our holy water
+    Holywater:
       Min: 1
       Max: 10
       PotencyDivisor: 10

Resources/Prototypes/Nyanotrasen/Actions/types.yml

@@ -46,7 +46,7 @@
     event: !type:MassSleepPowerActionEvent
 
 - type: entity
-  id: ActionMindSwap
+  id: ActionMindSwapPsionic
   name: action-name-mind-swap
   description: action-description-mind-swap
   components:

Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

@@ -39,7 +39,7 @@
     solutions:
       drink:
         reagents:
-        - ReagentId: HolyWater
+        - ReagentId: Holywater
           Quantity: 100
   - type: Sprite
     sprite: Nyanotrasen/Objects/Consumable/Drinks/flaskholywater.rsi

Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml

@@ -145,7 +145,7 @@
     GrapeSoda: 3
 
 - type: reaction
-  id: HolyWater
+  id: Holywater
   reactants:
     Water:
       amount: 1
@@ -154,4 +154,4 @@
     Mercury:
       amount: 1
   products:
-    HolyWater: 3
+    Holywater: 3