Mouse content (#7307)
This commit is contained in:
@@ -46,7 +46,7 @@ namespace Content.Server.Nutrition.EntitySystems
|
|||||||
|
|
||||||
SubscribeLocalEvent<FoodComponent, UseInHandEvent>(OnUseFoodInHand);
|
SubscribeLocalEvent<FoodComponent, UseInHandEvent>(OnUseFoodInHand);
|
||||||
SubscribeLocalEvent<FoodComponent, AfterInteractEvent>(OnFeedFood);
|
SubscribeLocalEvent<FoodComponent, AfterInteractEvent>(OnFeedFood);
|
||||||
SubscribeLocalEvent<FoodComponent, GetVerbsEvent<InteractionVerb>>(AddEatVerb);
|
SubscribeLocalEvent<FoodComponent, GetVerbsEvent<AlternativeVerb>>(AddEatVerb);
|
||||||
SubscribeLocalEvent<SharedBodyComponent, FeedEvent>(OnFeed);
|
SubscribeLocalEvent<SharedBodyComponent, FeedEvent>(OnFeed);
|
||||||
SubscribeLocalEvent<ForceFeedCancelledEvent>(OnFeedCancelled);
|
SubscribeLocalEvent<ForceFeedCancelledEvent>(OnFeedCancelled);
|
||||||
SubscribeLocalEvent<InventoryComponent, IngestionAttemptEvent>(OnInventoryIngestAttempt);
|
SubscribeLocalEvent<InventoryComponent, IngestionAttemptEvent>(OnInventoryIngestAttempt);
|
||||||
@@ -235,7 +235,7 @@ namespace Content.Server.Nutrition.EntitySystems
|
|||||||
EntityManager.QueueDeleteEntity(component.Owner);
|
EntityManager.QueueDeleteEntity(component.Owner);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AddEatVerb(EntityUid uid, FoodComponent component, GetVerbsEvent<InteractionVerb> ev)
|
private void AddEatVerb(EntityUid uid, FoodComponent component, GetVerbsEvent<AlternativeVerb> ev)
|
||||||
{
|
{
|
||||||
if (component.CancelToken != null)
|
if (component.CancelToken != null)
|
||||||
return;
|
return;
|
||||||
@@ -250,7 +250,7 @@ namespace Content.Server.Nutrition.EntitySystems
|
|||||||
if (EntityManager.TryGetComponent<MobStateComponent>(uid, out var mobState) && mobState.IsAlive())
|
if (EntityManager.TryGetComponent<MobStateComponent>(uid, out var mobState) && mobState.IsAlive())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
InteractionVerb verb = new()
|
AlternativeVerb verb = new()
|
||||||
{
|
{
|
||||||
Act = () =>
|
Act = () =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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.
|
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.
|
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.
|
||||||
BIN
Resources/Audio/Animals/mouse_squeak.ogg
Normal file
BIN
Resources/Audio/Animals/mouse_squeak.ogg
Normal file
Binary file not shown.
@@ -626,9 +626,9 @@
|
|||||||
- type: GhostTakeoverAvailable
|
- type: GhostTakeoverAvailable
|
||||||
makeSentient: true
|
makeSentient: true
|
||||||
name: mouse
|
name: mouse
|
||||||
description: A mouse in maint.
|
description: A hungry and mischievous mouse.
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
drawdepth: Mobs
|
drawdepth: FloorObjects
|
||||||
layers:
|
layers:
|
||||||
- map: ["enum.DamageStateVisualLayers.Base"]
|
- map: ["enum.DamageStateVisualLayers.Base"]
|
||||||
state: mouse-0
|
state: mouse-0
|
||||||
@@ -647,9 +647,8 @@
|
|||||||
radius: 0.2
|
radius: 0.2
|
||||||
mass: 10
|
mass: 10
|
||||||
mask:
|
mask:
|
||||||
- Impassable
|
|
||||||
- MobImpassable #Bullets?!
|
|
||||||
- SmallImpassable
|
- SmallImpassable
|
||||||
|
- MobImpassable
|
||||||
layer:
|
layer:
|
||||||
- Opaque
|
- Opaque
|
||||||
- type: MobState
|
- type: MobState
|
||||||
@@ -667,6 +666,8 @@
|
|||||||
crit: dead-0
|
crit: dead-0
|
||||||
dead: splat-0
|
dead: splat-0
|
||||||
- type: Food
|
- type: Food
|
||||||
|
- type: Hunger
|
||||||
|
baseDecayRate: 0.5 # I'm very hungry! Give me. The cheese.
|
||||||
- type: Extractable
|
- type: Extractable
|
||||||
grindableSolutionName: food
|
grindableSolutionName: food
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
@@ -687,7 +688,22 @@
|
|||||||
tags:
|
tags:
|
||||||
- Trash
|
- Trash
|
||||||
- type: Recyclable
|
- 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
|
# TODO: Remove CombatMode when Prototype Composition is added
|
||||||
- type: CombatMode
|
- type: CombatMode
|
||||||
combatToggleAction:
|
combatToggleAction:
|
||||||
|
|||||||
Reference in New Issue
Block a user