diff --git a/Resources/Locale/en-US/_Nyano/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Nyano/store/uplink-catalog.ftl new file mode 100644 index 00000000000..99c287b78bc --- /dev/null +++ b/Resources/Locale/en-US/_Nyano/store/uplink-catalog.ftl @@ -0,0 +1,8 @@ +uplink-kanabou-name = Kanabou +uplink-kanabou-desc = A weapon for those who wish to forgo subtlety. Particularly suited to oni. + +uplink-rickenbacker4001-name = Rickenbacker 4001 +uplink-rickenbacker4001-desc = When it comes down to it, there are very few people who will swing the bat. + +uplink-samurai-bundle-name = Syndicate samurai armor bundle +uplink-samurai-bundle-desc = A bundle containing a modern replica of a full Tousei-Gusoku set. diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/syndicate.yml new file mode 100644 index 00000000000..ea5cf29c82c --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/syndicate.yml @@ -0,0 +1,10 @@ +- type: entity + id: ClothingBackpackDuffelSyndicateBundleSamurai + parent: ClothingBackpackDuffelSyndicateBundle + name: Samurai armor bundle + description: "A bundle containing a modern replica of a full Tousei-Gusoku set." + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorTouseiGusoku + - id: ClothingHeadHelmetKabuto diff --git a/Resources/Prototypes/_Nyano/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Nyano/Catalog/uplink_catalog.yml index d60b86ec582..f7e3a0675d9 100644 --- a/Resources/Prototypes/_Nyano/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Nyano/Catalog/uplink_catalog.yml @@ -25,3 +25,18 @@ - !type:BuyerJobCondition whitelist: - Musician + +- type: listing + id: UplinkSamurai + name: uplink-samurai-bundle-name + description: uplink-samurai-bundle-desc + icon: { sprite: Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateBundleSamurai + cost: + Telecrystal: 6 + categories: + - UplinkArmor + conditions: + - !type:BuyerSpeciesCondition + whitelist: + - Oni diff --git a/Resources/Prototypes/_Nyano/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Nyano/Entities/Clothing/Head/hats.yml index fdb44d64254..4f20be8ef3c 100644 --- a/Resources/Prototypes/_Nyano/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Nyano/Entities/Clothing/Head/hats.yml @@ -86,4 +86,23 @@ coefficients: Blunt: 0.80 Slash: 0.95 - Piercing: 0.95 \ No newline at end of file + Piercing: 0.95 + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHelmetKabuto + name: kabuto and menpo + description: A modern replica of a kabuto and menpo. + components: + - type: Sprite + sprite: Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi + - type: Clothing + sprite: Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi + - type: Item + size: 15 + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.80 diff --git a/Resources/Prototypes/_Nyano/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Nyano/Entities/Clothing/OuterClothing/armor.yml index 589e900db4e..acfc9fbd3b3 100644 --- a/Resources/Prototypes/_Nyano/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Nyano/Entities/Clothing/OuterClothing/armor.yml @@ -19,7 +19,7 @@ parent: ClothingOuterBase id: ClothingOuterArmorKendoBogu name: bogu - description: A set of armor used in Kendo. It covers the waist, torso, and hands. + description: A set of armor used in Kendo. It covers the waist, torso, and hands. components: - type: Sprite sprite: Nyanotrasen/Clothing/OuterClothing/Armor/bogu.rsi @@ -33,3 +33,22 @@ - type: ClothingSpeedModifier walkModifier: 0.95 sprintModifier: 0.85 + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterArmorTouseiGusoku + name: tousei-gusoku + description: A modern replica of a Ni-mai-do Gusoku armor set. + components: + - type: Sprite + sprite: Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi + - type: Clothing + sprite: Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi + - type: Item + size: 50 + - type: Armor + modifiers: + coefficients: + Blunt: 0.60 + Slash: 0.60 + Piercing: 0.75 diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/equipped-HELMET.png b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..81bdeafe5e4 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/icon.png b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/icon.png new file mode 100644 index 00000000000..a8710789d19 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/icon.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/inhand-left.png b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/inhand-left.png new file mode 100644 index 00000000000..84d3210b424 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/inhand-right.png b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/inhand-right.png new file mode 100644 index 00000000000..c6280e81614 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/meta.json new file mode 100644 index 00000000000..d0299e0646a --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Hyenh#6078 (313846233099927552)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..da794e45347 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/icon.png b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/icon.png new file mode 100644 index 00000000000..146d813a839 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/icon.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/inhand-left.png b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/inhand-left.png new file mode 100644 index 00000000000..1de95742e8e Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/inhand-right.png b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/inhand-right.png new file mode 100644 index 00000000000..86b12980ea0 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/meta.json new file mode 100644 index 00000000000..cba9f400342 --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Hyenh#6078 (313846233099927552)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}