From 4beb9eaff298b3de865c7e0b15276eab5ab59df1 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 20 Dec 2024 15:30:35 +0100 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=89=D0=B5=D0=B9,=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=D0=B4=D0=BD=D0=B8=D1=85=20=D0=BF=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B2=20(#897)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR Добавление новогодних штучек, по заказу Pangaari, А также фиксы моего предыдущего ПРа ## Почему / Баланс Разнообразие сервера контентом, потому что, почему бы и нет, ну и починка этого разнообразного контента ## Требования - [x] Я прочитал(а) и следую [Руководство по созданию пулл реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера. - [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, **или** этот пулл реквест не требует демонстрации в игре **Чейнджлог** :cl: Sh4zik - add: Был добавлен снежок - add: Был добавлен огромный ящик, заполненным снегом - add: Были добавлены превосходные, зимние сани - add: Был добавлен ????? из слаймолюдов. - add: Было добавлено новогоднее настроение! - add: Была добавлены различные вариации кинжалов - add: Была добавлена возможность скрафтить новые виды вооружения - кинжалы - fix: Были починены крафты закалённых копей и заточек, а также их урон --- .../Entities/Objects/Materials/shards.ftl | 5 + .../Entities/Objects/Weapons/Melee/melee.ftl | 16 + .../Entities/Structures/Furniture/misc.ftl | 17 + .../ADT/Entities/Objects/Fun/misc.yml | 60 ++ .../Entities/Objects/Misc/newyearkatalki.yml | 1 + .../Entities/Objects/Misc/slimehappines.yml | 1 + .../Entities/Objects/Shields/fullshield.yml | 2 +- .../Entities/Objects/Weapons/Melee/shives.yml | 4 +- .../Entities/Objects/Weapons/Melee/spear.yml | 12 +- .../Entities/Objects/Weapons/Melee/swords.yml | 40 ++ .../Storage/Crates/snowballcrate.yml | 517 ++++++++++++++++++ .../Crafting/Graphs/Improvised/daggers.yml | 55 ++ .../Crafting/Graphs/Improvised/shield.yml | 28 +- .../Crafting/Graphs/Improvised/shives.yml | 4 +- .../Crafting/Graphs/Improvised/spear.yml | 4 +- .../ADT/Recipes/Crafting/improvised.yml | 52 ++ .../ADT/Objects/Fun/snowball.rsi/meta.json | 14 + .../ADT/Objects/Fun/snowball.rsi/snowball.png | Bin 0 -> 406 bytes .../Objects/Misc/slimehappines.rsi/icon.png | Bin 0 -> 519 bytes .../Objects/Misc/slimehappines.rsi/meta.json | 14 + .../Specific/snowdispenser.rsi/icon.png | Bin 0 -> 787 bytes .../Specific/snowdispenser.rsi/meta.json | 14 + .../Weapons/Melee/wooden_sword.rsi/icon.png | Bin 0 -> 402 bytes .../Melee/wooden_sword.rsi/inhand-left.png | Bin 0 -> 506 bytes .../Melee/wooden_sword.rsi/inhand-right.png | Bin 0 -> 500 bytes .../Weapons/Melee/wooden_sword.rsi/meta.json | 22 + .../Specific/newyearkatalki.rsi/meta.json | 15 + .../newyearkatalki.rsi/newyearkatalka.png | Bin 0 -> 1367 bytes 28 files changed, 871 insertions(+), 26 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml create mode 100644 Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png create mode 100644 Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl new file mode 100644 index 00000000000..b1d21ec4c1f --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl @@ -0,0 +1,5 @@ +ent-ADTShardGlassReinforcedPlasma = осколок закалённого плазменного стекла + .desc = Небольшой осколок плазменного стекла. + +ent-ADTShardGlassReinforcedUran = осколок закалённого уранового стекла + .desc = Небольшой осколок уранового стекла. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl index 087f0d3319f..29d324396ff 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl @@ -44,3 +44,19 @@ ent-SpearReinforcedPlasma = копьё из закалённой плазмы ent-ADTReinforcedPlasmaShiv = заточка из закалённой плазмы .desc = Заточка, созданная из осколка закалённой плазмы, имеющий тканевую основу, для более удобной нарезки ваших оппонентов. + +ent-ADTGlassDagger = стеклянный кинжал + .desc = Стеклянный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие. + +ent-ADTPlasmaDagger = плазменный кинжал + .desc = Плазменный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие. + +ent-ADTGlassReinDagger = кинжал из закалённого стекла + .desc = Закалённый, стеклянный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие. + +ent-ADTGlassUranDagger = урановый кинжал + .desc = Урановый самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие. + +ent-ADTWoodenSword = деревянный меч + .desc = Настоящий робаст нуждается в ежедневных тренировках. + .suffix = { "Тренировочное" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl index fab527195dc..828f6dd8e6d 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl @@ -32,3 +32,20 @@ ent-ADTHalloweenCarvedPumpkinCube = { ent-ADTHalloweenCarvedPumpkinSmile } ent-ADTHalloweenCarvedPumpkinWily = { ent-ADTHalloweenCarvedPumpkinSmile } .suffix = { ent-ADTHalloweenCarvedPumpkinSmile.suffix } .desc = { ent-ADTHalloweenCarvedPumpkinSmile.desc } + + +ent-ADTSnowballsCrate = телега со снегом + .suffix = New Year + .desc = Ради неё вовсе не разрушают чьи-то планеты... Вовсе нет. + +ent-ADTNewYearKatalka = зимние сани + .suffix = New Year + .desc = Такси бизнес-класса, потому что упряжка не рассчитана под стадо оленей. + +ent-ADTSnowball = снежок + .suffix = New Year + .desc = Снаряд опаснее всякой пули... БЕРЕГИСЬ! + +ent-ADTSlimeHappines = экстракт счастья + .suffix = New Year + .desc = Концентрация искреннего счастья слаймолюдов, полученная абсолютно гуманным путём diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml index 8e279c8bea9..39c4b105f86 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml @@ -18,3 +18,63 @@ #- type: ClothingSpeedModifier # walkModifier: 0.9 # sprintModifier: 1.2 + +#New Year + +- type: entity + parent: BaseItem + id: ADTSnowball + name: Snowball + description: yeayea. Snow? Balls! I love balls!! + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Fun/snowball.rsi + state: snowball + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: FootstepSnow + params: + variation: 0.125 + volume: 6 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + ignoreResistances: true + damage: + types: + Blunt: 5 + - type: StaminaDamageOnCollide + damage: 5 + + +- type: entity + name: Slime Happines + parent: BaseItem + id: ADTSlimeHappines + description: Slimyy.. + components: + - type: Sprite + sprite: ADT/Objects/Misc/slimehappines.rsi + state: icon + + + +- type: entity + name: New Year gurney + id: ADTNewYearKatalka + parent: ChairBase + description: Yea. + components: + - type: Sprite + sprite: ADT/Structures/Specific/newyearkatalki.rsi + state: newyearkatalka diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml @@ -0,0 +1 @@ + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml @@ -0,0 +1 @@ + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml index c25945c8734..855fe33fed7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml @@ -44,7 +44,7 @@ - type: HeldSpeedModifier - type: Construction graph: ADTShield - node: start + node: ADTCompShield - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml index b907baf3069..284356bd79a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml @@ -15,7 +15,7 @@ sprite: ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi - type: Construction graph: ADTPShiv - node: start + node: ADTCompPlasmaShiv - type: entity name: reinforced uranium shiv @@ -35,4 +35,4 @@ sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi - type: Construction graph: ADTUShiv - node: start + node: ADTCompUraniumShiv diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml index 86cf8957c9a..470020ae64c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml @@ -10,14 +10,14 @@ wideAnimationRotation: -135 damage: types: - Piercing: 15 + Piercing: 25 - type: DamageOtherOnHit damage: types: - Piercing: 18 + Piercing: 28 - type: Construction - graph: ADTPSpear - node: start + graph: ADTPSpear + node: ADTCompPlasmaSpear - type: entity name: reinforced uranium spear @@ -31,7 +31,7 @@ wideAnimationRotation: -135 damage: types: - Piercing: 18 + Piercing: 12 Radiation: 9 - type: DamageOtherOnHit damage: @@ -40,4 +40,4 @@ Radiation: 9 - type: Construction graph: ADTUraniumSpear - node: start + node: ADTCompUraniumSpear diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index d5f78576d5d..5951f1a0334 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml @@ -88,6 +88,9 @@ id: ADTPlasmaDagger description: Dogor components: + - type: Construction + graph: ADTPDagger + node: ADTCompPlasmaDager - type: Tag tags: - Knife @@ -115,6 +118,9 @@ id: ADTGlassReinDagger description: Dogor components: + - type: Construction + graph: ADTGRDagger + node: ADTCompGlassRefDager - type: Tag tags: - Knife @@ -142,6 +148,9 @@ id: ADTGlassDagger description: Dogor components: + - type: Construction + graph: ADTGDagger + node: ADTCompGlassDager - type: Tag tags: - Knife @@ -169,6 +178,9 @@ id: ADTGlassUranDagger description: Dogor components: + - type: Construction + graph: ADTUDagger + node: ADTCompUranDager - type: Tag tags: - Knife @@ -190,4 +202,32 @@ types: Slash: 9 +- type: entity + name: wooden sword + parent: BaseItem + id: ADTWoodenSword + description: A true robust need training everyday. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/wooden_sword.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.2 + angle: 75 + damage: + types: + Blunt: 0.5 + soundHit: + collection: BoxingHit + - type: StaminaDamageOnHit + damage: 12 + #- type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 1 + - type: Item + size: Huge + - type: DisarmMalus + diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml new file mode 100644 index 00000000000..11cf63d02ab --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml @@ -0,0 +1,517 @@ +- type: entity + name: Snowballs crate + parent: BaseStructure + id: ADTSnowballsCrate + description: Mmm.. Crate full of BALLS!!! + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Specific/snowdispenser.rsi + state: icon + - type: Appearance + - type: ContainerContainer + containers: + bin-container: !type:Container + - type: Bin + maxItems: 500 + initialContents: + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml new file mode 100644 index 00000000000..87e28b684c4 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml @@ -0,0 +1,55 @@ +- type: constructionGraph + id: ADTGDagger + start: start + graph: + - node: start + edges: + - to: ADTCompGlassDager + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompGlassDager + entity: ADTGlassDagger + +- type: constructionGraph + id: ADTGRDagger + start: start + graph: + - node: start + edges: + - to: ADTCompGlassRefDager + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompGlassRefDager + entity: ADTGlassReinDagger + +- type: constructionGraph + id: ADTUDagger + start: start + graph: + - node: start + edges: + - to: ADTCompUranDager + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompUranDager + entity: ADTGlassUranDagger + +- type: constructionGraph + id: ADTPDagger + start: start + graph: + - node: start + edges: + - to: ADTCompPlasmaDager + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompPlasmaDager + entity: ADTPlasmaDagger diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml index 20e5715883a..a366b76ee4a 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml @@ -2,16 +2,18 @@ id: ADTShield start: start graph: - - node: start - edges: - - to: ADTCompShield - steps: - - material: Steel - amount: 20 - - material: ReinforcedGlass - amount: 10 - - material: Cable - amount: 2 - doAfter: 5 - - node: ADTCompShield - entity: ADTFullRiotShield + - node: start + edges: + - to: ADTCompShield + steps: + - material: Steel + amount: 20 + doAfter: 5 + - material: ReinforcedGlass + amount: 10 + doAfter: 5 + - material: Cable + amount: 2 + doAfter: 5 + - node: ADTCompShield + entity: ADTFullRiotShield \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml index 47f1153f3f2..49f25878c41 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml @@ -7,7 +7,7 @@ - to: ADTCompPlasmaShiv steps: - tag: ADTRPlasmaShard - name: "Осколок плазменного стекла" + name: "Осколок закалённого плазменного стекла" icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 @@ -27,7 +27,7 @@ - to: ADTCompUraniumShiv steps: - tag: ADTRUranShard - name: "Осколок уранового стекла" + name: "Осколок закалённого уранового стекла" icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml index 68fa4861e7c..1c9057cfd72 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml @@ -13,7 +13,7 @@ amount: 3 doAfter: 1 - tag: ADTRPlasmaShard - name: "Осколок плазменного стекла" + name: "Осколок закалённого плазменного стекла" icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 @@ -36,7 +36,7 @@ amount: 3 doAfter: 1 - tag: ADTRUranShard - name: "Осколок уранового стекла" + name: "Осколок закалённого уранового стекла" icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml index 8221f94dfda..01797e4f6fc 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml @@ -62,3 +62,55 @@ icon: sprite: ADT/Objects/Weapons/Melee/Rplasma_spear.rsi state: spear + +- type: construction + name: glass dagger + id: ADTDaggerGlass + graph: ADTGDagger + startNode: start + targetNode: ADTCompGlassDager + category: construction-category-weapons + objectType: Item + description: Dagger to cut your enemies. + icon: + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi + state: icon + +- type: construction + name: reinforced glass dagger + id: ADTDaggerRefGlass + graph: ADTGRDagger + startNode: start + targetNode: ADTCompGlassRefDager + category: construction-category-weapons + objectType: Item + description: Dagger to cut your enemies. + icon: + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi + state: icon + +- type: construction + name: plasma dagger + id: ADTDaggerPlasma + graph: ADTPDagger + startNode: start + targetNode: ADTCompPlasmaDager + category: construction-category-weapons + objectType: Item + description: Dagger to cut your enemies. + icon: + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi + state: icon + +- type: construction + name: uranium dagger + id: ADTDaggerUranium + graph: ADTUDagger + startNode: start + targetNode: ADTCompUranDager + category: construction-category-weapons + objectType: Item + description: Dagger to cut your enemies. + icon: + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi + state: icon \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json new file mode 100644 index 00000000000..76dfb6cb316 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pangaari, Discord - @pangaari", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "snowball" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png new file mode 100644 index 0000000000000000000000000000000000000000..de0566e0e3a38503ef54f4ecb1cb701efc995d56 GIT binary patch literal 406 zcmV;H0crk;P)Px$P)S5VR9J=Wl`%`hKoo$##^ZX16f$U~b`iu?@PD{E_zN9eT{?8_D(xzTF11uT zgli4qXzv_ik4h1eXz7w~O5VMD?>o4>Kut|e&5>zT-T3tU;&$I3AMPvFD!r-KA2@*a z`MHlRS1YE|X(f?T$*-d~*SYKvO1rlS8HvJ)zcpW`Yfgj&VD>&MEfEwI0DN;} z48|Bz6VMda$FHw0Xhl((lEnnJrw2$)fKDwgP;A!5=LjYowI8AeT7kS1_K;_hQ@AH*Cgy@mZ!EP;wCU`UAI} zfSq>h$J*>;dDua;D*;Cu#k>61�!Rrsn8;0nVGFXI}hXssI2007*qoM6N<$f>RH) A(*OVf literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..043a4fdabc587530cd87d8cc9c65eebf0862aa3c GIT binary patch literal 519 zcmV+i0{H!jP)Px$!AV3xR9J=Wl|4(tKp4mW5kavpgY*p%7Z*XCx~PL6AmGwb2k8gM;_8QR5L~4~ z*A5ms=+eQ##i>q3N>%7fQc~NqA)z$q(7e_R$))089|+{Q`#=BRJ*@ebD!b=khz*Ty+hD-w3-n8e50(5%zIHy&7SApp>B#L`HTai}x(|0ak z07Mc|81fXYnq}yOuqt94#HXzjN+fZ90JA4LldvHy5ZQp$yfvW!07n&M8zQzgeJpbc zD6R0mcMpWTh=|#DPx%%}GQ-R9J=WmOXFNP!xur7=q+DQA*U>Rgg)LP@@i2{{mtuVlF=bCKym?2UOC9 zU(kh#1r|0sAR*C}fwCh|t0WRl6spz@g+#Xdl`3YauJLCR+L6A~)w%ba^Z1;5tP2;q z(1kAazbkPTr)st8q|<3E%c4{&ohe2vz{cE!Bi7Ask6W)c62gA;@I3(OblN>{S(dxD zZ5x2ji&<{J{+Euy@qw?we*PpU5FQRGVzC)GDqAzKjEX%^SZ6rye z)oQW4{MNT`7~3r5>+VMZTn+}&v~gx;?x5>Bs;c@DXEK>kQqwfuwK!|rHo07m+1Y#a z`+Yi{4u^+_tge0n>OOxTK(pJUTz&$8q9_BCd+h>5_$Z2kqA0XlEk;I0=yW;&Y?{YD ze<>JHIEp}-OeQvY6o?l>mSuEZN0KD+`Fy0GTLDeeoI*Cql|Zje(;N!G3t^h3uX?(! z({8r`xR&vET@uL+!$<&BD$iJ3TMI#WdmXjs-49knmSqkO4kGR;#hKwFQLlfDhp5w^4GrZB|x3MA8nUN@XzwC&tk* zwjt2X&=@Y{>p)gL|@*{fwON|H6G|d4hWRvcu zw_GP+gSBZMV_3($!%{5{1HbN8E#8uYz!KDrA#<{;?1CUz>;-B}pXr zR-lkghQOFR0ReB#X+1_fzW5hO~Gl2#X1NR6*H*N17T`<(z%))jdeJWes_QJ^~<_1 zXXJBgYI@R%vY%JM7E# R#@GM=002ovPDHLkV1i91ZI1u| literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json new file mode 100644 index 00000000000..a6d71cb4b1d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pangaari, Discord - @pangaari", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] + } diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6fc70d9545500eb274c0b6f844df9e65168284b2 GIT binary patch literal 402 zcmV;D0d4+?P)Px$Oi4sRR9J=Gm$6F2Kpe(@+LDyEi5P>r2uTL%q$u~4^Q1Ag9qTu2X1!Edou$)uDE+)BL(B@mR+};2CegE8X2US%t@GKZ13Tn4N}*yRswnHp-KtJ&_h)ckfnzz zBv6DNpkCC#Jbni(>G_2c7!P|wZ(Ho_A4t)|I{yPI=;0qEAZ1`lZ&gwYKB^HD|36=gb#?dF0oX%R+KZ0_mwAC%oA zafm5Bmp@>>q1(Cqxs&Gl$7HQlfyF}YH z)^U2|I=(5AeR3>7NA2UiCF1|`vo)X3D{j;K&)5M4+dK|$YI$c~R$@P4s?5HtIoYvI z(^xC|WKHLmHYo6TUwvga?R0r*@6&_DIS=`)l=iWNmWE!NTox);%r5(pbHO!>BTNhi zfkD@ca|-XxpE5-xdhwDK)-O07R2MKiaw;@Ahk47eBo;`#qDQwax*kv?sGk1YvLmnbxir^(U|+XhpsJM sR(W4ZWM9Lgd_k^wh66hDJGwrzp3>gzZX3mX9vGPnp00i_>zopr0AW(!lmGw# literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e2e1896b22fc2747b0ce0c70ea2490007fab3a86 GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z*Lk`)hE&XX zduwCXp#TxK2ls<`Sc5fHR%f&YXe?DId3|GHe!z6TcXL^{=QWxl1>VD3V3V$QT)fI+8cSS@!R?}a-P_= zoc`wRsM@l1{qY62g%~!>=wW0C|9<}Ex-dVD`Xl>THx_4h#lDM>bp**_G{ei+dd#BZKSp_VUYdzt;rn3#@+69I$Gm zUh?%&HpZN56}P^3cECZQ-|F_Jyw3k0*Ugd~;a!?a|QhY@1|S{vExcs8!8;Tc$+nm4SX|A o7boW*XgS0G{LcK2PfytAX&rm(!Ta+fFd7*=UHx3vIVCg!07@&~EC2ui literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json new file mode 100644 index 00000000000..aa1bde388e2 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:m1and1b for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json new file mode 100644 index 00000000000..f096a63f544 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pangaari, Discord - @pangaari", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "newyearkatalka", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png new file mode 100644 index 0000000000000000000000000000000000000000..9b0af56d06c105a359dbe5df6863e02326b84fb8 GIT binary patch literal 1367 zcmV-d1*rOoP)A0MnTGACwDAy+{m zRzWU&Tw11wH%623xp8jTV_!#FsVWR zQ#CG(BEU9~-If6Pce(Sw6WHbqxD;o)&Imvbn&o$SqCl)zFW1Un1-O_6$dZ#;33&mt zl5aJ4wDQJW1rWtFLV`ubYt9P}i@c~i^5X%u6F}yMfGb8|TPFZDUx9D|5cKSb`Zf+= z-KFh9NlQ>qF3sz52Yh*iPgc`fxf}Xn!EHW=P+0EnXm|J81H?G# z8VbXEB($+~_v)9C0L`8F7n)&&6GyIohs zC2l)5lxQ5thYic8zgdy$)vCBOW}ED(b^r()o?jaSUJ@nUJp)pKwRvivH}tvHt_7sS z2Y@x<8L&bV3Bfuah@QK{AB_2u5Bunxj0?!&ww`(_%PH{m@op?Phd}@2nwW#u7x{P(B23VQ_Nopk9g7`idXlmmCDH>I39t zj7vaFw!~1R_?kr)AhJC`=}JA8;~`@c0_xxpy(&Kd;1N7QMA^!FDYmyhN9mV6%f7+5ru`?Po2%B%EuhDoxJd?}!_5wf+7~F8s zEny)l5a+hbG!%KHx53^vrWZ)>MN*7_QJxHv+JNsM1Ov<#W%$008pil52T5#d?K& zr7DU91jKsKmsk?U63dw6b2v$i{wNB^d#`>_asJ~__6M