diff --git a/Resources/Audio/_CP14/Animals/attributions.yml b/Resources/Audio/_CP14/Animals/attributions.yml index 40e12e1430..9e92d865f1 100644 --- a/Resources/Audio/_CP14/Animals/attributions.yml +++ b/Resources/Audio/_CP14/Animals/attributions.yml @@ -67,3 +67,8 @@ license: "CC-BY-4.0" copyright: 'by iainmccurdy of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/iainmccurdy/sounds/743820/" + +- files: ["flem1.ogg, flem2.ogg, flem3.ogg"] + license: "CC0-1.0" + copyright: 'by muckypete7 of Freesound.org. Cropped and mixed from stereo to mono.' + source: "https://freesound.org/people/mucky_pete7/sounds/574208/" diff --git a/Resources/Audio/_CP14/Animals/flem1.ogg b/Resources/Audio/_CP14/Animals/flem1.ogg new file mode 100644 index 0000000000..fb2fe01588 Binary files /dev/null and b/Resources/Audio/_CP14/Animals/flem1.ogg differ diff --git a/Resources/Audio/_CP14/Animals/flem2.ogg b/Resources/Audio/_CP14/Animals/flem2.ogg new file mode 100644 index 0000000000..f2347e9b4c Binary files /dev/null and b/Resources/Audio/_CP14/Animals/flem2.ogg differ diff --git a/Resources/Audio/_CP14/Animals/flem3.ogg b/Resources/Audio/_CP14/Animals/flem3.ogg new file mode 100644 index 0000000000..8a2d6855ed Binary files /dev/null and b/Resources/Audio/_CP14/Animals/flem3.ogg differ diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl index 8d49bea216..d4f4905706 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl @@ -24,6 +24,7 @@ cp14-modifier-air-lily = air lilies cp14-modifier-shadow-kudzu = spreading astral haze cp14-modifier-night = darkness cp14-modifier-spiders = spider's web +cp14-modifier-flem = flemings cp14-modifier-storm = storm cp14-modifier-fire-storm = fire storm diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml index 6296a2a7d9..a9f3db186d 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml @@ -17,3 +17,28 @@ - type: ClothingSpeedModifier walkModifier: 0.95 sprintModifier: 0.95 + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadFishMask + name: fish mask + description: SALUTATIONS!!! + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Produced/Armor/fish_mask.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Produced/Armor/fish_mask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Cold: 0.92 + - type: FactionClothing + faction: CP14Fishies + - type: HideLayerClothing + slots: + - Hair + - type: TypingIndicatorClothing + proto: alien + - type: IdentityBlocker + - type: IngestionBlocker diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml index 596f76d979..a743c47f75 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -121,3 +121,4 @@ #- type: Construction # graph: CP14StrawHat # node: cp14headstrawhat + diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml index bc08a0a968..ec0f48312e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml @@ -102,3 +102,5 @@ - type: Clothing sprite: _CP14/Clothing/OuterClothing/Roles/General/purple.rsi + + diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml index 75f709b0c4..f361880065 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml @@ -55,3 +55,22 @@ Slash: 0.80 Piercing: 0.90 +- type: entity + parent: CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingFish + name: fish suit + description: smells horible.... + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/fish_suit.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/fish_suit.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Cold: 0.9 + Slash: 0.92 + - type: FactionClothing + faction: CP14Fishies + diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml index 503847f332..8571450808 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml @@ -209,3 +209,17 @@ range: 2, 3 children: - id: CP14MobSlimeBase + +- type: entity + parent: CP14BaseMobGroupSpawner + id: CP14MobGroupSpawnerFlem + suffix: 2-3 Flems + components: + - type: EntityTableSpawner + deleteSpawnerAfterSpawn: false + offset: 1 + table: !type:GroupSelector + rolls: !type:RangeNumberSelector + range: 1, 3 + children: + - id: CP14MobMonsterFlem diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml index 60a5f2584a..1dd001c5c0 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml @@ -188,3 +188,19 @@ - type: ConditionalSpawner prototypes: - CP14MobMonsterInvisibleWhistler + +- type: entity + name: flem spawner + id: CP14SpawnMobMonsterFlem + parent: MarkerBase + categories: [ ForkFiltered ] + components: + - type: Sprite + layers: + - sprite: Markers/cross.rsi + state: green + - sprite: _CP14/Mobs/Monster/flem.rsi + state: flem_live + - type: ConditionalSpawner + prototypes: + - CP14MobMonsterFlem diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml new file mode 100644 index 0000000000..bd111c5a59 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml @@ -0,0 +1,100 @@ +- type: entity + id: CP14MobMonsterFlem + parent: CP14SimpleMobBase + name: Flem + description: an odd looking fish standing on two stubby legs. you know what that means... + categories: [ ForkFiltered ] + components: + - type: HTN + rootTask: + task: CP14MonsterCompound + blackboard: + NavSmash: !type:Bool + true + VisionRadius: !type:Single + 3 + AggroVisionRadius: !type:Single + 1 + - type: NpcFactionMember + factions: + - CP14Fishies + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: _CP14/Mobs/Monster/flem.rsi + state: flem_live + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.20 + density: 100 + mask: + - MobMask + layer: + - MobLayer + - type: Appearance + - type: Body + prototype: Animal + - type: MobThresholds + thresholds: + 0: Alive + 30: Dead + - type: Stamina + critThreshold: 200 + - type: CombatMode + - type: MeleeWeapon + angle: 0 + animation: WeaponArcPunch + damage: + types: + Blunt: 8 + Structural: 20 + - type: MovementSpeedModifier + baseWalkSpeed: 2.6 + baseSprintSpeed: 2.6 + - type: DamageStateVisuals + states: + Alive: + Base: flem_live + Dead: + Base: flem_dead + - type: Butcherable + spawned: + - id: CP14FoodMeatFlemHead + amount: 1 + - id: CP14FoodMeatFlemTorso + amount: 1 + - id: CP14FoodMeatFlemLeg + amount: 2 + prob: 0.6 + - type: Bloodstream + bloodMaxVolume: 200 + bloodReagent: CP14BloodAnimal + - type: Grammar + attributes: + gender: epicene + - type: TypingIndicator + proto: alien + - type: CP14MagicCasterSlowdown + - type: CP14MagicEnergyContainer + magicAlert: CP14MagicEnergy + maxEnergy: 100 + energy: 100 + - type: CP14MagicEnergyDraw + energy: 2 + delay: 4 + - type: SpamEmitSound + minInterval: 10 + maxInterval: 30 + sound: + collection: CP14Flem + params: + variation: 0.125 + - type: SoundWhileAlive + - type: Tag + tags: + - FootstepSound + - CP14Mosquito diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml index 9945de8b2e..8c28950142 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml @@ -930,3 +930,235 @@ entries: - temperatureRange: 400, 500 transformTo: CP14Ash1 + + #Flem meat + +- type: entity + id: CP14FoodMeatFlemHead + parent: CP14FoodMeatBase + name: raw flem head + description: honestly looks quite tasty + components: + - type: FlavorProfile + flavors: + - fishy + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: flem_head + - type: Item + size: Large + shape: + - 0,0,1,1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: UncookedAnimalProteins + Quantity: 18 + - ReagentId: Fat + Quantity: 5 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14FoodMeatFlemHeadCooked + +- type: entity + id: CP14FoodMeatFlemHeadCooked + parent: CP14FoodMeatFlemHead + name: cooked flem head + components: + - type: Sprite + state: flem_head_cooked + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Protein + Quantity: 18 + - ReagentId: Fat + Quantity: 5 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14Ash1 + +- type: entity + id: CP14FoodMeatFlemTorso + parent: CP14FoodMeatBase + name: raw flem torso + description: seems to be hollow + components: + - type: FlavorProfile + flavors: + - fishy + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: flem_torso + - type: SliceableFood + count: 3 + slice: CP14FoodMeatFlemTorsoCut + - type: Item + size: Large + shape: + - 0,0,1,1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: UncookedAnimalProteins + Quantity: 24 + - ReagentId: Fat + Quantity: 2 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14FoodMeatFlemTorsoCooked + +- type: entity + id: CP14FoodMeatFlemTorsoCooked + parent: CP14FoodMeatFlemTorso + name: cooked flem torso + components: + - type: Sprite + state: flem_torso_cooked + - type: SliceableFood + count: 3 + slice: CP14FoodMeatFlemTorsoCookedCut + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Protein + Quantity: 24 + - ReagentId: Fat + Quantity: 2 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14Ash1 + +- type: entity + id: CP14FoodMeatFlemTorsoCut + parent: CP14FoodMeatSliceBase + name: raw flem ring + description: onions not included + components: + - type: FlavorProfile + flavors: + - fishy + - type: Item + size: Small + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/meat.rsi + layers: + - state: flem_torso_cut + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: UncookedAnimalProteins + Quantity: 5 + - ReagentId: Fat + Quantity: 0.5 + - type: Tag + tags: + - CP14RawMeatSlice + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14FoodMeatFlemTorsoCookedCut + +- type: entity + id: CP14FoodMeatFlemTorsoCookedCut + parent: CP14FoodMeatFlemTorsoCut + name: fishy rings + components: + - type: Sprite + layers: + - state: flem_torso_cut_cooked + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 5 + - ReagentId: Fat + Quantity: 0.5 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14Ash1 + +- type: entity + id: CP14FoodMeatFlemLeg + parent: CP14FoodMeatBase + name: raw flem leg + description: probally not the best part to eat. but you never know until you try + components: + - type: FlavorProfile + flavors: + - fishy + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: flem_leg + - type: Item + size: Tiny + shape: + - 0,0,0,0 + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 0.2 + - ReagentId: UncookedAnimalProteins + Quantity: 5 + - ReagentId: Fat + Quantity: 0.1 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14FoodMeatFlemLegCooked + +- type: entity + id: CP14FoodMeatFlemLegCooked + parent: CP14FoodMeatFlemLeg + name: fish sticks + description: like freis. but fish! + components: + - type: Sprite + state: flem_leg_cooked + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 0.2 + - ReagentId: UncookedAnimalProteins + Quantity: 5 + - ReagentId: Fat + Quantity: 0.1 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14Ash1 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml index 052923805c..fabfb73637 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml @@ -72,6 +72,25 @@ minGroupSize: 2 maxGroupSize: 3 +- type: cp14DemiplaneModifier + id: EnemyFlem + levels: + min: 1 + max: 8 + name: cp14-modifier-flem + generationWeight: 0.33 + categories: + Danger: 0.25 + requiredTags: + - CP14DemiplaneOpenSky + - CP14DemiplaneHerbals + layers: + - !type:CP14OreDunGen + entity: CP14MobMonsterFlem + count: 3 + minGroupSize: 3 + maxGroupSize: 4 + # TIER 2 - type: cp14DemiplaneModifier @@ -256,3 +275,4 @@ maxGroupSize: 15 + diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml index 62d8e729de..76d48b733b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml @@ -43,3 +43,21 @@ protoId: CP14FoodPumpkinSlice count: 5 result: CP14FoodPiePumpkinRaw + +# preobaly just a placeholder until we get actaul fish + +- type: CP14Recipe + id: CP14FoodPieFishRaw + tag: CP14RecipeCooking + craftTime: 5 + requirements: + - !type:ProtoIdResource + protoId: CP14PlatePie + - !type:ProtoIdResource + protoId: CP14FoodDoughMediumFlat + - !type:ProtoIdResource + protoId: CP14FoodMeatFlemTorso + - !type:ProtoIdResource + protoId: CP14FoodMeatFlemLeg + count: 2 + result: CP14FoodPieFishRaw diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index a630151e0f..17f01d9208 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -251,6 +251,34 @@ count: 2 result: CP14ClothingPantsMercenaryTrousers +- type: CP14Recipe + id: CP14ClothingOuterClothingFish + tag: CP14RecipeSewing + craftTime: 4 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodMeatFlemTorso + - !type:ProtoIdResource + protoId: CP14String + - !type:StackResource + stack: CP14Cloth + count: 3 + result: CP14ClothingOuterClothingFish + +- type: CP14Recipe + id: CP14ClothingHeadFishMask + tag: CP14RecipeSewing + craftTime: 5 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodMeatFlemHead + - !type:ProtoIdResource + protoId: CP14String + - !type:StackResource + stack: CP14Cloth + count: 2 + result: CP14ClothingHeadFishMask + # Misc - type: CP14Recipe diff --git a/Resources/Prototypes/_CP14/SoundCollections/animals.yml b/Resources/Prototypes/_CP14/SoundCollections/animals.yml index 60103c7d1c..af741fe249 100644 --- a/Resources/Prototypes/_CP14/SoundCollections/animals.yml +++ b/Resources/Prototypes/_CP14/SoundCollections/animals.yml @@ -11,3 +11,11 @@ - /Audio/_CP14/Animals/frog1.ogg - /Audio/_CP14/Animals/frog2.ogg - /Audio/_CP14/Animals/frog3.ogg + +- type: soundCollection + id: CP14Flem + files: + - /Audio/_CP14/Animals/flem1.ogg + - /Audio/_CP14/Animals/flem2.ogg + - /Audio/_CP14/Animals/flem3.ogg + - /Audio/_CP14/Effects/bubbles.ogg diff --git a/Resources/Prototypes/_CP14/ai_factions.yml b/Resources/Prototypes/_CP14/ai_factions.yml index f8375b7f1d..85b02a011b 100644 --- a/Resources/Prototypes/_CP14/ai_factions.yml +++ b/Resources/Prototypes/_CP14/ai_factions.yml @@ -7,6 +7,7 @@ - CP14Monster - CP14Insects - CP14Slimes + - CP14Fishies - type: npcFaction id: CP14HostileEveryone @@ -17,6 +18,7 @@ - CP14AggressiveAnimals - CP14Monster - CP14Slimes + - CP14Fishies - type: npcFaction id: CP14Undead @@ -25,6 +27,7 @@ - CP14HostileEveryone - CP14PeacefulAnimals - CP14AggressiveAnimals + - CP14Fishies - type: npcFaction id: CP14PeacefulAnimals @@ -41,6 +44,7 @@ - CP14Monster - CP14Slimes - CP14HostileEveryone + - CP14Fishies - type: npcFaction id: CP14Monster @@ -56,6 +60,7 @@ - CP14Adventurers - CP14AggressiveAnimals - CP14PeacefulAnimals + - CP14Fishies - type: npcFaction id: CP14Slimes @@ -64,3 +69,13 @@ - CP14HostileEveryone - CP14PeacefulAnimals - CP14AggressiveAnimals + +- type: npcFaction + id: CP14Fishies + hostile: + - CP14Adventurers + - CP14HostileEveryone + - CP14PeacefulAnimals + - CP14AggressiveAnimals + - CP14Insects + - CP14Undead diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET-carcat.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET-carcat.png new file mode 100644 index 0000000000..4c66761572 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET-carcat.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET-goblin.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET-goblin.png new file mode 100644 index 0000000000..00c468d1d3 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..1f90f622b1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/icon.png new file mode 100644 index 0000000000..8397aaf22f Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/meta.json new file mode 100644 index 0000000000..c2910829fc --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Produced/Armor/fish_mask.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Frogoo", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-carcat", + "directions": 4 + }, + { + "name": "equipped-HELMET-goblin", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING-carcat.png b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING-carcat.png new file mode 100644 index 0000000000..d79f9316ee Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING-carcat.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING-goblin.png b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING-goblin.png new file mode 100644 index 0000000000..2dbbd9cace Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..0e828e19c5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/icon.png new file mode 100644 index 0000000000..844ce06d7b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/meta.json new file mode 100644 index 0000000000..2d9be1ca9e --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/fish_suit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Frogoo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-carcat", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-goblin", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/flem_dead.png b/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/flem_dead.png new file mode 100644 index 0000000000..4e8e022637 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/flem_dead.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/flem_live.png b/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/flem_live.png new file mode 100644 index 0000000000..3179d6ae7c Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/flem_live.png differ diff --git a/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/meta.json new file mode 100644 index 0000000000..3b8f438424 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Monster/flem.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by Frogoo (discord)", + "states": [ + { + "name": "flem_live", + "directions": 4 + }, + { + "name": "flem_dead" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_head.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_head.png new file mode 100644 index 0000000000..f561b1ea90 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_head.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_head_cooked.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_head_cooked.png new file mode 100644 index 0000000000..73414215c2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_head_cooked.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_leg.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_leg.png new file mode 100644 index 0000000000..a754176833 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_leg.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_leg_cooked.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_leg_cooked.png new file mode 100644 index 0000000000..017492542f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_leg_cooked.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso.png new file mode 100644 index 0000000000..10c9c8940d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cooked.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cooked.png new file mode 100644 index 0000000000..344eb30815 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cooked.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cut.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cut.png new file mode 100644 index 0000000000..6b5baabd77 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cut.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cut_cooked.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cut_cooked.png new file mode 100644 index 0000000000..11b106e901 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/flem_torso_cut_cooked.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json index 8c9437e21a..6713b24a90 100644 --- a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json @@ -147,6 +147,30 @@ }, { "name": "different_meat_slice" + }, + { + "name": "flem_head" + }, + { + "name": "flem_head_cooked" + }, + { + "name": "flem_torso" + }, + { + "name": "flem_torso_cut" + }, + { + "name": "flem_torso_cut_cooked" + }, + { + "name": "flem_torso_cooked" + }, + { + "name": "flem_leg" + }, + { + "name": "flem_leg_cooked" } ] } \ No newline at end of file