]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Parroting Parrots part 1: Help maints! SQUAWK! Maints! (#38243)
authorCrude Oil <124208219+CroilBird@users.noreply.github.com>
Wed, 9 Jul 2025 19:04:57 +0000 (21:04 +0200)
committerGitHub <noreply@github.com>
Wed, 9 Jul 2025 19:04:57 +0000 (12:04 -0700)
commit9ebf6a24c4ebb16a8a6202951f3eb7934bdd870b
tree5b90d6e2faf5232e1123ff0fb4ce192707b2d6ac
parente08e920c62624e636a57e2ddf19a7d2053346cdc
Parroting Parrots part 1: Help maints! SQUAWK! Maints! (#38243)

* parrots have ears. add poly

* high tech parrot functionality

* adjust times

* add accent to radio message

* don't spam everything all at once probably

* learn about the existence of prob(float)

* actually use Prob(float) correctly

* newline

* add pet spawner for poly

* move chance to talk on radio to component

* missing comment

* minor edits and doc additions

* the reviewerrrrrrr

* parrot can't learn when crit or dead

* increase default memory

* rename poly to polly

* crude way to ignore whispers. chatcode please

* This is Polly. It is set to broadcast over the engineering frequency

* add missing initialize

* add displacement map for parrot ears

* review comments - Errant

* minor things

* large rework

* fix attempting to talk when entity has no channels

* use list of active radios again to track channels

* fix bad return, some comments

* fix long learn cooldown

* minor adjustments

* use FromMinutes

* the voices told me to make these changes

* remove default reassignment

* Review changes

* remove polly's accent

* decouple radio stuff from parrotsystem

* minor stuff

* split vocalization and parroting

* minor review work

* re-add missing check

* add admin verb for clearing parrot messages

* minor action icon update

* oops

* increase icon number text size

* Admin erase parrot messages associated with players

* part 1 beck review

* add whitelist and blacklist for parrots

* Downgrade missing component error to warning

* Add comment

* add some missing comments

* Remove active radio entity tracking, use all inventory slots

* Minor changes

* small review stuff

* review radio stuff

* swap ears displacement to invisible death displacement

* remove syncsprite

* vscode why do yo have to hurt my feelings

* review changes

* use checkboth
27 files changed:
Content.Server/Administration/Systems/AdminSystem.cs
Content.Server/Animals/Components/ParrotListenerComponent.cs [new file with mode: 0644]
Content.Server/Animals/Components/ParrotMemoryComponent.cs [new file with mode: 0644]
Content.Server/Animals/Systems/ParrotMemorySystem.cs [new file with mode: 0644]
Content.Server/Radio/EntitySystems/HeadsetSystem.cs
Content.Server/Radio/RadioEvent.cs
Content.Server/Vocalization/Components/RadioVocalizerComponent.cs [new file with mode: 0644]
Content.Server/Vocalization/Components/VocalizerComponent.cs [new file with mode: 0644]
Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs [new file with mode: 0644]
Content.Server/Vocalization/Systems/VocalizationSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/animals/parrot/parrot.ftl [new file with mode: 0644]
Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Resources/Prototypes/InventoryTemplates/parrot_inventory_template.yml [new file with mode: 0644]
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
Resources/Textures/Interface/AdminActions/clear-parrot.png [new file with mode: 0644]
Resources/Textures/Mobs/Animals/parrot.rsi/parrot.png [deleted file]
Resources/Textures/Mobs/Animals/parrot/displacement.rsi/ears.png [new file with mode: 0644]
Resources/Textures/Mobs/Animals/parrot/displacement.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Mobs/Animals/parrot/parrot.rsi/dead.png [moved from Resources/Textures/Mobs/Animals/parrot.rsi/dead.png with 100% similarity]
Resources/Textures/Mobs/Animals/parrot/parrot.rsi/icon.png [moved from Resources/Textures/Mobs/Animals/parrot.rsi/icon.png with 100% similarity]
Resources/Textures/Mobs/Animals/parrot/parrot.rsi/meta.json [moved from Resources/Textures/Mobs/Animals/parrot.rsi/meta.json with 100% similarity]
Resources/Textures/Mobs/Animals/parrot/parrot.rsi/parrot.png [new file with mode: 0644]
Resources/Textures/Mobs/Animals/parrot/parrot.rsi/sit.png [moved from Resources/Textures/Mobs/Animals/parrot.rsi/sit.png with 100% similarity]