diff --git a/Content.Client/DeltaV/Hologram/HologramSystem.cs b/Content.Client/DeltaV/Hologram/HologramSystem.cs index 212a797fd87..0d4cf098e0a 100644 --- a/Content.Client/DeltaV/Hologram/HologramSystem.cs +++ b/Content.Client/DeltaV/Hologram/HologramSystem.cs @@ -17,7 +17,7 @@ public override void Initialize() { base.Initialize(); - _shader = _protoMan.Index("Hologram").InstanceUnique(); + _shader = _protoMan.Index("HologramDeltaV").InstanceUnique(); SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnStartup); } diff --git a/Content.Server/DeltaV/Storage/EntitySystems/MouthStorageSystem.cs b/Content.Server/DeltaV/Storage/EntitySystems/MouthStorageSystem.cs index e5e7d6755e6..5bf67ad92e2 100644 --- a/Content.Server/DeltaV/Storage/EntitySystems/MouthStorageSystem.cs +++ b/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(OnAccent); - SubscribeLocalEvent(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(component.MouthId, out var storage)) - return; - - var firstItem = storage.Container.ContainedEntities[0]; - args.Blocker = firstItem; - args.Cancel(); - } } diff --git a/Content.Shared/DeltaV/Storage/EntitySystems/SharedMouthStorageSystem.cs b/Content.Shared/DeltaV/Storage/EntitySystems/SharedMouthStorageSystem.cs index df3ed835e26..a16e0e53e6a 100644 --- a/Content.Shared/DeltaV/Storage/EntitySystems/SharedMouthStorageSystem.cs +++ b/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(DropAllContents); SubscribeLocalEvent(OnDamageModified); SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(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(component.MouthId, out var storage)) + return; + + var firstItem = storage.Container.ContainedEntities[0]; + args.Blocker = firstItem; + args.Cancel(); + } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs index 6a3fc811c89..7d07857f072 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs +++ b/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))] - public string? MindSwapActionId = "ActionMindSwap"; + [DataField] + public EntProtoId? MindSwapActionId = "ActionMindSwap"; - [DataField("mindSwapActionEntity")] - public EntityUid? MindSwapActionEntity; - } + [DataField] + public EntityUid? MindSwapActionEntity; } diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl index 5cf0d3260f2..2a02820a360 100644 --- a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl +++ b/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 diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 995367bb209..94f564b9d08 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -26135,7 +26135,7 @@ entities: name: null reagents: - data: null - ReagentId: HolyWater + ReagentId: Holywater Quantity: 60 - proto: AnomalyScanner entities: diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index 37b4562d381..e9c12c34688 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -19581,7 +19581,7 @@ entities: name: null reagents: - data: null - ReagentId: HolyWater + ReagentId: Holywater Quantity: 10 - uid: 28285 components: diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml index 964e57c4567..143128dae3a 100644 --- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml +++ b/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 diff --git a/Resources/Prototypes/DeltaV/shaders.yml b/Resources/Prototypes/DeltaV/shaders.yml index 5f479acb36f..a3e95730459 100644 --- a/Resources/Prototypes/DeltaV/shaders.yml +++ b/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" \ No newline at end of file + path: "/Textures/Shaders/crispy.swsl" diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index de0526c06a8..651456ff130 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 3bfdade2034..877f3d86f1a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index b36b20628c0..f21106e6a77 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/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 diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index e09074ec52e..55edb22e451 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/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 diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml index e4ef4fbdb61..6cf81a5f88d 100644 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ b/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: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 7fc6f5daffa..eb5ddd038b7 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/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 diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml index 5645b17a67e..f22ca009393 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml +++ b/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