From c2606fe642b011a1967855ebe3973b2baddbbe8e Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 1 Jan 2024 15:55:47 +0200 Subject: [PATCH] Fixing --- .../_NF/SizeAttribute/SizeAttributeSystem.cs | 2 +- .../Item/Components/PseudoItemComponent.cs | 4 +- .../Item/PseudoItemInsertDoAfterEvent.cs | 10 +++++ .../Entities/Mobs/Player/felinid.yml | 38 ------------------- 4 files changed, 13 insertions(+), 41 deletions(-) create mode 100644 Content.Shared/Nyanotrasen/Item/PseudoItemInsertDoAfterEvent.cs delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml diff --git a/Content.Server/_NF/SizeAttribute/SizeAttributeSystem.cs b/Content.Server/_NF/SizeAttribute/SizeAttributeSystem.cs index 34a865d8b78..1dbd2da4c08 100644 --- a/Content.Server/_NF/SizeAttribute/SizeAttributeSystem.cs +++ b/Content.Server/_NF/SizeAttribute/SizeAttributeSystem.cs @@ -3,7 +3,7 @@ using Robust.Shared.Physics; using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Systems; -using Content.Server.Item.PseudoItem; +using Content.Shared.Item.PseudoItem; namespace Content.Server.SizeAttribute { diff --git a/Content.Shared/Nyanotrasen/Item/Components/PseudoItemComponent.cs b/Content.Shared/Nyanotrasen/Item/Components/PseudoItemComponent.cs index 04117c98112..4505e365fdf 100644 --- a/Content.Shared/Nyanotrasen/Item/Components/PseudoItemComponent.cs +++ b/Content.Shared/Nyanotrasen/Item/Components/PseudoItemComponent.cs @@ -1,12 +1,12 @@ +using Content.Shared._NF.Cloning; namespace Content.Shared.Item.PseudoItem; - /// /// For entities that behave like an item under certain conditions, /// but not under most conditions. /// [RegisterComponent] -public sealed partial class PseudoItemComponent : Component +public sealed partial class PseudoItemComponent : Component, ITransferredByCloning { [DataField("size")] public int Size = 120; diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItemInsertDoAfterEvent.cs b/Content.Shared/Nyanotrasen/Item/PseudoItemInsertDoAfterEvent.cs new file mode 100644 index 00000000000..4b34118f377 --- /dev/null +++ b/Content.Shared/Nyanotrasen/Item/PseudoItemInsertDoAfterEvent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.Serialization; +using Content.Shared.DoAfter; + +namespace Content.Shared.Item.PseudoItem; + + +[Serializable, NetSerializable] +public sealed partial class PseudoItemInsertDoAfterEvent : SimpleDoAfterEvent +{ +} diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml deleted file mode 100644 index bd6c39db6fd..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml +++ /dev/null @@ -1,38 +0,0 @@ -- type: entity - save: false - name: Urist McFelinid - parent: MobFelinidBase - id: MobFelinid - components: - - type: CombatMode - - type: InteractionPopup - successChance: 1 - interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others - - type: MindContainer - showExamineInfo: true - - type: Input - context: "human" - - type: Speech - speechVerb: Felinid - - type: MobMover - - type: InputMover - - type: Respirator - damage: - types: - Asphyxiation: 1.0 - damageRecovery: - types: - Asphyxiation: -1.0 - - type: Alerts - - type: Actions - - type: Eye - - type: CameraRecoil - - type: Examiner - - type: CanHostGuardian - - type: NpcFactionMember - factions: - - NanoTrasen - - type: PotentialPsionic -