Monkey can wear breath mask and smoke a blunt (#14612)

diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
index 0789b2aafbb074572a959d7a4f45bb81ca47470d..99a96fd2b331105ff070d9b751ef8e9ad074edb3 100644 (file)
--- 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 86bc93a286ea46b672d76716bb7416e1d3db7107..4817f2c246c0ef32187dad0c4c466bc58e79e5f4 100644 (file)
--- 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 30e24485dcb3f79caf2ed32630b3f7b2e9927b5c..a6e274627a1272a8edfb9856ddacbc5248936667 100644 (file)
--- 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 2db0579d8ed253a2720ba457cdfd10d11cf6060e..e2dbff92048d48d4ccfe798061a53c565cac5334 100644 (file)
--- 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 3dd1213c48ee8e0456b53edca5c6073eb077ea31..e1de17c8944489380f39113f0770b11e5f784e31 100644 (file)
--- 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