diff --git a/Content.Shared/Interaction/RotateToFaceSystem.cs b/Content.Shared/Interaction/RotateToFaceSystem.cs index e8e915d547..cbf2987907 100644 --- a/Content.Shared/Interaction/RotateToFaceSystem.cs +++ b/Content.Shared/Interaction/RotateToFaceSystem.cs @@ -21,6 +21,7 @@ using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Random; using Robust.Shared.Serialization; +using Content.Shared.MobState.Components; namespace Content.Shared.Interaction { @@ -45,7 +46,7 @@ namespace Content.Shared.Interaction public bool TryFaceAngle(EntityUid user, Angle diffAngle) { - if (_actionBlockerSystem.CanChangeDirection(user)) + if (_actionBlockerSystem.CanChangeDirection(user) && TryComp(user, out MobStateComponent? mob) && !mob.IsIncapacitated()) { EntityManager.GetComponent(user).WorldRotation = diffAngle; return true; diff --git a/Resources/Audio/Animals/cow_moo.ogg b/Resources/Audio/Animals/cow_moo.ogg new file mode 100644 index 0000000000..66b898a1ac Binary files /dev/null and b/Resources/Audio/Animals/cow_moo.ogg differ diff --git a/Resources/Audio/Animals/fox_squeak.ogg b/Resources/Audio/Animals/fox_squeak.ogg new file mode 100644 index 0000000000..af9ba6c30f Binary files /dev/null and b/Resources/Audio/Animals/fox_squeak.ogg differ diff --git a/Resources/Audio/Animals/frog_ribbit.ogg b/Resources/Audio/Animals/frog_ribbit.ogg new file mode 100644 index 0000000000..e9edba5767 Binary files /dev/null and b/Resources/Audio/Animals/frog_ribbit.ogg differ diff --git a/Resources/Audio/Animals/goat_bah.ogg b/Resources/Audio/Animals/goat_bah.ogg new file mode 100644 index 0000000000..f53e8f566d Binary files /dev/null and b/Resources/Audio/Animals/goat_bah.ogg differ diff --git a/Resources/Audio/Animals/goose_honk.ogg b/Resources/Audio/Animals/goose_honk.ogg new file mode 100644 index 0000000000..a2865b367b Binary files /dev/null and b/Resources/Audio/Animals/goose_honk.ogg differ diff --git a/Resources/Audio/Animals/license.txt b/Resources/Audio/Animals/license.txt index 8b94f09313..0de2a75a5c 100644 --- a/Resources/Audio/Animals/license.txt +++ b/Resources/Audio/Animals/license.txt @@ -12,4 +12,27 @@ chicken_cluck_happy.ogg: modified from "Chicken Single Alarm Call" by freesound 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 +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. + +sloth_squeak.ogg: modified from "squeakfinal.wav" by freesound user "Higgs01" (https://freesound.org/people/Higgs01/sounds/428114/) licensed under CC0 1.0 (Public domain dedication). The original audio was converted from WAV to OFF format AND converted from stereo to mono. + +parrot_raught.ogg: modified and used from "Parrot 1 raught 2.wav" by freesound user "Coral_Island_Studios" (https://freesound.org/people/Coral_Island_Studios/sounds/432588/) licensed under CC BY 3.0. The original audio was converted from WAV to OGG format. + +fox_squeak.ogg: modified from "Video Game Squeak" by freesound user "Breviceps" (https://freesound.org/people/Breviceps/sounds/468442/) licensed under CC0 1.0. The original audio was converted from WAV to OGG format + +frog_ribbit.ogg: original audio created by freesound user "egomassive" (https://freesound.org/people/egomassive/sounds/536759/). licensed under licensed under CC0 1.0 + +goose_honk.ogg: modified from " Bird Honk - 1" by freesound user "SpaceJoe" (https://freesound.org/people/SpaceJoe/sounds/510940/) licensed under CC0 1.0. The originial audio was converted from WAV to OGG format. + +snake_hiss.ogg: modified from "hissing snake sound effect" by freesound user "Garuda1982" (https://freesound.org/people/Garuda1982/sounds/541656/) licensed under CC BY 4.0. The original audio was convertred from WAV to OGG format. + +The following sounds were used from youtube: + +penguin_squawk.ogg: audio is recorded/created by youtube user "ProSounds" (https://youtu.be/Anr35RbBL3Y) licensed under CC BY 3.0. The original audio was trimmed and converted from MP3 to OGG format. + +raccoon_squeak.ogg: audio is recorded by youtube user "jnargus" (https://youtu.be/BGjFP1CP7E0) licensed under CC by 3.0 + +goat_bah.ogg: audio is created by youtube user "Winry Marini" (https://youtu.be/QIhwzsk5bww) licensed under CC BY 3.0 + +lizard_happy.ogg: audio created by youtube user "Nagaty Studio" (https://youtu.be/I7CX0AS8RNI) licensed under CC by 3.0. + diff --git a/Resources/Audio/Animals/lizard_happy.ogg b/Resources/Audio/Animals/lizard_happy.ogg new file mode 100644 index 0000000000..b2c02e6d2f Binary files /dev/null and b/Resources/Audio/Animals/lizard_happy.ogg differ diff --git a/Resources/Audio/Animals/parrot_raught.ogg b/Resources/Audio/Animals/parrot_raught.ogg new file mode 100644 index 0000000000..d4472e83c9 Binary files /dev/null and b/Resources/Audio/Animals/parrot_raught.ogg differ diff --git a/Resources/Audio/Animals/penguin_squawk.ogg b/Resources/Audio/Animals/penguin_squawk.ogg new file mode 100644 index 0000000000..cffc3d57dc Binary files /dev/null and b/Resources/Audio/Animals/penguin_squawk.ogg differ diff --git a/Resources/Audio/Animals/raccoon_chatter.ogg b/Resources/Audio/Animals/raccoon_chatter.ogg new file mode 100644 index 0000000000..fde4f83f66 Binary files /dev/null and b/Resources/Audio/Animals/raccoon_chatter.ogg differ diff --git a/Resources/Audio/Animals/sloth_squeak.ogg b/Resources/Audio/Animals/sloth_squeak.ogg new file mode 100644 index 0000000000..1714571912 Binary files /dev/null and b/Resources/Audio/Animals/sloth_squeak.ogg differ diff --git a/Resources/Audio/Animals/snake_hiss.ogg b/Resources/Audio/Animals/snake_hiss.ogg new file mode 100644 index 0000000000..cdfc2229ac Binary files /dev/null and b/Resources/Audio/Animals/snake_hiss.ogg differ diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index ddc6a548d8..feef2b4edc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -43,6 +43,8 @@ successChance: 0.2 interactSuccessString: petting-success-soft-floofy interactFailureString: petting-failure-bat + interactSuccessSound: + path: /Audio/Animals/fox_squeak.ogg - type: SentienceTarget flavorKind: organic - type: Bloodstream @@ -350,8 +352,11 @@ gender: female # Here because of UdderComponent - type: InteractionPopup successChance: 0.7 + interactDelay: 2 # Avoids overlapping SFX due to spam - these SFX are a little longer than the typical 1 second. interactSuccessString: petting-success-soft-floofy interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/cow_moo.ogg - type: entity @@ -438,6 +443,8 @@ successChance: 0.2 interactSuccessString: petting-success-goat interactFailureString: petting-failure-goat + interactSuccessSound: + path: /Audio/Animals/goat_bah.ogg # Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked. - type: entity @@ -466,6 +473,8 @@ successChance: 0.1 # Yeah, good luck with that. interactSuccessString: petting-success-goose interactFailureString: petting-failure-goose + interactSuccessSound: + path: /Audio/Animals/goose_honk.ogg - type: Bloodstream bloodMaxVolume: 100 @@ -810,6 +819,8 @@ successChance: 0.3 interactSuccessString: petting-success-reptile interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg - type: Bloodstream bloodMaxVolume: 50 - type: Damageable @@ -858,6 +869,8 @@ successChance: 0.6 interactSuccessString: petting-success-frog interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/frog_ribbit.ogg - type: Bloodstream bloodMaxVolume: 50 @@ -904,6 +917,8 @@ successChance: 0.6 interactSuccessString: petting-success-bird interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/parrot_raught.ogg - type: Bloodstream bloodMaxVolume: 50 @@ -946,6 +961,8 @@ successChance: 0.5 interactSuccessString: petting-success-bird interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/penguin_squawk.ogg - type: entity name: grenade penguin @@ -1013,6 +1030,7 @@ totalIntensity: 120 - type: ExplodeOnTrigger + # I have included a snake_hiss.ogg sound file so if you want to use that be my guest - type: entity name: snake parent: SimpleMobBase @@ -1216,6 +1234,8 @@ successChance: 0.2 # Low when undomesticated. interactSuccessString: petting-success-soft-floofy interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/raccoon_chatter.ogg - type: Grammar attributes: gender: epicene @@ -1273,6 +1293,8 @@ successChance: 0.5 interactSuccessString: petting-success-soft-floofy interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/fox_squeak.ogg - type: Grammar attributes: gender: epicene diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index bed0460d0c..c4dbdf314e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -371,6 +371,8 @@ successChance: 0.9 interactSuccessString: petting-success-sloth interactFailureString: petting-failure-sloth + interactSuccessSound: + path: /Audio/Animals/sloth_squeak.ogg - type: Grammar attributes: gender: epicene