diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index d5ef700e6d..8257ed2932 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -46,7 +46,7 @@ namespace Content.Server.Nutrition.EntitySystems SubscribeLocalEvent(OnUseFoodInHand); SubscribeLocalEvent(OnFeedFood); - SubscribeLocalEvent>(AddEatVerb); + SubscribeLocalEvent>(AddEatVerb); SubscribeLocalEvent(OnFeed); SubscribeLocalEvent(OnFeedCancelled); SubscribeLocalEvent(OnInventoryIngestAttempt); @@ -235,7 +235,7 @@ namespace Content.Server.Nutrition.EntitySystems EntityManager.QueueDeleteEntity(component.Owner); } - private void AddEatVerb(EntityUid uid, FoodComponent component, GetVerbsEvent ev) + private void AddEatVerb(EntityUid uid, FoodComponent component, GetVerbsEvent ev) { if (component.CancelToken != null) return; @@ -250,7 +250,7 @@ namespace Content.Server.Nutrition.EntitySystems if (EntityManager.TryGetComponent(uid, out var mobState) && mobState.IsAlive()) return; - InteractionVerb verb = new() + AlternativeVerb verb = new() { Act = () => { diff --git a/Resources/Audio/Animals/license.txt b/Resources/Audio/Animals/license.txt index e1c05d4c72..8b94f09313 100644 --- a/Resources/Audio/Animals/license.txt +++ b/Resources/Audio/Animals/license.txt @@ -11,3 +11,5 @@ duck_quack_happy.ogg: modified from "Duck Quack - Sound Effect (HD).mp3" by free chicken_cluck_happy.ogg: modified from "Chicken Single Alarm Call" by freesound user "Rudmer_Rotteveel" (https://freesound.org/people/Rudmer_Rotteveel/sounds/316920/) licensed under CC0 1.0 (public domain). The original audio was trimmed and converted from WAV to OGG format. ferret_happy.ogg: modified from "Ferret" by freesound user "J.Zazvurek" (https://freesound.org/people/J.Zazvurek/sounds/155115/) licensed under CC BY 3.0. The original audio was trimmed and converted from WAV to OGG format. + +mouse_squeak.ogg: modified from "Cartoon - Bat / Mouse Squeak" by freesound user "Breviceps" (https://freesound.org/people/Breviceps/sounds/445958/) licensed under CC0 1.0 (public domain). The original audio was converted from WAV to OGG format. \ No newline at end of file diff --git a/Resources/Audio/Animals/mouse_squeak.ogg b/Resources/Audio/Animals/mouse_squeak.ogg new file mode 100644 index 0000000000..d6833278b8 Binary files /dev/null and b/Resources/Audio/Animals/mouse_squeak.ogg differ diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 43e40b54a2..f0a9ba4d63 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -626,9 +626,9 @@ - type: GhostTakeoverAvailable makeSentient: true name: mouse - description: A mouse in maint. + description: A hungry and mischievous mouse. - type: Sprite - drawdepth: Mobs + drawdepth: FloorObjects layers: - map: ["enum.DamageStateVisualLayers.Base"] state: mouse-0 @@ -647,9 +647,8 @@ radius: 0.2 mass: 10 mask: - - Impassable - - MobImpassable #Bullets?! - SmallImpassable + - MobImpassable layer: - Opaque - type: MobState @@ -667,6 +666,8 @@ crit: dead-0 dead: splat-0 - type: Food + - type: Hunger + baseDecayRate: 0.5 # I'm very hungry! Give me. The cheese. - type: Extractable grindableSolutionName: food - type: SolutionContainerManager @@ -687,7 +688,22 @@ tags: - Trash - type: Recyclable - - type: Actions + - type: Respirator + damage: + types: + Asphyxiation: 0.25 + damageRecovery: + types: + Asphyxiation: -0.25 + - type: Barotrauma + damage: + types: + Blunt: 0.1 + - type: HumanoidAppearance # no this doesnt make sense but its needed for vocal + - type: Vocal + # mice are gender neutral who cares + maleScream: /Audio/Animals/mouse_squeak.ogg + femaleScream: /Audio/Animals/mouse_squeak.ogg # TODO: Remove CombatMode when Prototype Composition is added - type: CombatMode combatToggleAction: