diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 37b5ef04e0..09b091d8ce 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -2789,6 +2789,10 @@ ent-CP14WoodenPlanks1 = деревянные доски .desc = Обработанное и готовое к использованию дерево. .suffix = 1 +ent-CP14BirchWoodenPlanks1 = березовые доски + .desc = Обработанное и готовое к использованию дерево. + .suffix = 1 + ent-CP14WoodenPlanks10 = { ent-CP14WoodenPlanks1 } .desc = { ent-CP14WoodenPlanks1.desc } .suffix = 10 @@ -3020,6 +3024,9 @@ ent-CP14ModularGripLong = длинная рукоять ent-CP14ModularGripWooden = деревянная рукоять .desc = { ent-CP14ModularGripShort.desc } +ent-CP14ModularGripBirch = березовая рукоять + .desc = { ent-CP14ModularGripShort.desc } + ent-CP14ModularGripLucens = люценовая рукоять .desc = { ent-CP14ModularGripShort.desc } @@ -3041,6 +3048,9 @@ ent-CP14ModularGripGuildmaster = рукоять рапиры гильдмаст ent-CP14ModularGripWoodenLong = длинная деревянная рукоять .desc = { ent-CP14ModularGripLong.desc } +ent-CP14ModularGripBirchLong = длинная березовая рукоять + .desc = { ent-CP14ModularGripLong.desc } + ent-CP14ModularGripLucensLong = длинная люценовая рукоять .desc = { ent-CP14ModularGripLong.desc } diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml index 6c30ce866f..b1bc4134a6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml @@ -138,6 +138,33 @@ materialComposition: CP14LucensWoodenPlanks: 10 +- type: entity + parent: CP14ModularGripShort + id: CP14ModularGripBirch + name: birch grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Grip/birch_grip.rsi + layers: + - state: icon + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularGripWooden + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + - type: entity parent: CP14ModularGripShort id: CP14ModularGripIron @@ -332,6 +359,33 @@ materialComposition: CP14LucensWoodenPlanks: 20 +- type: entity + parent: CP14ModularGripLong + id: CP14ModularGripBirchLong + name: long birch grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi + layers: + - state: icon + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularGripWoodenLong + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 + - type: entity parent: CP14ModularGripLong id: CP14ModularGripIronLong diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index dd765998a5..61b9606990 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -109,6 +109,17 @@ count: 2 result: CP14ModularGripWooden +- type: CP14Recipe + id: CP14ModularGripBirchShort + tag: CP14RecipeWorkbench + category: Tools + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14BirchWoodenPlanks + count: 2 + result: CP14ModularGripBirch + - type: CP14Recipe id: CP14ModularGripWoodenLong tag: CP14RecipeWorkbench @@ -120,6 +131,17 @@ count: 4 result: CP14ModularGripWoodenLong +- type: CP14Recipe + id: CP14ModularGripBirchLong + tag: CP14RecipeWorkbench + category: Tools + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14BirchWoodenPlanks + count: 4 + result: CP14ModularGripBirchLong + - type: CP14Recipe id: CP14ModularGripLucens tag: CP14RecipeWorkbench diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT.png new file mode 100644 index 0000000000..c8b343bca3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..6242e561a8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/icon.png new file mode 100644 index 0000000000..4a0da2b06d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-left.png new file mode 100644 index 0000000000..f52abdf589 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-right.png new file mode 100644 index 0000000000..48dd963971 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/meta.json new file mode 100644 index 0000000000..84f19afffb --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/equipped-NECK.png new file mode 100644 index 0000000000..a9b7071765 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/icon.png new file mode 100644 index 0000000000..e7a7b6a5b3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/inhand-left.png new file mode 100644 index 0000000000..37bf607d96 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/inhand-right.png new file mode 100644 index 0000000000..1cc91dd0c0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/meta.json new file mode 100644 index 0000000000..ba9daec021 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..866ac260b0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..a1fa3ddc7a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-right.png differ