diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs index 0789b2aafb..99a96fd2b3 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs @@ -1,4 +1,5 @@ using Content.Server.Nutrition.Components; +using Content.Shared.Nutrition.Components; using Content.Shared.Interaction; using Content.Shared.Smoking; using Content.Shared.Temperature; diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs index 86bc93a286..4817f2c246 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs @@ -1,5 +1,6 @@ using Content.Server.Chemistry.Components.SolutionManager; using Content.Server.Nutrition.Components; +using Content.Shared.Nutrition.Components; using Content.Shared.Containers.ItemSlots; using Content.Shared.Interaction; using Content.Shared.PDA; diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs index 30e24485dc..a6e274627a 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Body.Components; using Content.Server.Body.Systems; using Content.Server.Chemistry.EntitySystems; using Content.Server.Nutrition.Components; +using Content.Shared.Nutrition.Components; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Reagent; using Content.Shared.Clothing.Components; diff --git a/Content.Server/Nutrition/Components/SmokableComponent.cs b/Content.Shared/Nutrition/Components/SmokableComponent.cs similarity index 87% rename from Content.Server/Nutrition/Components/SmokableComponent.cs rename to Content.Shared/Nutrition/Components/SmokableComponent.cs index 2db0579d8e..e2dbff9204 100644 --- a/Content.Server/Nutrition/Components/SmokableComponent.cs +++ b/Content.Shared/Nutrition/Components/SmokableComponent.cs @@ -1,10 +1,10 @@ -using Content.Server.Nutrition.EntitySystems; using Content.Shared.FixedPoint; using Content.Shared.Smoking; +using Robust.Shared.GameStates; -namespace Content.Server.Nutrition.Components +namespace Content.Shared.Nutrition.Components { - [RegisterComponent, Access(typeof(SmokingSystem))] + [RegisterComponent, NetworkedComponent] public sealed class SmokableComponent : Component { [DataField("solution")] diff --git a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml index 3dd1213c48..e1de17c894 100644 --- a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml @@ -8,3 +8,14 @@ uiWindowPos: 0,0 strippingWindowPos: 0,0 displayName: Head + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + components: + - Smokable