From 032315603fdbb0752a7e3db0b7ce6ec6f6709f4c Mon Sep 17 00:00:00 2001 From: WhitlyOfficial Date: Sun, 3 Dec 2023 11:47:25 +0300 Subject: [PATCH 1/4] Mousi --- .../Locale/ru-RU/ss220/interaction/mousi.ftl | 3 + .../SS220/Entities/Mobs/NPCs/mousi.yml | 189 ++++++++++++++++++ .../SS220/Mobs/Animals/mousi.rsi/crit.png | Bin 0 -> 805 bytes .../SS220/Mobs/Animals/mousi.rsi/dead.png | Bin 0 -> 811 bytes .../SS220/Mobs/Animals/mousi.rsi/meta.json | 28 +++ .../Animals/mousi.rsi/running-unshaded.png | Bin 0 -> 265 bytes .../SS220/Mobs/Animals/mousi.rsi/running.png | Bin 0 -> 2941 bytes .../SS220/Mobs/Animals/mousi.rsi/sleeping.png | Bin 0 -> 927 bytes 8 files changed, 220 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss220/interaction/mousi.ftl create mode 100644 Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml create mode 100644 Resources/Textures/SS220/Mobs/Animals/mousi.rsi/crit.png create mode 100644 Resources/Textures/SS220/Mobs/Animals/mousi.rsi/dead.png create mode 100644 Resources/Textures/SS220/Mobs/Animals/mousi.rsi/meta.json create mode 100644 Resources/Textures/SS220/Mobs/Animals/mousi.rsi/running-unshaded.png create mode 100644 Resources/Textures/SS220/Mobs/Animals/mousi.rsi/running.png create mode 100644 Resources/Textures/SS220/Mobs/Animals/mousi.rsi/sleeping.png diff --git a/Resources/Locale/ru-RU/ss220/interaction/mousi.ftl b/Resources/Locale/ru-RU/ss220/interaction/mousi.ftl new file mode 100644 index 000000000000..cfe0b20a735e --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/interaction/mousi.ftl @@ -0,0 +1,3 @@ +hugging-success-generic-mousi-others = { CAPITALIZE($user) } тянется { $target }. +hugging-failure-generic-mousi = Вы пытаетесь погладить { $target }, но она отмахивается от вас хвостом. +hugging-success-generic-mousi = Вы обнимаете { $target }. { $target } издаёт счастливый писк. diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml new file mode 100644 index 000000000000..7069108666c4 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml @@ -0,0 +1,189 @@ +# EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +- type: entity + id: LeftHandMousi + name: animal hands + parent: [PartAnimal, BaseLeftHand] + noSpawn: true + components: + - type: Sprite + sprite: Mobs/Species/Reptilian/parts.rsi + state: "l_hand" + - type: BodyPart + partType: Hand + symmetry: Left + +- type: entity + id: RightHandMousi + name: animal hands + parent: [PartAnimal, BaseRightHand] + noSpawn: true + components: + - type: Sprite + sprite: Mobs/Species/Reptilian/parts.rsi + state: "r_hand" + - type: BodyPart + partType: Hand + symmetry: Right + +- type: body + id: Mousi + name: "Mousi" + root: torso + slots: + torso: + part: TorsoAnimal + connections: + - l-hand + - r-hand + - legs + organs: + lungs: OrganAnimalLungs + stomach: OrganAnimalStomach + liver: OrganAnimalLiver + heart: OrganAnimalHeart + kidneys: OrganAnimalKidneys + l-hand: + part: LeftHandMousi + r-hand: + part: RightHandMousi + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal + +- type: inventoryTemplate + id: mousi + slots: + - name: ears + slotTexture: ears + slotFlags: EARS + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 1,2 + strippingWindowPos: 1,2 + displayName: Ears + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + displayName: ID + +- type: entity + name: Мауси + id: MobMousi + parent: SimpleMobBase + description: Пиип?... + components: + - type: NameIdentifier + - type: Stripping + - type: Strippable + - type: CombatMode + - type: Inventory + templateId: mousi + speciesId: mousi + - type: InventorySlots + - type: NpcFactionMember + factions: + - Mouse + - type: Deathgasp + - type: MobStateActions + actions: + Critical: + - ActionCritSuccumb + - ActionCritFakeDeath + - ActionCritLastWords + - type: Respirator + damage: + types: + Asphyxiation: 0.25 + damageRecovery: + types: + Asphyxiation: -0.25 + - type: Hunger + baseDecayRate: 0.1 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.40 + density: 80 + mask: + - MobMask + layer: + - MobLayer + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: InteractionPopup + successChance: 0.8 + interactSuccessString: hugging-success-generic-mousi + interactFailureString: hugging-failure-generic-mousi + messagePerceivedByOthers: hugging-success-generic-mousi-others + interactSuccessSpawn: EffectHearts + interactSuccessSound: /Audio/Animals/fox_squeak.ogg + interactFailureSound: /Audio/Effects/thudswoosh.ogg + - type: Sprite + drawdepth: Mobs + sprite: SS220/Mobs/Animals/mousi.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: running + - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] + state: running-unshaded + shader: unshaded + - type: DamageStateVisuals + rotate: true + states: + Alive: + Base: running + Critical: + Base: crit + Dead: + Base: dead + - type: MobThresholds + thresholds: + 0: Alive + 100: Critical + 200: Dead + - type: Stamina + critThreshold: 100 + - type: Bloodstream + bloodMaxVolume: 250 + - type: Hands + - type: Speech + speechSounds: Squeak + speechVerb: SmallMob + - type: Body + prototype: Mousi + requiredLegs: 1 + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeat + amount: 5 + - type: Puller + - type: Vocal + sounds: + Male: Mouse + Female: Mouse + Unsexed: Mouse + - type: GhostRole + allowMovement: true + allowSpeech: true + name: Мауси + description: Вы большая, человекоподобная мышь. + - type: GhostTakeoverAvailable diff --git a/Resources/Textures/SS220/Mobs/Animals/mousi.rsi/crit.png b/Resources/Textures/SS220/Mobs/Animals/mousi.rsi/crit.png new file mode 100644 index 0000000000000000000000000000000000000000..cc9f4e7ffa3580f21d98ef118601ae1f71cb7938 GIT binary patch literal 805 zcmV+=1KRwFP)GGw*%#=Djy-NGUl?9XV9*ZGbjF8=wvFKLB)i56;}IEEjFgU5K$1=<$Y)q1{bc zF50}gH~_%Z)RfU`%|_p4&aXYET(tRqb4>SPBoc{z0Sx^vXgsgwumVT`?((em=LG))uNb#)LU8jVT- z%d)7~>*R7dwI&*k`fQk{>3a_bgF1{4qJtK4U6p#v2$0X`B|sz+!Eqe*ZFF>$Kp?QMFTY!>*HTtWzh5C?_`hr`tD3SF^~8f)2z zB9REeU{GbR{(j}tdpZ~AF-`M8AmMNrAp}c-9%^=l{*gF+Sm2;Bl1)#m3-?Xm(J7J+M#Aw05Dc2Z>cQYcB=q7uv;lqq{4ZeC)jGz800000NkvXXu0mjfR5@^9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Mobs/Animals/mousi.rsi/dead.png b/Resources/Textures/SS220/Mobs/Animals/mousi.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..d038001966d615f342c757e98f5c59a8e43c77b0 GIT binary patch literal 811 zcmV+`1JwM9P)mYZ&#}&ai;L!hc z&)xex|KI!M{WwiZ$$9F+xw@AD$^d16GQj@;P+>h7lQEgzO48UIV$oA?z1F%9cVv1i z$;a#M0E~`~YNc|vTW`{|@s9LXk{|a5RS&JRv-3m%O}z_>FQ?>2eJcQ)o16BS!8$2( z$z7@+K4ETdPKBd3i^ z944R76OYI3oM15MsG;k+Bldc|DvSf7f)X-Kla`hi6+ni=VaJRH1_tc$N>}LW>Ou(N zfXL_brEGxG9UzfNNPvch1`NZnzxDU`pGc@a*eUEF*2D9 zfk1$zrKP`yuw<>N)}0M<$z9T0NdV2Y1`34&T2&R9Oopzbxauf|UtJJF0Pe+hn*4r0 zxs|unhI|%)`yjH+0)YTtuh$jd`tq5|`B`*bM+jlVoW)!S!J?<0TymGT-UxuS0ai!u z%Zb}9OifJz*fTB^3U<8l_z{r@cW7)5k(n4r*Yz`ZK?p%Am7@D_$ML?xGH>gRP~1BJ zv=ZsRRopwEHsk{!Ju&V$^(+{*E2&h7BmiQ?V?x#TVY+RE^dy$biuEC65o`Y;T` zu?^eS*8!;U*SVln2-Q&C!T_V5ivacnKD=H z@;7O`-?ojdU9fLvOP_=%Y2VDcAS&l)9T4i?x9*T)$VY9+r*1#1mgYK${#C|g%r2;! p9aoLN&V3M_htB$GZp@e7^UqxQ_R@|AAMk6&9=)m}W5{)CDu>F3@ZcyCCAgox!z$)dY)l urCP%ed4ta>+h literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Mobs/Animals/mousi.rsi/running.png b/Resources/Textures/SS220/Mobs/Animals/mousi.rsi/running.png new file mode 100644 index 0000000000000000000000000000000000000000..253f8806dd912fd43c72ed096410d8e7b6f3266e GIT binary patch literal 2941 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Mobs/Animals/mousi.rsi/sleeping.png b/Resources/Textures/SS220/Mobs/Animals/mousi.rsi/sleeping.png new file mode 100644 index 0000000000000000000000000000000000000000..2636e4eaae876df0541fad989345ae65daf2d4eb GIT binary patch literal 927 zcmV;Q17Q4#P)m^hXX6<62@ zIbhtFM2#@n;#{XYkl`{)R`3W zOjaw&9GAcq(SrxOkD2{_Z|2S0T}=qV>$EpstNIvV3@`==1MHgxv2PY`Yz!|m=9K{U z&4O6nTI15`FiK$GEQm{|!|K-B$T6=3AjRwUDGT=&heAm4g?o$C?bH7Z;w^b`<#vfB z4cvyqU+e1}w_3a?mqn}90^oh%lLrOr_9?NX!Ij(nx7z&x(teE^WV2ZSbX^C)^E?2) z-rgqn={f*z!vUaLt*TX6Sy|D_0cdGEJ3HEq02|g5O>P67?v2C~u}SLoDbIfRg^&04 zRJ_@2V%xS@US1}VNc7Dql}chHgb+e`u~-zo?~C2tUE%w_^5FgBTuwaB<;3~eF&x6^lkA&sb7t%`IyJu)NP zwgE_|(?j=q)cylJ+bJ?-OfwOiRJZtm=l*?t2&1UgDkBf^7B9Vy7TvodjmO|mK z7aS|?&%LkIbz&~5+WDo^=?C~|8lJb?#N%-ykqEx;qt}mc8xHCFpY>&ESr!1MX=;{b z^_`q|{oipL4zZ-s>zs2*0B)!6aOHM!8xBvu_>L)K`kzy9{OF-*o;7%}cvn5>gFhU? zF`2PxnyR&0mL=}LH>;NR`iPOZ7H*z3fZqNGOoRR!&;aJ==K)w+S^|1+!LYTzEen1- z5K?d>`X+9}QNmIzB*>I8tva9*9se1P0si*@e**zN?pG#$a{>SW002ovPDHLkV1h=3 BtpWf5 literal 0 HcmV?d00001 From 8271d3cd5bbdc76371ab6e497eabfd4d5de954a0 Mon Sep 17 00:00:00 2001 From: Whitly <98218741+WhitlyOfficial@users.noreply.github.com> Date: Sun, 3 Dec 2023 12:46:27 +0300 Subject: [PATCH 2/4] tts fix --- Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml index 7069108666c4..b360f5af4c65 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml @@ -181,6 +181,7 @@ Male: Mouse Female: Mouse Unsexed: Mouse + - type: TTS - type: GhostRole allowMovement: true allowSpeech: true From 38e04e2c151f59568e8020c3eb89985631d543eb Mon Sep 17 00:00:00 2001 From: Whitly <98218741+WhitlyOfficial@users.noreply.github.com> Date: Sun, 3 Dec 2023 12:54:40 +0300 Subject: [PATCH 3/4] tts fix 2.0 --- Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml index b360f5af4c65..2b33af5f4db5 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml @@ -181,7 +181,8 @@ Male: Mouse Female: Mouse Unsexed: Mouse - - type: TTS + - type: TTS # Corvax-TTS + voice: mana - type: GhostRole allowMovement: true allowSpeech: true From 66083fc291181453d7a9ab832e6ddcd975df1c3d Mon Sep 17 00:00:00 2001 From: Whitly <98218741+WhitlyOfficial@users.noreply.github.com> Date: Sun, 3 Dec 2023 13:09:23 +0300 Subject: [PATCH 4/4] tts fix 3.0 --- Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml index 2b33af5f4db5..508975a5924f 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/mousi.yml @@ -181,7 +181,7 @@ Male: Mouse Female: Mouse Unsexed: Mouse - - type: TTS # Corvax-TTS + - type: TTS voice: mana - type: GhostRole allowMovement: true