From 6b2fef1ac8de3034f4f1d38c52190b6941e111f9 Mon Sep 17 00:00:00 2001 From: LankLTE <135308300+LankLTE@users.noreply.github.com> Date: Tue, 8 Aug 2023 21:05:05 -0700 Subject: [PATCH] small moth changes (#18810) * changes * fix test fail hopefully * disallow eating containers * no more eating stored stuff --- .../Nutrition/EntitySystems/FoodSystem.cs | 8 ++++++++ Resources/Audio/Voice/Moth/attributions.yml | 2 +- Resources/Audio/Voice/Moth/moth_squeak.ogg | Bin 0 -> 8676 bytes .../nutrition/components/food-component.ftl | 3 ++- .../Clothing/Head/base_clothinghead.yml | 10 ++++++++++ .../Prototypes/Entities/Clothing/Head/hats.yml | 16 ++++++++++++++++ .../Clothing/Masks/base_clothingmask.yml | 12 ------------ .../Entities/Clothing/Shoes/magboots.yml | 1 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 3 ++- .../Entities/Objects/Consumable/Food/burger.yml | 3 +++ .../Prototypes/Voice/speech_emote_sounds.yml | 2 ++ Resources/Prototypes/Voice/speech_emotes.yml | 15 +++++++++++++++ 12 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 Resources/Audio/Voice/Moth/moth_squeak.ogg diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index a65f6cdd3d..43131f5c83 100644 --- 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(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) diff --git a/Resources/Audio/Voice/Moth/attributions.yml b/Resources/Audio/Voice/Moth/attributions.yml index a705c4d00b..9c7727aa51 100644 --- 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/" \ No newline at end of file diff --git a/Resources/Audio/Voice/Moth/moth_squeak.ogg b/Resources/Audio/Voice/Moth/moth_squeak.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5b77d98e56541fa3ee34654737e9f78e0b5c58b8 GIT binary patch literal 8676 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 Sjk5^K8yUkeeT$BKhW`hii5zbL literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/nutrition/components/food-component.ftl b/Resources/Locale/en-US/nutrition/components/food-component.ftl index 4b4f0d29d8..4a6b6cf986 100644 --- 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. diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 53a5d4518b..2bc1d5ddca 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 7113495e8a..6e7e35af61 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml index b5e5a230d6..bf02642cb7 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 7d91e20c46..28700cafd9 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 7ce0bafe9e..a869f596ac 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 8b4ca3edc0..d28f1f68d8 100644 --- 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 diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 064f153bd1..3cbb0665b8 100644 --- 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 diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 8eef5d083a..c309b373c8 100644 --- 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