small moth changes (#18810)

* changes * fix test fail hopefully * disallow eating containers * no more eating stored stuff
2023-08-08 21:05:05 -07:00
parent 61f546dd0c
commit 6b2fef1ac8
12 changed files with 60 additions and 15 deletions
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -28,6 +28,7 @@ using Robust.Shared.Audio;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using Content.Shared.Tag;
+using Content.Server.Storage.Components;

 namespace Content.Server.Nutrition.EntitySystems
 {
@@ -119,6 +120,13 @@ namespace Content.Server.Nutrition.EntitySystems
                return (false, true);
            }

+            // Check for used storage on the food item
+            if (TryComp<ServerStorageComponent>(food, out var storageState) && storageState.StorageUsed != 0)
+            {
+                _popupSystem.PopupEntity(Loc.GetString("food-has-used-storage", ("food", food)), user, user);
+                return (false, true);
+            }
+
            var flavors = _flavorProfileSystem.GetLocalizedFlavorsMessage(food, user, foodSolution);

            if (foodComp.UsesRemaining <= 0)
--- a/Resources/Audio/Voice/Moth/attributions.yml
+++ b/Resources/Audio/Voice/Moth/attributions.yml
@@ -3,7 +3,7 @@
  copyright: "Taken from https://github.com/tgstation/tgstation/commit/31c19654e0f641166ecd80c672ea05362fd19488"
  source: "https://github.com/tgstation/tgstation/commits/master/sound/voice/moth/scream_moth.ogg"

- files: ["moth_laugh.ogg, moth_chitter.ogg"]
+- files: ["moth_laugh.ogg, moth_chitter.ogg, moth_squeak.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Taken from https://github.com/BeeStation/BeeStation-Hornet/commit/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d"
  source: "https://github.com/BeeStation/BeeStation-Hornet/blob/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d/sound/emotes/"
--- a/Resources/Audio/Voice/Moth/moth_squeak.ogg
+++ b/Resources/Audio/Voice/Moth/moth_squeak.ogg
--- a/Resources/Locale/en-US/nutrition/components/food-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-component.ftl
@@ -6,7 +6,8 @@ food-you-need-to-hold-utensil = You need to be holding a {$utensil} to eat that!

 food-nom = Nom. {$flavors}
 food-swallow = You swallow the {$food}. {$flavors}
-food-repulsing = This looks repulsing.
+
+food-has-used-storage = You cannot eat the {$food} with an item stored inside.

 food-system-remove-mask = You need to take off the {$entity} first.

--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -8,8 +8,18 @@
    - HEAD
  - type: Sprite
    state: icon
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 10
  - type: Tag
    tags:
+      - ClothMade
      - DroneUsable
      - WhitelistChameleon

--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -21,6 +21,7 @@
    sprite: Clothing/Head/Hats/beret.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -47,6 +48,7 @@
    sprite: Clothing/Head/Hats/beret_rnd.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -62,6 +64,7 @@
    sprite: Clothing/Head/Hats/beret_engineering.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -77,6 +80,7 @@
    sprite: Clothing/Head/Hats/beret_hos.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -136,6 +140,7 @@
    sprite: Clothing/Head/Hats/captain.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -186,6 +191,7 @@
      storagebase: !type:Container
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -201,6 +207,7 @@
    sprite: Clothing/Head/Hats/brownfedora.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -238,6 +245,7 @@
    sprite: Clothing/Head/Hats/hopcap.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -253,6 +261,7 @@
    sprite: Clothing/Head/Hats/hoshat.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -356,6 +365,7 @@
    sprite: Clothing/Head/Hats/surgcap_blue.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -393,6 +403,7 @@
    sprite: Clothing/Head/Hats/tophat.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -465,6 +476,7 @@
    sprite: Clothing/Head/Hats/wizardhat.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -570,6 +582,7 @@
    sprite: Clothing/Head/Hats/nursehat.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -627,6 +640,7 @@
    sprite: Clothing/Head/Hats/beret_cmo.rsi
  - type: Tag
    tags:
+    - ClothMade
    - HamsterWearable
    - WhitelistChameleon

@@ -730,6 +744,7 @@
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
+  - type: Tag

 - type: entity
  parent: ClothingHeadBase
@@ -743,5 +758,6 @@
    sprite: Clothing/Head/Hats/capcap.rsi
  - type: Tag
    tags:
+    - ClothMade
    - WhitelistChameleon
    - HamsterWearable
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -7,18 +7,6 @@
    state: icon
  - type: Clothing
    slots: [mask]
-  - type: Food
-    requiresSpecialDigestion: true
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: Fiber
-          Quantity: 10
-  - type: Tag
-    tags: 
-      - ClothMade

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -32,6 +32,7 @@
            False: {state: icon}
    - type: StaticPrice
      price: 200
+    - type: Tag

 - type: entity
  parent: ClothingShoesBootsMag
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -427,8 +427,9 @@
    mode: SensorCords
  - type: Tag
    tags:
-    - WhitelistChameleon
+    - ClothMade
    - PrisonUniform
+    - WhitelistChameleon

 - type: entity
  parent: ClothingUniformBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -507,6 +507,9 @@
          Quantity: 7
        - ReagentId: Vitamin
          Quantity: 12
+  - type: Tag
+    tags:
+      - ClothMade
 # Tastes like bun, ectoplasm.

 - type: entity
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -266,6 +266,8 @@
      path: /Audio/Voice/Moth/moth_laugh.ogg
    Chitter:
      path: /Audio/Voice/Moth/moth_chitter.ogg
+    Squeak:
+      path: /Audio/Voice/Moth/moth_squeak.ogg

 # body emotes
 - type: emoteSounds
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -124,6 +124,21 @@
   - chittered
   - chittered.
   - chittered!
+  
+- type: emote
+  id: Squeak
+  category: Vocal
+  chatMessages: [squeaks.]
+  chatTriggers:
+   - squeak
+   - squeak.
+   - squeak!
+   - squeaks
+   - squeaks.
+   - squeaks!
+   - squeaked
+   - squeaked.
+   - squeaked!

 # hand emotes
 - type: emote