diff --git a/Resources/Locale/en-US/_CP14/markings/carcat-tails.ftl b/Resources/Locale/en-US/_CP14/markings/carcat-tails.ftl new file mode 100644 index 0000000000..84ffb83c15 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/markings/carcat-tails.ftl @@ -0,0 +1,2 @@ +marking-CP14CarcatTail = Tail +marking-CP14CarcatTailFluffy = Fluffy Tail diff --git a/Resources/Locale/ru-RU/_CP14/markings/carcat-tails.ftl b/Resources/Locale/ru-RU/_CP14/markings/carcat-tails.ftl new file mode 100644 index 0000000000..12a4810d66 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/markings/carcat-tails.ftl @@ -0,0 +1,2 @@ +marking-CP14CarcatTail = Хвост +marking-CP14CarcatTailFluffy = Пушистый хвост diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/carcat_tails.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/carcat_tails.yml new file mode 100644 index 0000000000..aaa210a369 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/carcat_tails.yml @@ -0,0 +1,45 @@ +- type: marking + id: CP14CarcatTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ CP14Carcat ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/carcat_tail.rsi + state: tail + +- type: marking + id: CP14CarcatTailFluffy + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ CP14Carcat ] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/carcat_tail.rsi + state: tail_fluffy + +# Animation + +- type: marking + id: CP14CarcatTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/carcat_tail.rsi + state: tail_waggin + +- type: marking + id: CP14CarcatTailFluffyAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/carcat_tail.rsi + state: tail_fluffy_waggin diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml index 57661cf828..1c3ceb1ac5 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml @@ -22,6 +22,7 @@ - type: Speech speechSounds: CP14Carcat - type: Thirst + - type: Wagging - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/_CP14/Species/carcat.yml b/Resources/Prototypes/_CP14/Species/carcat.yml index 16b41bc79f..6bf9e3c1ed 100644 --- a/Resources/Prototypes/_CP14/Species/carcat.yml +++ b/Resources/Prototypes/_CP14/Species/carcat.yml @@ -20,6 +20,7 @@ #Hair: CP14MobCarcatAnyMarking #FacialHair: CP14MobCarcatAnyMarking Snout: CP14MobCarcatMarkingMatchSkin + Tail: CP14MobCarcatMarkingMatchSkin Chest: CP14MobCarcatTorso Eyes: CP14MobCarcatEyes LArm: CP14MobCarcatLArm @@ -45,6 +46,10 @@ points: 1 required: true defaultMarkings: [ CP14CarcatNose ] + Tail: + points: 1 + required: true + defaultMarkings: [ CP14CarcatTail ] HeadTop: points: 1 required: true diff --git a/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/meta.json new file mode 100644 index 0000000000..91b757dbdc --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/meta.json @@ -0,0 +1,123 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by omsoyk (github)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "tail", + "directions": 4 + }, + { + "name": "tail_waggin", + "directions": 4, + "delays": [ + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ] + ] + }, + { + "name": "tail_fluffy", + "directions": 4 + }, + { + "name": "tail_fluffy_waggin", + "directions": 4, + "delays": [ + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ] + ] + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail.png b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail.png new file mode 100644 index 0000000000..b12952b657 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_fluffy.png b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_fluffy.png new file mode 100644 index 0000000000..3b724934dd Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_fluffy.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_fluffy_waggin.png b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_fluffy_waggin.png new file mode 100644 index 0000000000..8e3e3a6267 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_fluffy_waggin.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_waggin.png b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_waggin.png new file mode 100644 index 0000000000..f45dfcbb75 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/carcat_tail.rsi/tail_waggin.png differ