diff --git a/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/attributions.yml b/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/attributions.yml new file mode 100644 index 00000000000..66a092dbfd1 --- /dev/null +++ b/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/attributions.yml @@ -0,0 +1,4 @@ +- files: ["resomi_2, resomi_2_ask, resomi_2_exclaim"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from Steam 'Avali sounds' mod / Starbound. Made by Steam user: https://steamcommunity.com/id/Nefuki with permission." + source: "https://steamcommunity.com/sharedfiles/filedetails/?id=3164757879" \ No newline at end of file diff --git a/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2.ogg b/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2.ogg new file mode 100644 index 00000000000..9975f7b1618 Binary files /dev/null and b/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2.ogg differ diff --git a/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2_ask.ogg b/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2_ask.ogg new file mode 100644 index 00000000000..f3d2e934d1c Binary files /dev/null and b/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2_ask.ogg differ diff --git a/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2_exclaim.ogg b/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2_exclaim.ogg new file mode 100644 index 00000000000..ee59e1ed157 Binary files /dev/null and b/Resources/Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2_exclaim.ogg differ diff --git a/Resources/Locale/en-US/_corvaxnext/abilitties/agillity.ftl b/Resources/Locale/en-US/_corvaxnext/abilitties/agillity.ftl new file mode 100644 index 00000000000..6db8034f909 --- /dev/null +++ b/Resources/Locale/en-US/_corvaxnext/abilitties/agillity.ftl @@ -0,0 +1,4 @@ +agility-activated-massage = ability On. +agility-deactivated-massage = ability Off. + + diff --git a/Resources/Locale/en-US/_corvaxnext/abilitties/listen-up.ftl b/Resources/Locale/en-US/_corvaxnext/abilitties/listen-up.ftl new file mode 100644 index 00000000000..f365a5fbe05 --- /dev/null +++ b/Resources/Locale/en-US/_corvaxnext/abilitties/listen-up.ftl @@ -0,0 +1,3 @@ +listen-up-activated-massage = {$name} freezes, listening. + + diff --git a/Resources/Locale/en-US/_corvaxnext/accessories/resomi-hair.ftl b/Resources/Locale/en-US/_corvaxnext/accessories/resomi-hair.ftl new file mode 100644 index 00000000000..763a2557a0b --- /dev/null +++ b/Resources/Locale/en-US/_corvaxnext/accessories/resomi-hair.ftl @@ -0,0 +1,18 @@ +marking-HairResomiBackstrafe = Resomi Backstrafe +marking-HairResomiBurstShort = Resomi Burst Short +marking-HairResomiDefault = Resomi Default +marking-HairResomiDroopy = Resomi Droopy +marking-HairResomiEars = Resomi Ears +marking-HairResomiFluffymohawk = Resomi Fluffymohawk +marking-HairResomiHedge = Resomi Hedge +marking-HairResomiLongway = Resomi Longway +marking-HairResomiMane = Resomi Mane +marking-HairResomiManeBeardless = Resomi Mane Beardless +marking-HairResomiMohawk = Resomi Mohawk +marking-HairResomiMushroom = Resomi Mushroom +marking-HairResomiNotree = Resomi Notree +marking-HairResomiSpiky = Resomi Spiky +marking-HairResomiPointy = Resomi Pointy +marking-HairResomiTwies = Resomi Twies +marking-HairResomiUpright = Resomi Upright +marking-HairResomiLong = Resomi Long diff --git a/Resources/Locale/en-US/_corvaxnext/markings/resomi.ftl b/Resources/Locale/en-US/_corvaxnext/markings/resomi.ftl new file mode 100644 index 00000000000..d3bbd84ffb4 --- /dev/null +++ b/Resources/Locale/en-US/_corvaxnext/markings/resomi.ftl @@ -0,0 +1,29 @@ +marking-ResomiTail = Resomi Tail +marking-ResomiTail-tail = Resomi Tail + +marking-ResomiTailFeathers = Resomi Tail feathers +marking-ResomiTailFeathers-tail_feathers = Resomi Tail feathers + +marking-ResomiLArmFeathers = Resomi Left arm feathers +marking-ResomiLArmFeathers-l_hand_feathers = Resomi Left arm feathers + +marking-ResomiLLegFeathers = Resomi Left leg feathers +marking-ResomiLLegFeathers-l_foot_feathers = Resomi Left leg feathers + +marking-ResomiRArmFeathers = Resomi Right arm feathers +marking-ResomiRArmFeathers-r_hand_feathers = Resomi Right arm feathers + +marking-ResomiRLegFeathers = Resomi Right leg feathers +marking-ResomiRLegFeathers-r_foot_feathers = Resomi Right leg feathers + +marking-ResomiFluff = Resomi Fluff +marking-ResomiFluff-fluff = Resomi Fluff + +marking-ResomiFluffHead = Resomi Fluff head +marking-ResomiFluffHead-fluff_head = Resomi Fluff head + + +marking-ResomiFluffHeadUp = Resomi Fluff head (Up) +marking-ResomiFluffHeadUp-fluff_head_up = Resomi Fluff head (Up) + + diff --git a/Resources/Locale/en-US/_corvaxnext/reagents/biological.ftl b/Resources/Locale/en-US/_corvaxnext/reagents/biological.ftl new file mode 100644 index 00000000000..f96206e1d16 --- /dev/null +++ b/Resources/Locale/en-US/_corvaxnext/reagents/biological.ftl @@ -0,0 +1,3 @@ +reagent-name-resomi-blood = Purple Blood. +reagent-desc-resomi-blood = Thick liquid with a pungent ammonia odor. + diff --git a/Resources/Locale/ru-RU/_corvaxnext/reagents/biological.ftl b/Resources/Locale/ru-RU/_corvaxnext/reagents/biological.ftl index 09a5f4ebf3a..f2994273b4d 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/reagents/biological.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/reagents/biological.ftl @@ -1,4 +1,4 @@ -reagent-name-resomi-blood = Фиолетовая кровь -reagent-desc-resomi-blood = Густая жидкость с резким аммиачным запахом +reagent-name-resomi-blood = Фиолетовая кровь. +reagent-desc-resomi-blood = Густая жидкость с резким аммиачным запахом. diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 11ca0497fb8..88a5e1170e0 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -4,6 +4,7 @@ id: EventHumanoid # start-backmen: species speciesBlacklist: + - Resomi - Monkey - Kobold # end-backmen: species diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml index 98d0368ed6e..a88108bf7dc 100644 --- a/Resources/Prototypes/Traits/speech.yml +++ b/Resources/Prototypes/Traits/speech.yml @@ -13,6 +13,7 @@ - type: MothAccent - type: ReplacementAccent accent: dwarf + - type: ResomiAccent #Corvax-Next-Resomi # 1 Cost diff --git a/Resources/Prototypes/_CorvaxNext/Body/Organs/resomi.yml b/Resources/Prototypes/_CorvaxNext/Body/Organs/resomi.yml index 176722ca1cb..8b137891791 100644 --- a/Resources/Prototypes/_CorvaxNext/Body/Organs/resomi.yml +++ b/Resources/Prototypes/_CorvaxNext/Body/Organs/resomi.yml @@ -1,36 +1 @@ -- type: entity - id: OrganResomiLungs - parent: BaseHumanOrgan - name: lungs - description: "An advanced pair of avian lungs. Filters oxygen by way of moving air constantly through air sacs." - components: - - type: Sprite - layers: - - state: lung-l - - state: lung-r - - type: Lung - - type: Organ - slotId: lungs - - type: Metabolizer - updateInterval: 2.0 - removeEmpty: true - solutionOnBody: false - solution: "Lung" - metabolizerTypes: [ Human ] - groups: - - id: Gas - rateModifier: 200.0 - - type: SolutionContainerManager - solutions: - organ: - reagents: - - ReagentId: Nutriment - Quantity: 10 - Lung: - maxVol: 100.0 - canReact: false - food: - maxVol: 5 - reagents: - - ReagentId: UncookedAnimalProteins - Quantity: 5 + diff --git a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/resomi.yml b/Resources/Prototypes/_CorvaxNext/Body/Prototypes/resomi.yml index 1d27eedd639..d1bdf1f7800 100644 --- a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/resomi.yml +++ b/Resources/Prototypes/_CorvaxNext/Body/Prototypes/resomi.yml @@ -20,7 +20,7 @@ - head organs: heart: OrganHumanHeart - lungs: OrganResomiLungs + lungs: OrganHumanLungs stomach: OrganAnimalStomach liver: OrganAnimalLiver kidneys: OrganAnimalKidneys diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml b/Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml index b967332d098..e2f417ac11a 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml @@ -41,8 +41,8 @@ shape: !type:PhysShapeCircle radius: 0.35 - # they r smaller - density: 120 + # they r very small + density: 60 restitution: 0.0 mask: - MobMask @@ -91,15 +91,17 @@ 230: 0.4 - type: ThermalRegulator normalBodyTemperature: 300.15 + - type: Speech + speechSounds: Resomi - type: Vocal sounds: Male: MaleResomi Female: FemaleResomi Unsexed: MaleResomi - #- type: Respirator - # damage: - # types: - # Asphyxiation: 1.0 + - type: Respirator + damage: + types: + Asphyxiation: 1.0 damageRecovery: types: Asphyxiation: -1.0 diff --git a/Resources/Prototypes/_CorvaxNext/Voice/speech_sounds.yml b/Resources/Prototypes/_CorvaxNext/Voice/speech_sounds.yml new file mode 100644 index 00000000000..892d154fe20 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Voice/speech_sounds.yml @@ -0,0 +1,8 @@ +- type: speechSounds + id: Resomi + saySound: + path: /Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2.ogg + askSound: + path: /Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2_ask.ogg + exclaimSound: + path: /Audio/_CorvaxNext/Voice/Resomi/Speech/resomi_2_exclaim.ogg \ No newline at end of file