diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl index 2c4f168b7d..2c1097f33b 100644 --- a/Resources/Locale/en-US/accent/accents.ftl +++ b/Resources/Locale/en-US/accent/accents.ftl @@ -73,6 +73,7 @@ accent-words-mothroach-1 = Squeak! accent-words-mothroach-2 = Chirp! accent-words-mothroach-3 = Peep! accent-words-mothroach-4 = Eeee! + accent-words-mothroach-5 = Eep! # Kangaroo @@ -87,3 +88,27 @@ accent-words-slimes-2 = Blimpuf? accent-words-slimes-3 = Blump! accent-words-slimes-4 = Bluuump... accent-words-slimes-5 = Blabl blump! + +## Parkstation +# Slimecat +accent-words-slimecat-1 = Squish. +accent-words-slimecat-2 = Splort. +accent-words-slimecat-3 = Meow! +accent-words-slimecat-4 = Mew! +accent-words-slimecat-5 = Mow. + +# Shiro +accent-words-shiro-1 = Shiro. +accent-words-shiro-2 = Shiro! +accent-words-shiro-3 = Meow! +accent-words-shiro-4 = Squish. +accent-words-shiro-5 = Squish! + +# problems +accent-words-problems-1 = Meow! +accent-words-problems-2 = Mew. +accent-words-problems-3 = problems. +accent-words-problems-4 = Squish! +accent-words-problems-5 = Gurgle. +accent-words-problems-6 = Merp. +accent-words-problems-7 = uwu. \ No newline at end of file diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl index 4ca8b5f8b0..d00e8ecd42 100644 --- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl @@ -25,6 +25,7 @@ petting-success-dragon = Dodging teeth, claws, and flames, you pet {THE($target) petting-success-hamster = You pet {THE($target)} on {POSS-ADJ($target)} fluffy little head. petting-success-bear = You reluctantly pet {THE($target)} on {POSS-ADJ($target)} mystical head. petting-success-slimes = You pet {THE($target)} on {POSS-ADJ($target)} mucous surface. +petting-success-slime = You pet {THE($target)} on {POSS-ADJ($target)} slimy little head. petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you. diff --git a/Resources/Prototypes/SimpleStation14/Accents/full_replacements.yml b/Resources/Prototypes/SimpleStation14/Accents/full_replacements.yml new file mode 100644 index 0000000000..f073859605 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Accents/full_replacements.yml @@ -0,0 +1,28 @@ +- type: accent + id: slimecat + fullReplacements: + - accent-words-slimecat-1 + - accent-words-slimecat-2 + - accent-words-slimecat-3 + - accent-words-slimecat-4 + - accent-words-slimecat-5 + +- type: accent + id: shiro + fullReplacements: + - accent-words-shiro-1 + - accent-words-shiro-2 + - accent-words-shiro-3 + - accent-words-shiro-4 + - accent-words-shiro-5 + +- type: accent + id: problems + fullReplacements: + - accent-words-problems-1 + - accent-words-problems-2 + - accent-words-problems-3 + - accent-words-problems-4 + - accent-words-problems-5 + - accent-words-problems-6 + - accent-words-problems-7 diff --git a/Resources/Prototypes/SimpleStation14/Body/Prototypes/animalslime.yml b/Resources/Prototypes/SimpleStation14/Body/Prototypes/animalslime.yml new file mode 100644 index 0000000000..ac94baa575 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Body/Prototypes/animalslime.yml @@ -0,0 +1,18 @@ +- type: body + id: AnimalSlime + name: "animalslime" + root: torso + slots: + torso: + part: TorsoAnimal + connections: + - legs + organs: + core: SentientSlimeCore + lungs: OrganSlimeLungs + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/belt.yml new file mode 100644 index 0000000000..7a24775407 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/belt.yml @@ -0,0 +1,8 @@ +- type: entity + id: ClothingBeltWebbingShiroFilled + parent: ClothingBeltWebbingShiro + suffix: Filled + components: + - type: StorageFill + contents: + - id: DrinkRewriter diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml new file mode 100644 index 0000000000..4cf21ef69c --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,18 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltWebbingShiro + name: shiro's webbing + description: A flexible set of webbing worn by little Shiro. + components: + - type: Sprite + sprite: SimpleStation14/Clothing/Belt/shirowebbing.rsi + - type: Clothing + sprite: SimpleStation14/Clothing/Belt/shirowebbing.rsi + - type: Item + size: 15 + - type: Storage + capacity: 10 + - type: Tag + tags: + - BeltSlotNotBelt + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml new file mode 100644 index 0000000000..a99d031438 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Consumable/Food/meat.yml @@ -0,0 +1,36 @@ +- type: entity + name: dissociative slimeball + parent: FoodMeatBase + id: FoodShiroSlime + description: A perfectly round blob of Shiro's slime. + components: + - type: FlavorProfile + flavors: + - slimy + - type: Sprite + sprite: SimpleStation14/Objects/Consumable/Food/shiro.rsi + netsync: false + state: shiro + - type: Tag + tags: + - Raw + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: ShirosDelight + Quantity: 30 +- type: entity + name: slimeball + parent: FoodMeatSlime + id: FoodMeatSlimeWithSlime + description: A gelatinous shaping of slime jelly. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Slime + Quantity: 30 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml new file mode 100644 index 0000000000..759e517963 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/animals.yml @@ -0,0 +1,239 @@ +- type: entity + name: baby fox + parent: MobFox + id: MobFoxBaby + description: A little fox! Aww... + components: + - type: Butcherable + spawned: + - id: FoodMeat + amount: 1 + - type: Sprite + drawdepth: Mobs + sprite: SimpleStation14/Mobs/Pets/fox.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: baby_fox + - type: Appearance + - type: Inventory + speciesId: fox + templateId: pet + - type: InventorySlots + - type: DamageStateVisuals + states: + Alive: + Base: baby_fox + Critical: + Base: baby_fox_dead + Dead: + Base: baby_fox_dead + - type: Grammar + attributes: + gender: epicene + +- type: entity + name: cat + parent: SimpleMobBase + id: MobCatNoAccent + description: Feline pet, very funny. + abstract: true + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/cat.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: cat + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + density: 15 + mask: + - MobMask + layer: + - MobLayer + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Slash: 3 + Piercing: 5 + - type: Appearance + - type: Inventory + speciesId: cat + templateId: pet + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: DamageStateVisuals + states: + Alive: + Base: cat + Critical: + Base: cat_dead + Dead: + Base: cat_dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 3 + - type: InteractionPopup + successChance: 0.7 + interactSuccessString: petting-success-cat + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/cat_meow.ogg + - type: Grammar + attributes: + gender: epicene + - type: MobPrice + price: 200 + - type: Faction + factions: + - PetCat + - type: RandomBark + barkMultiplier: 1.0 + barks: + - Meow! + - Mow. + - Meow. + - Mew. + chatlog: False + +- type: entity + name: slime cat + parent: SimpleMobBase + id: MobSlimeCat + description: A cute squishy slime cat. Humorous pet. + components: + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + shiro: Sixteen + - type: Sprite + drawdepth: Mobs + netsync: false + sprite: SimpleStation14/Mobs/pets/shiro.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: SimpleStation14/Mobs/pets/shiro.rsi + state: shiro + color: "#FF00FF" + alpha: 200 + - type: Body + prototype: AnimalSlime + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + density: 50 + mask: + - MobMask + layer: + - MobLayer + - type: Appearance + - type: Inventory + speciesId: shiro + templateId: pet + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: DamageStateVisuals + states: + Alive: + Base: shiro + Critical: + Base: shiro_dead + Dead: + Base: shiro_dead + - type: Butcherable + spawned: + - id: FoodMeatSlimeWithSlime + amount: 3 + - type: InteractionPopup + successChance: 1.0 + interactSuccessString: petting-success-slime + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/fox_squeak.ogg + - type: ReplacementAccent + accent: slimecat + - type: Grammar + attributes: + gender: epicene + - type: Damageable + damageContainer: Biological + damageModifierSet: Slime + - type: Bloodstream + bloodReagent: Slime + bloodlossDamage: + types: + Bloodloss: + 1 + bloodlossHealDamage: + types: + Bloodloss: + -0.25 + - type: Barotrauma + damage: + types: + Blunt: 0.45 + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:HealthChange + scaled: true + damage: + types: + Heat: 2 + - !type:PopupMessage + type: Local + visualType: Large + messages: [ "slime-hurt-by-water-popup" ] + probability: 0.25 + - type: MeleeWeapon + animation: WeaponArcClaw + attackRate: 1.4 + damage: + types: + Blunt: 1 + Slash: 3 + Piercing: 3 + - type: Faction + factions: + - PetCat + - type: RandomBark + barkMultiplier: 1.0 + barks: + - Squish. + - Splort. + - Meow. + - Mew. + chatlog: False + - type: MovementSpeedModifier + baseWalkSpeed : 8.0 + baseSprintSpeed : 4.0 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml index 5d04825089..b586424108 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml @@ -73,3 +73,384 @@ attributes: proper: true gender: male + +- type: entity + name: McG + parent: MobMcGriff + id: MobMcGriffnt + description: This dog can tell something smells + components: + - type: Sprite + drawdepth: Mobs + sprite: SimpleStation14/Mobs/Pets/mc.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: mcgriff + +- type: entity + name: Shiro + parent: MobSlimeCat + id: MobSlimeCatShiro + description: Huh, so this is what Shiro really looks like. + components: + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + shiro: "" + - type: Sprite + drawdepth: Mobs + netsync: false + sprite: SimpleStation14/Mobs/pets/shiro.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: SimpleStation14/Mobs/pets/shiro.rsi + state: shiro + color: "#FFFFFF" + - type: Physics + - type: Inventory + speciesId: shiro + templateId: shiro + - type: Butcherable + spawned: + - id: FoodShiroSlime + amount: 3 + - type: Grammar + attributes: + proper: true + gender: female + - type: ReplacementAccent + accent: shiro + - type: DraconicBloodstream + reagent: + solutionName: chemicals + reagent: ShirosDelight + unitsPerUpdate: 0.5 + accumulatorTime: 5.0 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: Synaptizine + Quantity: 30 + - type: MeleeChemicalInjector + solution: melee + transferAmount: 1.0 + - type: SolutionRegeneration + solution: melee + generated: + reagents: + - ReagentId: Synaptizine + Quantity: 0.5 + - type: MeleeWeapon + animation: WeaponArcClaw + attackRate: 2 + damage: + types: + Blunt: 1 + Slash: 2 + Piercing: 2 + - type: RandomBark + barkMultiplier: 0.5 + barks: + - Shiro! + - Shiro. + - Wah! + - Wah. + - Shiro? + - Squish. + chatlog: True + - type: MovementSpeedModifier + baseWalkSpeed : 8.0 + baseSprintSpeed : 4.0 + - type: Tag + tags: + - CannotSuicide + - type: GhostTakeoverAvailable + - type: GhostRole + makeSentient: false + whitelistRequired: false + name: Shiro + description: Be Shiro! Be fast! Always be fast! Don't be mean! + - type: Loadout + prototypes: [ ShirosVest ] + +- type: entity + name: problems + id: MobSlimeCatProblems + parent: MobSlimeCat + description: Defender of the medbay... from mice anyway. + components: + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + cat: "" + - type: Sprite + drawdepth: Mobs + sprite: SimpleStation14/Mobs/Pets/problems.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: cat + alpha: 200 + - type: Appearance + - type: Butcherable + spawned: + - id: FoodShiroSlime + amount: 3 + - type: DamageStateVisuals + states: + Alive: + Base: cat + Critical: + Base: cat_dead + Dead: + Base: cat_dead + - type: Tag + tags: + - CannotSuicide + - type: ReplacementAccent + accent: problems + - type: Grammar + attributes: + proper: true + gender: neuter + - type: InteractionPopup + successChance: 1 + interactSuccessString: petting-success-cat + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/cat_meow.ogg + - type: GhostTakeoverAvailable + - type: GhostRole + makeSentient: false + whitelistRequired: false + name: problems + description: Be a problems. Eat live power cables. Or not. Who cares? You're a cat. + +- type: entity + name: Jack Parker + id: MobMonkeyJackParker + parent: SimpleMobBase + description: Hasn't lost a case in his entire career. + components: + - type: SentienceTarget + flavorKind: station-event-random-sentience-flavor-primate + - type: Inventory + templateId: jackparker + - type: InventorySlots + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + density: 80 + mask: + - MobMask + layer: + - MobLayer + - type: Strippable + - type: Stripping + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: monkey + sprite: SimpleStation14/Mobs/pets/jackparker.rsi + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - type: Hands + - type: Speech + speechSounds: Monkey + - type: Body + prototype: Primate + requiredLegs: 1 + - type: DamageStateVisuals + states: + Alive: + Base: monkey + Critical: + Base: dead + Dead: + Base: dead + - type: Appearance + - type: FireVisuals + sprite: Mobs/Effects/onfire.rsi + normalState: Monkey_burning + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeat + amount: 3 + - type: Puller + - type: CanHostGuardian + - type: DiseaseCarrier + - type: CombatMode + canDisarm: true + - type: Cuffable + - type: MeleeWeapon + hidden: true + soundHit: + collection: Punch + angle: 30 + animation: WeaponArcFist + damage: + types: + Blunt: 6 + - type: RandomBark + barkMultiplier: 0.65 + barks: + - Oooook. + - Ahahah. + - Ook ah. + - Ook. + - Ook ook! + - type: Grammar + attributes: + proper: true + gender: male + - type: TypingIndicator + proto: lawyer + - type: Tag + tags: + - CannotSuicide + - type: Faction + factions: + - Pet + - type: Loadout + prototypes: [ JacksThings ] + +- type: entity + name: Hughes + parent: MobMonkeyJackParker + id: MobGorillaHughes + description: Don't sign up for human testin' bud. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: crawling + sprite: SimpleStation14/Mobs/Pets/hughes.rsi + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.48 + density: 200 + mask: + - MobMask + layer: + - MobLayer + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: crawling + Critical: + Base: dead + Dead: + Base: dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 4 + - type: Bloodstream + bloodMaxVolume: 300 + - type: Puller + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Oni + modifiers: + coefficients: + Blunt: 2 + Slash: 1.7 + Piercing: 1.7 + Asphyxiation: 2 + stamDamageBonus: 1.7 + - type: MobState + - type: MobThresholds + thresholds: + 0: Alive + 110: Critical + 220: Dead + - type: Damageable + damageContainer: Biological + damageModifierSet: Oni + - type: Stamina + - type: MeleeWeapon + hidden: true + angle: 0 + animation: WeaponArcFist + damage: + types: + Blunt: 8 + - type: RandomBark + barks: + - Grunt. + - type: Faction + factions: + - Pet + - type: Loadout + prototypes: [ HughesThings ] + +- type: entity + name: Wilson + parent: MobFoxBaby + id: MobFoxBabyWilson + description: "A two-tailed fox of two tales: music and salvage." + components: + - type: Butcherable + spawned: + - id: FoodMeat + amount: 1 + - type: Sprite + drawdepth: Mobs + sprite: SimpleStation14/Mobs/Pets/fox.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: wilson + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: wilson + Critical: + Base: wilson_dead + Dead: + Base: wilson_dead + - type: Grammar + attributes: + gender: female + proper: true + - type: Faction + factions: + - Pet + +- type: startingGear + id: ShirosVest + equipment: + belt: ClothingBeltWebbingShiroFilled + +- type: startingGear + id: JacksThings + inhand: + right hand: BriefcaseBrownFilled + +- type: startingGear + id: HughesThings + inhand: + left hand: FoodBanana diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml new file mode 100644 index 0000000000..fa56eeb752 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/jackparker_inventory_template.yml @@ -0,0 +1,25 @@ +- type: inventoryTemplate + id: jackparker + slots: + - name: head + slotTexture: head + slotFlags: HEAD + slotGroup: MainHotbar + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Head + offset: 0, -0.08 + - 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 diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml new file mode 100644 index 0000000000..c362615a31 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/shiro_inventory_template.yml @@ -0,0 +1,36 @@ +- type: inventoryTemplate + id: shiro + slots: + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + displayName: Suit Storage + whitelist: + components: + - GasTank + + - name: belt + slotTexture: belt + slotFlags: BELT + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 3,1 + strippingWindowPos: 1,5 + displayName: Belt + whitelist: + tags: + - PetWearable diff --git a/Resources/Prototypes/SimpleStation14/ai_factions.yml b/Resources/Prototypes/SimpleStation14/ai_factions.yml new file mode 100644 index 0000000000..42202a2c2e --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/ai_factions.yml @@ -0,0 +1,8 @@ +- type: faction + id: PetCat + hostile: + - RatPassive + - RatHostile + - SimpleHostile + - Xeno + - Dragon diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml index 1c357a63c3..c9a88b3759 100644 --- a/Resources/Prototypes/ai_factions.yml +++ b/Resources/Prototypes/ai_factions.yml @@ -8,6 +8,7 @@ - SimpleHostile - Xeno - Pet + - PetCat - type: npcFaction id: NanoTrasen @@ -32,6 +33,7 @@ - Dragon - Pet - Passive + - PetCat - type: npcFaction id: SimpleNeutral @@ -73,6 +75,7 @@ - NanoTrasen - Syndicate - Pet + - CatPet - type: npcFaction id: Pet diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shiro.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shiro.png new file mode 100644 index 0000000000..a53543aaee Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shiro.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index 01d1108430..143cc8f038 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json @@ -65,6 +65,10 @@ { "name": "equipped-MASK-kangaroo", "directions": 4 + }, + { + "name": "equipped-MASK-shiro", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000..33798fc5ec Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-shiro.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json index bd74448c03..f641136771 100644 --- a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json @@ -59,6 +59,11 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4 + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000..95b216b09c Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-shiro.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json index 9dd4186ecd..076ce3df6b 100644 --- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json @@ -59,6 +59,11 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4 + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000..15c15258f5 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-shiro.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json index a1661aee78..b88affb1aa 100644 --- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json @@ -59,6 +59,11 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4 + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000..15c15258f5 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-shiro.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json index a1661aee78..b88affb1aa 100644 --- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json @@ -59,6 +59,11 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4 + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000..dfb90a21bb Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-shiro.png differ diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json index bd74448c03..f641136771 100644 --- a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json @@ -59,6 +59,11 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4 + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000..95b216b09c Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-shiro.png differ diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json index bd74448c03..f641136771 100644 --- a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json @@ -59,6 +59,11 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4 + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000..1cf500a710 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-shiro.png differ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/meta.json b/Resources/Textures/Objects/Tanks/red.rsi/meta.json index bd74448c03..f641136771 100644 --- a/Resources/Textures/Objects/Tanks/red.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/red.rsi/meta.json @@ -59,6 +59,11 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4 + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-shiro.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-shiro.png new file mode 100644 index 0000000000..15c15258f5 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-shiro.png differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json index 59ffe2bb89..c41f7d1496 100644 --- a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json @@ -59,6 +59,11 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-shiro", + "directions": 4 + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT-shiro.png b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT-shiro.png new file mode 100644 index 0000000000..c81a969157 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT-shiro.png differ diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT.png b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT.png new file mode 100644 index 0000000000..c1e6c60c10 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/icon.png b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/icon.png new file mode 100644 index 0000000000..3ae067f8c2 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/icon.png differ diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-left.png b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-left.png new file mode 100644 index 0000000000..dbce144c60 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-left.png differ diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-right.png b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-right.png new file mode 100644 index 0000000000..8280138ae7 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/inhand-right.png differ diff --git a/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/meta.json new file mode 100644 index 0000000000..d367224dce --- /dev/null +++ b/Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by DSC@Cabbage#9633 (561159087765848084)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT-shiro", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox.png b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox.png new file mode 100644 index 0000000000..039e5a44ae Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox_dead.png new file mode 100644 index 0000000000..04ede1f2b5 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/baby_fox_dead.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json new file mode 100644 index 0000000000..81cb2be146 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "baby_fox", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "baby_fox_dead", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "wilson", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "wilson_dead", + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson.png b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson.png new file mode 100644 index 0000000000..1d7351f41f Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson_dead.png new file mode 100644 index 0000000000..a90e1f7721 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi/wilson_dead.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/crawling.png b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/crawling.png new file mode 100644 index 0000000000..92079e5ffd Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/crawling.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/dead.png new file mode 100644 index 0000000000..c2211f45d8 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/dead.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/meta.json new file mode 100644 index 0000000000..050c1fb128 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", + "states": [ + { + "name": "dead", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "crawling", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/dead.png new file mode 100644 index 0000000000..21ee2e53bc Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/dead.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/meta.json new file mode 100644 index 0000000000..50a63d9290 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "dead" + }, + { + "name": "monkey", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/monkey.png b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/monkey.png new file mode 100644 index 0000000000..9a145791b8 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi/monkey.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff.png b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff.png new file mode 100644 index 0000000000..3ab7328528 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff_dead.png new file mode 100644 index 0000000000..173a378f6f Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/mcgriff_dead.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/meta.json new file mode 100644 index 0000000000..55282bb105 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG git https://github.com/tgstation/tgstation/blob/0348b921936c4736e0a9df337c8a64a69c617d13/icons/mob/pets.dmi modified by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "mcgriff", + "directions": 4 + }, + + { + "name": "mcgriff_dead", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png new file mode 100644 index 0000000000..4fde7444d9 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png new file mode 100644 index 0000000000..a1f737c127 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/cat_dead.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json new file mode 100644 index 0000000000..f43db3e79d --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "cat", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "cat_dead", + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/meta.json new file mode 100644 index 0000000000..fd7fda205f --- /dev/null +++ b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "states": [ + { + "name": "shiro", + "directions": 4 + }, + + { + "name": "shiro_dead", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro.png b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro.png new file mode 100644 index 0000000000..6b1c544774 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro.png differ diff --git a/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro_dead.png b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro_dead.png new file mode 100644 index 0000000000..f3bfde64b1 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi/shiro_dead.png differ diff --git a/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/meta.json new file mode 100644 index 0000000000..7291a9ba2d --- /dev/null +++ b/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shiro" + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/shiro.png b/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/shiro.png new file mode 100644 index 0000000000..ded053a1b1 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi/shiro.png differ