From b2997745f23471c4b333971aa1b0f5b72e344efb Mon Sep 17 00:00:00 2001 From: PursuitInAshes Date: Mon, 9 Dec 2024 19:32:23 -0700 Subject: [PATCH 1/3] Gauze Markings --- .../Mobs/Customization/Markings/gauze.yml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 8cef47e7a77..1b0d376bd61 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] #CD: Rodentia, Vulpkanins. coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] #CD: Rodentia, Vulpkanins. coloring: default: type: @@ -226,7 +226,7 @@ id: GauzeHead bodyPart: Head markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth, Vulpkanin] # CD: Vulpkanins. coloring: default: type: From 7bc010f6e6526f2f34e1eab82ad1215aa4fba41d Mon Sep 17 00:00:00 2001 From: PursuitInAshes Date: Mon, 9 Dec 2024 23:06:22 -0700 Subject: [PATCH 2/3] Typing Indicator --- .../_CD/Entities/Mobs/Species/vulpkanin.yml | 4 ++-- Resources/Prototypes/_CD/typing_indicator.yml | 6 ++++++ .../Textures/_CD/Effects/speech.rsi/meta.json | 19 +++++++++++++++++- .../_CD/Effects/speech.rsi/vulpkanin0.png | Bin 0 -> 451 bytes .../_CD/Effects/speech.rsi/vulpkanin1.png | Bin 0 -> 325 bytes .../_CD/Effects/speech.rsi/vulpkanin2.png | Bin 0 -> 324 bytes 6 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_CD/Effects/speech.rsi/vulpkanin0.png create mode 100644 Resources/Textures/_CD/Effects/speech.rsi/vulpkanin1.png create mode 100644 Resources/Textures/_CD/Effects/speech.rsi/vulpkanin2.png diff --git a/Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml index 21c993d7a86..c9a95efdefd 100644 --- a/Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/_CD/Entities/Mobs/Species/vulpkanin.yml @@ -21,8 +21,8 @@ speechSounds: Vulpkanin speechVerb: Vulpkanin allowedEmotes: [ 'Bark', 'Snarl', 'Whine', 'Howl', 'Growl' ] - # - type: TypingIndicator # If you wish to add a typing indicator, go to Textures/_CD/Effects/speech.rsi and uncomment this. - # proto: vulpkanin + - type: TypingIndicator + proto: vulpkanin - type: Vocal sounds: Male: MaleVulpkanin diff --git a/Resources/Prototypes/_CD/typing_indicator.yml b/Resources/Prototypes/_CD/typing_indicator.yml index 59a5e326f43..792ff75ee3a 100644 --- a/Resources/Prototypes/_CD/typing_indicator.yml +++ b/Resources/Prototypes/_CD/typing_indicator.yml @@ -3,3 +3,9 @@ spritePath: /Textures/_CD/Effects/speech.rsi typingState: rodentia0 offset: 0, 0.2 # 0625 + +- type: typingIndicator + id: vulpkanin + spritePath: /Textures/_CD/Effects/speech.rsi + typingState: vulpkanin0 + offset: -0.05, 0.2 \ No newline at end of file diff --git a/Resources/Textures/_CD/Effects/speech.rsi/meta.json b/Resources/Textures/_CD/Effects/speech.rsi/meta.json index b4790e1a1bd..9fca3c94a6f 100644 --- a/Resources/Textures/_CD/Effects/speech.rsi/meta.json +++ b/Resources/Textures/_CD/Effects/speech.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Rodentia sprites made by portfiend", + "copyright": "Rodentia sprites made by portfiend, Vulpkanin0-2 made by PursuitinAshes (Github) based off of https://github.com/space-wizards/space-station-14/pull/24994", "states": [ { "name": "rodentia0", @@ -23,6 +23,23 @@ }, { "name": "rodentia2" + }, + { + "name": "vulpkanin0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.5 + ] + ] + }, + { + "name": "vulpkanin1" + }, + { + "name": "vulpkanin2" } ] } diff --git a/Resources/Textures/_CD/Effects/speech.rsi/vulpkanin0.png b/Resources/Textures/_CD/Effects/speech.rsi/vulpkanin0.png new file mode 100644 index 0000000000000000000000000000000000000000..00437ca6278ebc4e0066c3970011fea3c33cf253 GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC?dAaSW-L^Y)g#_hAPKwhzlE z9pw_8)RiodwV>I1$%KV|kuslnf9d|ZX_Zn~EbwZYW5%jUj&m+8jDH}LcE2>_WZe@5`ll|R5v^7{~UU0=>yL0FL9`d{?3YxQI2K)918=FO^ z3m7Jx)0cnN8&g_e+*`AIWec;zzPkxCpGK_R?05LP=hOLD*l!(roosb=eZ#vyr`Vp{ z_Dya&X|6vp{w70u!gjqwBIyaqkF4B`waZuSXlMBF?Pp+}Mra2b9 zgChhDDfX*&hhhGIX4nNFjeM2Gq2dZz9I7<(ujc#)D~)`W#(S#IFS0mPho-$q+PQ-J zJBO#}0YK$%AB)KhoQkP5-jl!A$jyq|^$o&ybW%~)JV%e@FRx4~4xo$4t*es2qwPC} zQy9joV>78Z!16pGY=pU>-)Kzj;`5z#+?&QCp!C){L37{0000 Date: Tue, 10 Dec 2024 15:20:36 -0700 Subject: [PATCH 3/3] Fix Accidental Removal of Reptilians from ln19 --- .../Prototypes/Entities/Mobs/Customization/Markings/gauze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 1b0d376bd61..d26780d5100 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Rodentia, Vulpkanin] # CD: Rodentia, Vulpkanins. coloring: default: type: