diff --git a/Resources/Locale/en-US/deltav/prototypes/cargo/cargo-livestock.ftl b/Resources/Locale/en-US/deltav/prototypes/cargo/cargo-livestock.ftl new file mode 100644 index 0000000000..538f800105 --- /dev/null +++ b/Resources/Locale/en-US/deltav/prototypes/cargo/cargo-livestock.ftl @@ -0,0 +1,2 @@ +ent-LivestockCapybara = { ent-CrateNPCCapybara } + .desc = { ent-CrateNPCCapybara.desc } diff --git a/Resources/Locale/en-US/deltav/prototypes/fills/livestock-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/fills/livestock-crates.ftl new file mode 100644 index 0000000000..dc2cbfaed5 --- /dev/null +++ b/Resources/Locale/en-US/deltav/prototypes/fills/livestock-crates.ftl @@ -0,0 +1,2 @@ +ent-CrateNPCCapybara = Capybara crate + .desc = A crate containing a capybara. \ No newline at end of file diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl index 5d75b7e69f..4525f102e9 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl @@ -51,3 +51,4 @@ ent-LivestockLizard = { ent-CrateNPCLizard } ent-LivestockKangaroo = { ent-CrateNPCKangaroo } .desc = { ent-CrateNPCKangaroo.desc } + diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index 758d45a7ec..bb58746d02 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -206,4 +206,4 @@ product: CrateNPCKangaroo cost: 2800 category: Livestock - group: market + group: market \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 9df6bb315a..ac435b0fe5 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -34,6 +34,9 @@ - id: MobBingus prob: 0.005 orGroup: MobCat + - id: MobCatOrange + prob: 0.05 + orGroup: MobCat - type: entity id: CrateNPCChicken diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml new file mode 100644 index 0000000000..7b66631085 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml @@ -0,0 +1,10 @@ + +- type: cargoProduct + id: LivestockCapybara + icon: + sprite: DeltaV/Mobs/Animals/capybara.rsi + state: capybara + product: CrateNPCCapybara + cost: 1000 + category: Livestock + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/npc.yml new file mode 100644 index 0000000000..0fb5c30488 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/npc.yml @@ -0,0 +1,7 @@ +- type: entity + id: CrateNPCCapybara + parent: CrateLivestock + components: + - type: StorageFill + contents: + - id: MobCapybara diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/mobs.yml new file mode 100644 index 0000000000..da6ea2becc --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/mobs.yml @@ -0,0 +1,28 @@ +# Base +- type: entity + name: Capybara Spawner + id: SpawnMobCapybara + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: capybara + sprite: DeltaV/Mobs/Animals/capybara.rsi + - type: ConditionalSpawner + prototypes: + - MobCapybara + +- type: entity + name: Orange Cat Spawner + id: SpawnMobCatOrange + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: orange + sprite: DeltaV/Mobs/Animals/orange_cat.rsi + - type: ConditionalSpawner + prototypes: + - MobCatOrange diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml index 14e86950f2..b312561f58 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml @@ -53,3 +53,78 @@ - type: Grammar attributes: gender: epicene + +- type: entity + name: orange cat + parent: SimpleMobBase + id: MobCatOrange + description: Feline pet, very funny. Hates Wednesdays. + components: + - type: Sprite + drawdepth: Mobs + sprite: DeltaV/Mobs/Animals/orange_cat.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: orange + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 250 + mask: + - MobMask + layer: + - MobLayer + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Slash: 2 + Piercing: 5 + - type: Appearance + - type: Inventory + speciesId: catorange + templateId: catorange + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: DamageStateVisuals + states: + Alive: + Base: orange + Critical: + Base: orange_crit + Dead: + Base: orange_dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 3 + - type: ReplacementAccent + accent: cat + - 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: HTN + rootTask: SimpleHostileCompound + - type: NpcFactionMember + factions: + - Cat \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml index ec867b0aed..f3fb5af093 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml @@ -18,7 +18,7 @@ - type: Appearance - type: BurnStateVisuals unlitIcon: unlit-icon - + - type: entity id: SmokingPipeFilledTobacco parent: SmokingPipe diff --git a/Resources/Prototypes/InventoryTemplates/catorange_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/catorange_inventory_template.yml new file mode 100644 index 0000000000..adb57b081c --- /dev/null +++ b/Resources/Prototypes/InventoryTemplates/catorange_inventory_template.yml @@ -0,0 +1,28 @@ +- type: inventoryTemplate + id: catorange + slots: + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + components: + - SmokingPipe + + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + displayName: Suit Storage + whitelist: + components: + - GasTank + + diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-capybara.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-capybara.png new file mode 100644 index 0000000000..3504a2b059 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-capybara.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-catorange.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-catorange.png new file mode 100644 index 0000000000..330e35f41d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-catorange.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index 01d1108430..346dab4838 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e Capybara and Orange Cat masks by user leonardo-dabepis", "size": { "x": 32, "y": 32 @@ -65,6 +65,14 @@ { "name": "equipped-MASK-kangaroo", "directions": 4 - } + }, + { + "name": "equipped-MASK-capybara", + "directions": 4 + }, + { + "name": "equipped-MASK-catorange", + "directions": 4 + } ] } diff --git a/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/equipped-MASK-capybara.png b/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/equipped-MASK-capybara.png new file mode 100644 index 0000000000..3504a2b059 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/equipped-MASK-capybara.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/equipped-MASK-catorange.png b/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/equipped-MASK-catorange.png new file mode 100644 index 0000000000..330e35f41d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/equipped-MASK-catorange.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/meta.json new file mode 100644 index 0000000000..43d5a8d1ee --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Mask/breath.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "art by user leonardo-dabepis https://leonardo-dabepis.tumblr.com/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-MASK-capybara", + "directions": 4 + }, + { + "name": "up-equipped-MASK-catorange", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/meta.json new file mode 100644 index 0000000000..d42abf83e5 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "art by user leonardo-dabepis https://leonardo-dabepis.tumblr.com/", + "states": + [ + { + "name": "orange", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "orange_crit", + "directions": 1, + "delays": [[1]] + }, + { + "name": "orange_dead", + "directions": 1, + "delays": [[1]] + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange.png b/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange.png new file mode 100644 index 0000000000..4950daf492 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange_crit.png b/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange_crit.png new file mode 100644 index 0000000000..baa5a15810 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange_crit.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange_dead.png b/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange_dead.png new file mode 100644 index 0000000000..5f6fd792ec Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi/orange_dead.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-capybara.png b/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-capybara.png new file mode 100644 index 0000000000..2197c82c76 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-capybara.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-catorange.png b/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-catorange.png new file mode 100644 index 0000000000..780ed1bc8c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-catorange.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/meta.json new file mode 100644 index 0000000000..5faa1fa7dd --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "art by user leonardo-dabepis https://leonardo-dabepis.tumblr.com/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-SUITSTORAGE-capybara", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-catorange", + "directions": 4, + "delays": [[1],[1],[1],[1]] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-catorange.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-catorange.png new file mode 100644 index 0000000000..08c1541879 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-catorange.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json index 00fcb768fb..fd46a22aa1 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json @@ -135,6 +135,56 @@ { "name": "lit-inhand-right", "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "unlit-equipped-MASK-catorange", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-catorange", + "directions": 4, "delays": [ [ 0.1, diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-catorange.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-catorange.png new file mode 100644 index 0000000000..7a1743b9c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-catorange.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-capybara.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-capybara.png new file mode 100644 index 0000000000..2197c82c76 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-capybara.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-catorange.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-catorange.png new file mode 100644 index 0000000000..780ed1bc8c Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-catorange.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json index 9dd4186ecd..3c44aed90d 100644 --- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 capybara and orange cat tanks by user leonardo-dabepis", "size": { "x": 32, "y": 32 @@ -59,6 +59,16 @@ "directions": 4, "delays": [[1],[1],[1],[1]] }, + { + "name": "equipped-SUITSTORAGE-capybara", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-catorange", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4