From 2f905e2cb75a17d29d118eb18616df77a60e9758 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 14:37:06 +0100 Subject: [PATCH 01/53] shitmadeshieldandmuchmore --- .../ru-RU/ADT/Flavors/flavor-profiles.ftl | 1 + .../Catalog/store/uplink-catalog.ftl | 6 + .../Entities/Clothing/Head/hats.ftl | 15 +++ .../Entities/Devices/kettlecircuit.ftl | 2 + .../Objects/Consumable/Drinks/drinks.ftl | 12 ++ .../Objects/Consumable/Food/Baked/pizza.ftl | 5 + .../Objects/Consumable/Food/containers.ftl | 3 + .../Objects/Consumable/Food/teapacks.ftl | 11 ++ .../Entities/Objects/Misc/teabox.ftl | 2 + .../Entities/Objects/Shields/shields.ftl | 5 + .../Entities/Objects/Weapons/Melee/melee.ftl | 10 ++ .../Structures/Machines/batmenkettle.ftl | 2 + .../ADT/reagents/Consumable/Drinks/drink.ftl | 22 ++++ .../Prototypes/ADT/Catalog/uplink_catalog.yml | 27 +++++ Resources/Prototypes/ADT/Datasets/tags.yml | 1 + .../ADT/Entities/Clothing/Head/hats.yml | 57 +++++++++ .../Objects/Consumable/Drinks/drinks.yml | 50 ++++++++ .../Objects/Consumable/Food/Baked/pizza.yml | 89 ++++++++++++++ .../Consumable/Food/Containers/box.yml | 41 +++++++ .../Objects/Consumable/Food/teapacks.yml | 92 +++++++++++++++ .../Circuitboards/Machine/production.yml | 13 ++ .../ADT/Entities/Objects/Materials/shards.yml | 75 ++++++++++++ .../ADT/Entities/Objects/Misc/teabox.yml | 28 +++++ .../Entities/Objects/Shields/fullshield.yml | 67 +++++++++++ .../Objects/Shields/fullshieldsindi.yml | 64 ++++++++++ .../Entities/Objects/Weapons/Melee/shives.yml | 37 ++++++ .../Entities/Objects/Weapons/Melee/spear.yml | 41 +++++++ .../Entities/Objects/Weapons/Melee/swords.yml | 111 ++++++++++++++++++ .../Structures/Machines/barmenkettle.yml | 32 +++++ Resources/Prototypes/ADT/Flavors/flavors.yml | 5 + .../ADT/Reagents/Consumable/Drink/drinks.yml | 99 ++++++++++++++++ .../ADT/Recipes/Cooking/meal_recipes.yml | 31 ++++- .../Crafting/Graphs/Improvised/shield.yml | 17 +++ .../Crafting/Graphs/Improvised/shives.yml | 39 ++++++ .../Crafting/Graphs/Improvised/spear.yml | 46 ++++++++ .../ADT/Recipes/Crafting/improvised.yml | 64 ++++++++++ .../ADT/Recipes/Reactions/drinks.yml | 31 +++++ Resources/Prototypes/ADT/tags.yml | 14 ++- .../Catalog/Fills/Lockers/service.yml | 1 + .../VendingMachines/Inventories/boozeomat.yml | 1 + .../Inventories/winterdrobe.yml | 5 + .../Objects/Materials/Sheets/glass.yml | 50 +++++++- .../Entities/Structures/Machines/lathe.yml | 1 + .../bluebeanie.rsi/equipped-HELMET.png | Bin 0 -> 340 bytes .../Head/Hats/beanies/bluebeanie.rsi/icon.png | Bin 0 -> 309 bytes .../Hats/beanies/bluebeanie.rsi/meta.json | 18 +++ .../darkbeanie.rsi/equipped-HELMET.png | Bin 0 -> 340 bytes .../Head/Hats/beanies/darkbeanie.rsi/icon.png | Bin 0 -> 360 bytes .../Hats/beanies/darkbeanie.rsi/meta.json | 18 +++ .../greenbeanie.rsi/equipped-HELMET.png | Bin 0 -> 340 bytes .../Hats/beanies/greenbeanie.rsi/icon.png | Bin 0 -> 313 bytes .../Hats/beanies/greenbeanie.rsi/meta.json | 18 +++ .../purplebeanie.rsi/equipped-HELMET.png | Bin 0 -> 340 bytes .../Hats/beanies/purplebeanie.rsi/icon.png | Bin 0 -> 317 bytes .../Hats/beanies/purplebeanie.rsi/meta.json | 18 +++ .../beanies/redbeanie.rsi/equipped-HELMET.png | Bin 0 -> 340 bytes .../Head/Hats/beanies/redbeanie.rsi/icon.png | Bin 0 -> 317 bytes .../Head/Hats/beanies/redbeanie.rsi/meta.json | 18 +++ .../Drinks/sh4ziktea/cherrytea.rsi/fill-1.png | Bin 0 -> 279 bytes .../Drinks/sh4ziktea/cherrytea.rsi/fill-2.png | Bin 0 -> 294 bytes .../Drinks/sh4ziktea/cherrytea.rsi/fill-3.png | Bin 0 -> 291 bytes .../Drinks/sh4ziktea/cherrytea.rsi/fill-4.png | Bin 0 -> 315 bytes .../Drinks/sh4ziktea/cherrytea.rsi/icon.png | Bin 0 -> 393 bytes .../sh4ziktea/cherrytea.rsi/icon_empty.png | Bin 0 -> 3069 bytes .../Drinks/sh4ziktea/cherrytea.rsi/meta.json | 34 ++++++ .../sh4ziktea/cherrytea.rsi/teapack.png | Bin 0 -> 483 bytes .../Drinks/sh4ziktea/orangetea.rsi/fill-1.png | Bin 0 -> 285 bytes .../Drinks/sh4ziktea/orangetea.rsi/fill-2.png | Bin 0 -> 330 bytes .../Drinks/sh4ziktea/orangetea.rsi/fill-3.png | Bin 0 -> 330 bytes .../Drinks/sh4ziktea/orangetea.rsi/fill-4.png | Bin 0 -> 321 bytes .../Drinks/sh4ziktea/orangetea.rsi/icon.png | Bin 0 -> 396 bytes .../sh4ziktea/orangetea.rsi/icon_empty.png | Bin 0 -> 3069 bytes .../Drinks/sh4ziktea/orangetea.rsi/meta.json | 34 ++++++ .../sh4ziktea/orangetea.rsi/teapack.png | Bin 0 -> 498 bytes .../Drinks/sh4ziktea/teapack.rsi/icon.png | Bin 0 -> 420 bytes .../Drinks/sh4ziktea/teapack.rsi/meta.json | 19 +++ .../Drinks/sh4ziktea/teapack.rsi/teabox.png | Bin 0 -> 330 bytes .../sh4ziktea/watermelontea.rsi/fill-1.png | Bin 0 -> 207 bytes .../sh4ziktea/watermelontea.rsi/fill-2.png | Bin 0 -> 225 bytes .../sh4ziktea/watermelontea.rsi/fill-3.png | Bin 0 -> 228 bytes .../sh4ziktea/watermelontea.rsi/fill-4.png | Bin 0 -> 255 bytes .../sh4ziktea/watermelontea.rsi/icon.png | Bin 0 -> 405 bytes .../watermelontea.rsi/icon_empty.png | Bin 0 -> 342 bytes .../sh4ziktea/watermelontea.rsi/meta.json | 34 ++++++ .../sh4ziktea/watermelontea.rsi/teapack.png | Bin 0 -> 483 bytes .../Food/Baked/pizza.rsi/box-inhand-left.png | Bin 0 -> 570 bytes .../Food/Baked/pizza.rsi/box-inhand-right.png | Bin 0 -> 633 bytes .../Food/Baked/pizza.rsi/boxclosed.png | Bin 0 -> 324 bytes .../Food/Baked/pizza.rsi/boxopen.png | Bin 0 -> 225 bytes .../Food/Baked/pizza.rsi/fullpizza.png | Bin 0 -> 858 bytes .../Consumable/Food/Baked/pizza.rsi/meta.json | 32 +++++ .../Food/Baked/pizza.rsi/pizzaslice.png | Bin 0 -> 432 bytes .../Melee/Rplasma_shiv.rsi/equipped-BELT.png | Bin 0 -> 245 bytes .../Weapons/Melee/Rplasma_shiv.rsi/icon.png | Bin 0 -> 492 bytes .../Melee/Rplasma_shiv.rsi/inhand-left.png | Bin 0 -> 390 bytes .../Melee/Rplasma_shiv.rsi/inhand-right.png | Bin 0 -> 389 bytes .../Weapons/Melee/Rplasma_shiv.rsi/meta.json | 26 ++++ .../Rplasma_spear.rsi/equipped-BACKPACK.png | Bin 0 -> 568 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 363 bytes .../equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../Rplasma_spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../Melee/Rplasma_spear.rsi/inhand-left.png | Bin 0 -> 675 bytes .../Rplasma_spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Melee/Rplasma_spear.rsi/inhand-right.png | Bin 0 -> 675 bytes .../Weapons/Melee/Rplasma_spear.rsi/meta.json | 65 ++++++++++ .../Weapons/Melee/Rplasma_spear.rsi/spear.png | Bin 0 -> 417 bytes .../Melee/Rplasma_spear.rsi/spear1.png | Bin 0 -> 1965 bytes .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../Rplasma_spear.rsi/wielded-inhand-left.png | Bin 0 -> 670 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../wielded-inhand-right.png | Bin 0 -> 650 bytes .../Melee/Ruranium_shiv.rsi/equipped-BELT.png | Bin 0 -> 263 bytes .../Weapons/Melee/Ruranium_shiv.rsi/icon.png | Bin 0 -> 471 bytes .../Melee/Ruranium_shiv.rsi/inhand-left.png | Bin 0 -> 309 bytes .../Melee/Ruranium_shiv.rsi/inhand-right.png | Bin 0 -> 301 bytes .../Weapons/Melee/Ruranium_shiv.rsi/meta.json | 26 ++++ .../Ruranium_spear.rsi/equipped-BACKPACK.png | Bin 0 -> 494 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 368 bytes .../equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../Ruranium_spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../Melee/Ruranium_spear.rsi/inhand-left.png | Bin 0 -> 621 bytes .../inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Melee/Ruranium_spear.rsi/inhand-right.png | Bin 0 -> 630 bytes .../Melee/Ruranium_spear.rsi/meta.json | 65 ++++++++++ .../Melee/Ruranium_spear.rsi/spear.png | Bin 0 -> 417 bytes .../Melee/Ruranium_spear.rsi/spear1.png | Bin 0 -> 1965 bytes .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-left.png | Bin 0 -> 614 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../wielded-inhand-right.png | Bin 0 -> 591 bytes .../Weapons/Melee/fullshield.rsi/icon.png | Bin 0 -> 374 bytes .../Weapons/Melee/fullshield.rsi/meta.json | 18 +++ .../Melee/fullshield.rsi/metal-inhand.png | Bin 0 -> 1287 bytes .../Melee/fullshieldsindi.rsi/icon.png | Bin 0 -> 687 bytes .../Melee/fullshieldsindi.rsi/meta.json | 18 +++ .../fullshieldsindi.rsi/metal-inhand.png | Bin 0 -> 1611 bytes .../glassdagger.rsi/dagger-inhand-left.png | Bin 0 -> 411 bytes .../glassdagger.rsi/dagger-inhand-right.png | Bin 0 -> 429 bytes .../makeshitdaggers/glassdagger.rsi/icon.png | Bin 0 -> 279 bytes .../makeshitdaggers/glassdagger.rsi/meta.json | 22 ++++ .../plasmadagger.rsi/dagger-inhand-left.png | Bin 0 -> 417 bytes .../plasmadagger.rsi/dagger-inhand-right.png | Bin 0 -> 432 bytes .../makeshitdaggers/plasmadagger.rsi/icon.png | Bin 0 -> 300 bytes .../plasmadagger.rsi/meta.json | 22 ++++ .../dagger-inhand-left.png | Bin 0 -> 411 bytes .../dagger-inhand-right.png | Bin 0 -> 429 bytes .../reinforceddagger.rsi/icon.png | Bin 0 -> 279 bytes .../reinforceddagger.rsi/meta.json | 22 ++++ .../uraniumdagger.rsi/dagger-inhand-left.png | Bin 0 -> 408 bytes .../uraniumdagger.rsi/dagger-inhand-right.png | Bin 0 -> 426 bytes .../uraniumdagger.rsi/icon.png | Bin 0 -> 273 bytes .../uraniumdagger.rsi/meta.json | 22 ++++ .../Machines/hotplatebarmen.rsi/beaker.png | Bin 0 -> 217 bytes .../Machines/hotplatebarmen.rsi/icon.png | Bin 0 -> 222 bytes .../Machines/hotplatebarmen.rsi/meta.json | 1 + .../Machines/hotplatebarmen.rsi/on.png | Bin 0 -> 129 bytes 158 files changed, 1872 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Devices/kettlecircuit.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/pizza.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/teabox.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl create mode 100644 Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pizza.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/teapacks.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Materials/shards.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/teabox.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Shields/fullshieldsindi.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Machines/barmenkettle.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-2.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-3.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-4.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/icon_empty.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/teapack.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-2.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-3.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-4.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/icon_empty.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/teapack.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/teabox.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-2.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-3.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-4.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/icon_empty.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/teapack.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/boxclosed.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/boxopen.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/fullpizza.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/pizzaslice.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/spear.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/spear1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/spear.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/spear1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/metal-inhand.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/metal-inhand.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/dagger-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/dagger-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/dagger-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/dagger-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/dagger-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/dagger-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/dagger-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/dagger-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/beaker.png create mode 100644 Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/icon.png create mode 100644 Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/on.png diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl index c1f57ce5aa5..2afd7b3f30f 100644 --- a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -38,3 +38,4 @@ flavor-complex-goldenale = как эль, золото и исцеление flavor-base-adtpoppy = маково flavor-complex-adtrelaxing = как довольно сильный наркотик flavor-base-adtvanilla = ванильно +flavor-base-adtsindipizza = зловеще сырно \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index 75669c1c7d0..46e060fe671 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -89,3 +89,9 @@ uplink-blackmail-bundle-desc = Набор для относительно эфф uplink-syndicate-helmet-name = шлем спецназа uplink-syndicate-helmet-desc = Очень прочный шлем, широко используемый военизированными организациями. Его украшает ужасный узор из красных и чёрных полос. Да прибудет с вами робаст + +uplink-nukiesShield-name = двухручный штурмовый щит +uplink-nukiesShield-desc = Массивный и опасный, двухручный щит из элитных материалов для лучшей защиты щитоносца, имеет несколько рядов пластин защищающих от каждого типа урона, а также несколько острейших шипов на основе щита. Да прибудут с вами силы синдиката. + +uplink-omnizinpizza-name = коробка с пиццей синдиката +uplink-omnizinpizza-desc = Это самая обычная коробка, с самой обычной пиццей внутри, это именно то, что используют элитные агенты для перекуса между стрельбой с капитаном, и кражей Иана. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl index 268a9038245..4deba54ae2c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl @@ -112,3 +112,18 @@ ent-ADTClothingHeadEmpressOfLightHelmet = коронет Императрицы ent-ADTClothingHeadLethalCompanyHelmet = шлем сотрудника Смертельной компании .suffix = Хеллоуин .desc = Шлем как шлем. Кажется, его кто-то до меня носил... + +ent-ADTClothingHeadHatDarkBenie = чёрная зимняя шапка + .desc = Тёплая вязанная шапка, которая точно сохранит вашу голову во время зимних вечеров на станции + +ent-ADTClothingHeadHatBlueBenie = синяя зимняя шапка + .desc = Тёплая вязанная шапка, которая точно сохранит вашу голову во время зимних вечеров на станции + +ent-ADTClothingHeadHatGreenBenie = зелёная зимняя шапка + .desc = Тёплая вязанная шапка, которая точно сохранит вашу голову во время зимних вечеров на станции + +ent-ADTClothingHeadHatPurpleBenie = фиолетовая зимняя шапка + .desc = Тёплая вязанная шапка, которая точно сохранит вашу голову во время зимних вечеров на станции + +ent-ADTClothingHeadHatRedBenie = красная зимняя шапка + .desc = Тёплая вязанная шапка, которая точно сохранит вашу голову во время зимних вечеров на станции diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Devices/kettlecircuit.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Devices/kettlecircuit.ftl new file mode 100644 index 00000000000..d88b1a45c5c --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Devices/kettlecircuit.ftl @@ -0,0 +1,2 @@ +ent-ADTBarmenKettleCircuit = плата для создания чайника бармена + .desc = Самая обыкновенная плата для создания самого обыкновенного чайника для бармена. Как креативно.. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl index bb1efcb5d49..419e1b2a2ee 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl @@ -117,3 +117,15 @@ ent-ADTDrinkSecUnfilteredBeerGlass = { ent-DrinkGlass } ent-ADTDrinkGlyphidStoutBeerGlass = { ent-DrinkGlass } .suffix = Глифидский стаут, Октоберфест .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkOrangeTeaGlass = { ent-DrinkGlass } + .suffix = Апельсиновый чай + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkCherryTeaGlass = { ent-DrinkGlass } + .suffix = Вишнёвый чай + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkWatermelonTeaGlass = { ent-DrinkGlass } + .suffix = Арбузный чай + .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/pizza.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/pizza.ftl new file mode 100644 index 00000000000..de07cc5d0fb --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/pizza.ftl @@ -0,0 +1,5 @@ +ent-ADRFoodPizzaSindi = пицца синдиката + .desc = Если ты хочешь устроить вечеринку предателей корпорации, это именно то, что тебе и нужно. Больше сыра в комплекте, при заказе двух пицц! (Вы никогда не получите свой дополнительный сыр.) + +ent-ADTFoodPizzaSindiSlice = кусочек пиццы синдиката + .desc = Если ты хочешь устроить вечеринку предателей корпорации, это именно то, что тебе и нужно. Возможно, что данная пицца пропитана кровью представителей центрального командования, или это просто особая мутация помидоров. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl index e060ddfb874..45d74cb606c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl @@ -3,3 +3,6 @@ ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто) ent-ADTFoodTinCondensedMilk = сгущеное молоко .desc = Стандартная банка сгущенки с удобным язычком. + +ent-ADTFoodBoxSyndiPizza = пицца синдиката + .desc = Довольно большая коробка с пиццей синдиката внутри, возможно, тот кто ест эту пиццу настоящий безсердечный ублюдок, но её вкус замечателен. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl new file mode 100644 index 00000000000..ae553032c1a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl @@ -0,0 +1,11 @@ +ent-ADTOrangeTeapack = пакетик сиропа апельсинового чая + .desc = Это пакетик, заполненный сиропом для апельсинового чая, его, в основном используют для приготовления чая. + +ent-ADTCherryTeapack = пакетик сиропа вишнёвого чая + .desc = Это пакетик, заполненный сиропом для вишнёвого чая, его, в основном используют для приготовления чая. + +ent-ADTWatermelonTeapack = пакетик сиропа арбузного чая + .desc = Это пакетик, заполненный сиропом для арбузного чая?.. Его, в основном используют для приготовления чая. + +ent-ADTEmptyTeaPack = пустой пакетик для сиропа чая + .desc = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни, и апельсина в микроволновке, довольно креативно, должно быть.. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/teabox.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/teabox.ftl new file mode 100644 index 00000000000..cd2f334b39d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/teabox.ftl @@ -0,0 +1,2 @@ +ent-ADTTeabox = коробка чая + .desc = Это небольшая коробка полная сиропа для приготовления чая, а также дополнительные, пустые пакетики для дальнейшего приготовления сиропов \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl index 70fd365b780..af43cb110e4 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl @@ -1,3 +1,8 @@ ent-ADTEctoShield = эктоплазменный щит .desc = Не позволяет фантому взаимодействовать с носителем, так ещё и выглядит модно. +ent-ADTFullRiotShield = самодельный двухручный щит + .desc = Обладает довольно массивной защитой для носителя, выглядит громостко, но выполняет свою работу + +ent-ADTFullRiotShieldSyndicate = штурмовый двухручный щит синдиката + .desc = Громосткий щит созданный синдикатом из самых тяжёлых и крепких материалов, создан для длительных штурмов, и имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. \ No newline at end of file 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 c34729023e9..ab744f500d6 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 @@ -30,4 +30,14 @@ ent-ADTJasonMachette = мачете Джейсона .suffix = Хеллоуин .desc = Мачете одного из самых ужасающих маньяков. Сбоку маленькая надпись "полиуретан". +ent-SpearReinforcedUran = копьё из закалённого урана + .desc = Копьё созданное из осколка закалённого урана, для более удобной нарезки ваших оппонентов. +ent-ADTReinforcedUraniumShiv = заточка из закалённого урана + .desc = Заточка созданная из осколка закалённого урана, имеющий тканневую основу, для более удобной нарезки ваших оппонентов. + +ent-SpearReinforcedPlasma = копьё из закалённой плазмы + .desc = Копьё созданное из осколка закалённой плазмы, для более удобной нарезки ваших оппонентов. + +ent-ADTReinforcedPlasmaShiv = заточка из закалённой плазмы + .desc = Заточка созданная из осколка закалённой плазмы, имеющий тканневую основу, для более удобной нарезки ваших оппонентов. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl new file mode 100644 index 00000000000..8569afbee41 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl @@ -0,0 +1,2 @@ +ent-ADTBarmenKettle = чайник бармена + .desc = Этот ультрасовременный технологический шедевр — чайник (Обычная грелка собранная из металлолома), который не просто кипятит воду, а выводит ежедневный комфорт на новый уровень! (Он потребляет много электричества, и довольно взрывоопасен.) И всё это — абсолютно бесплатно. Великолепие, доступное каждому! (Большое количество ресурсов уходит на создание обычного чайника.) \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl new file mode 100644 index 00000000000..92daba1bcd4 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -0,0 +1,22 @@ +reagent-name-orangeTea = апельсиновый чай +reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости +reagent-physical-desc-orangetea = тёплая, сладкая субстанция + +reagent-name-cherryTea = вишнёвый чай +reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости +reagent-physical-desc-cherrytea = тёплая, сладкая субстанция + +reagent-name-watermelonTea = арбузный чай +reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. +reagent-physical-desc-watermelontea = тёплая, сладкая субстанция + +reagent-name-orangePack = апельсиновый сироп +reagent-desc-orangepack = Горький сироп для приготовления чая +reagent-physical-desc-orangepack = горькая, металлическая субстанция +reagent-name-cherryPack = вишнёвый сироп +reagent-desc-cherrypack = Горький сироп для приготовления чая +reagent-physical-desc-cherrypack = горькая, металлическая субстанция + +reagent-name-watermelonPack = арбузный сироп +reagent-desc-watermelonpack = Горький сироп для приготовления чая +reagent-physical-desc-watermelonpack = горькая, металлическая субстанция \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index db8c79d31d9..31f9d766504 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -422,6 +422,22 @@ tags: - NukeOpsUplink +- type: listing + id: ADTUplinkNukiesShield + name: uplink-nukiesShield-name + description: uplink-nukiesShield-desc + icon: { sprite: ADT/Objects/Weapons/Melee/fullshieldsindi.rsi, state: icon} + productEntity: ADTFullRiotShieldSyndicate + cost: + Telecrystal: 16 + categories: + - UplinkWeaponry + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - type: listing id: ADTUplinkMaidBundle name: uplink-maid-bundle-name @@ -432,6 +448,17 @@ categories: - UplinkPointless + +- type: listing + id: ADTUplinkOmnizinPizza + name: uplink-omnizinpizza-name + description: uplink-omnizinpizza-desc + productEntity: ADTFoodBoxSyndiPizza + cost: + Telecrystal: 4 + categories: + - UplinkPointless + - type: listing id: ADTUplinkSyndicateHelmet name: uplink-syndicate-helmet-name diff --git a/Resources/Prototypes/ADT/Datasets/tags.yml b/Resources/Prototypes/ADT/Datasets/tags.yml index 8a150dfe853..527bfafad8c 100644 --- a/Resources/Prototypes/ADT/Datasets/tags.yml +++ b/Resources/Prototypes/ADT/Datasets/tags.yml @@ -162,3 +162,4 @@ - Trash - Wirecutter - Wrench + - ADTTeaPack \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index fe567b4310c..5b91432c2b0 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -460,3 +460,60 @@ sprite: ADT/Clothing/Head/Hats/sollux_captor.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/sollux_captor.rsi + +# Sh4zik hats??? Woah. + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatDarkBenie + name: Dark Beanie + description: oridiniary dark beanie. nothing really to see here. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBlueBenie + name: Blue Beanie + description: oridiniary blue beanie. nothing really to see here. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatGreenBenie + name: Green Beanie + description: oridiniary green beanie. nothing really to see here. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatPurpleBenie + name: Purple Beanie + description: oridiniary purple beanie. nothing really to see here. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatRedBenie + name: Red Beanie + description: oridiniary red beanie. nothing really to see here. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beanies/redbeanie.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beanies/redbeanie.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml index 49b3773ff41..f42b5441f1f 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml @@ -485,3 +485,53 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/glyfidstout.rsi state: icon + +#Sh4zik drinks, oh my. Im alive? Surprised. Hello, btw! + +- type: entity + parent: DrinkGlass + id: ADTDrinkOrangeTeaGlass + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 25 + reagents: + - ReagentId: ADTOrangeTeaReg + Quantity: 25 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkCherryTeaGlass + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 25 + reagents: + - ReagentId: ADTCherryTeaReg + Quantity: 25 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkWatermelonTeaGlass + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 25 + reagents: + - ReagentId: ADTWatermelonTeaReg + Quantity: 25 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi + state: icon + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pizza.yml new file mode 100644 index 00000000000..eccd056ccd8 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -0,0 +1,89 @@ +- type: entity + parent: FoodInjectableBase + id: ADTFoodPizzaSindiBase + abstract: true + components: + - type: FlavorProfile + flavors: + - oily + - bread + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/pizza.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Omnizine + Quantity: 10 + - type: SliceableFood + count: 8 + - type: Item + size: Normal + shape: + - 0,0,2,1 + - type: Tag + tags: + - Pizza + - ReptilianFood + +- type: entity + name: Sindi pizza + parent: ADTFoodPizzaSindiBase + id: ADRFoodPizzaSindi + description: Red and scary pizza + components: + - type: FlavorProfile + flavors: + - ADTSindiPizza + - type: Sprite + layers: + - state: fullpizza + - type: SliceableFood + slice: ADTFoodPizzaSindiSlice + +- type: entity + parent: FoodInjectableBase # Not sliceable + id: ADTFoodPizzaSindiSliceBase + abstract: true + components: + - type: FlavorProfile + flavors: + - ADTSindiPizza + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/pizza.rsi + - type: SolutionContainerManager + solutions: + food: + # Note: Keep FoodPizzaMoldySlice & FoodPizzaSliceBase roughly in sync + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Omnizine + Quantity: 1 + - type: Item + size: Tiny + - type: Tag + tags: + - Pizza + - ReptilianFood + - Slice + + +- type: entity + name: slice of sindi pizza + parent: ADTFoodPizzaSindiSliceBase + id: ADTFoodPizzaSindiSlice + description: A slice of syndicate. + components: + - type: FlavorProfile + flavors: + - ADTSindiPizza + - type: Sprite + layers: + - state: pizzaslice \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml new file mode 100644 index 00000000000..8645c950b18 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml @@ -0,0 +1,41 @@ +# PizzaSindyk + +- type: entity + parent: BoxCardboard + id: ADTFoodBoxSyndiPizza + name: sindi pizza box + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/pizza.rsi + drawdepth: SmallObjects + layers: + - state: boxclosed + map: ["enum.StorageVisualLayers.Base"] + - state: boxopen + map: ["enum.StorageVisualLayers.Door"] + - type: Storage + grid: + - 0,0,3,1 + maxItemSize: Normal + whitelist: + components: + - Utensil + tags: + - Pizza + - type: Item + sprite: ADT/Objects/Consumable/Food/Baked/pizza.rsi + inhandVisuals: + left: + - state: box-inhand-left + right: + - state: box-inhand-right + - type: Appearance + - type: EntityStorageVisuals + stateDoorOpen: boxopen + stateDoorClosed: boxclosed + - type: StaticPrice + price: 0 + - type: StorageFill + contents: + - id: KnifePlastic + - id: ADRFoodPizzaSindi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/teapacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/teapacks.yml new file mode 100644 index 00000000000..5e837309985 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/teapacks.yml @@ -0,0 +1,92 @@ +- type: entity + name: ADTOrangeTeapack + parent: DrinkBase + id: ADTOrangeTeapack + description: its teapack with orange tea. + components: + - type: Tag + tags: + - ADTTeaPack + - type: FlavorProfile + flavors: + - bitter + - metallic + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi + state: teapack + - type: SolutionContainerManager + solutions: + drink: + maxVol: 1 + reagents: + - ReagentId: ADTOrangepackReg + Quantity: 1 + - type: Item + size: Tiny + +- type: entity + name: ADTCherryTeapack + parent: DrinkBase + id: ADTCherryTeapack + description: its teapack with cherry tea. + components: + - type: Tag + tags: + - ADTTeaPack + - type: FlavorProfile + flavors: + - bitter + - metallic + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi + state: teapack + - type: SolutionContainerManager + solutions: + drink: + maxVol: 1 + reagents: + - ReagentId: ADTCherrypackReg + Quantity: 1 + - type: Item + size: Tiny + +- type: entity + name: ADTWatermelonTeapack + parent: DrinkBase + id: ADTWatermelonTeapack + description: its teapack with watermelon tea. + components: + - type: Tag + tags: + - ADTTeaPack + - type: FlavorProfile + flavors: + - bitter + - metallic + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi + state: teapack + - type: SolutionContainerManager + solutions: + drink: + maxVol: 1 + reagents: + - ReagentId: ADTWatermelonpackReg + Quantity: 1 + - type: Item + size: Tiny + +- type: entity + parent: BaseItem + id: ADTEmptyTeaPack + name: Teapack + description: Hmmmm. Its for tea, i guess. + components: + - type: Tag + tags: + - ADTTeaPack + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi + state: icon + - type: Item + size: Tiny diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 9b09499f0c4..e9f5ea54528 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -31,3 +31,16 @@ GlassBeaker: amount: 2 defaultPrototype: Beaker + + +- type: entity + id: ADTBarmenKettleCircuit + parent: BaseMachineCircuitboard + name: kettle machine board + description: A machine printed circuit board for a kettle. + components: + - type: MachineBoard + prototype: ADTBarmenKettle + stackRequirements: + Capacitor: 2 + Glass: 1 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/ADT/Entities/Objects/Materials/shards.yml new file mode 100644 index 00000000000..95ba1c1b798 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Materials/shards.yml @@ -0,0 +1,75 @@ +- type: entity + parent: ShardBase + id: ADTShardGlassReinforcedPlasma + name: plsmaref glass shard + description: A small piece of plasma glass. + components: + - type: Sprite + color: "#FF72E7" + - type: MeleeWeapon + damage: + types: + Slash: 4.5 + Radiation: 2 + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: SheetPlasma1 + - type: DamageUserOnTrigger + damage: + types: + Piercing: 5 + - type: Tag + tags: + - ADTRPlasmaShard + - Trash + - type: Extractable + grindableSolutionName: sharduglass + - type: SolutionContainerManager + solutions: + sharduglass: + reagents: + - ReagentId: Silicon + Quantity: 5 + - ReagentId: Uranium + Quantity: 5 + - type: Construction + graph: ADTPShiv + node: start + +- type: entity + parent: ShardBase + id: ADTShardGlassReinforcedUran + name: ref uran glass shard + description: A small piece of uranium glass. + components: + - type: Sprite + color: "#8eff7a" + - type: MeleeWeapon + damage: + types: + Slash: 4.5 + Radiation: 2 + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: SheetUranium1 + - type: DamageUserOnTrigger + damage: + types: + Piercing: 5 + Radiation: 2.5 + - type: Tag + tags: + - Trash + - ADTRUranShard + - type: Extractable + grindableSolutionName: sharduglass + - type: SolutionContainerManager + solutions: + sharduglass: + reagents: + - ReagentId: Silicon + Quantity: 5 + - ReagentId: Uranium + Quantity: 5 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/teabox.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/teabox.yml new file mode 100644 index 00000000000..74e25bfc4d9 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/teabox.yml @@ -0,0 +1,28 @@ +- type: entity + name: Tea Box + parent: BaseStorageItem + id: ADTTeabox + description: Woah. So much tea you have here. + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi + state: teabox + shape: + - 0,0,1,0 + - type: Storage + maxItemSize: Tiny + grid: + - 0,0,3,1 + whitelist: + tags: + - ADTTeaPack + - type: StorageFill + contents: + - id: ADTOrangeTeapack + - id: ADTOrangeTeapack + - id: ADTEmptyTeaPack + - id: ADTEmptyTeaPack + - id: ADTCherryTeapack + - id: ADTCherryTeapack + - id: ADTEmptyTeaPack + - id: ADTEmptyTeaPack \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml new file mode 100644 index 00000000000..f7b765b5baa --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml @@ -0,0 +1,67 @@ +- type: entity + name: Full Riot Shield + parent: BaseShield + id: ADTFullRiotShield + suffix: Full Shield + description: A big big shield. yeah. very creative. + components: + - type: MeleeWeapon + wideAnimationRotation: -10 + angle: 0 + damage: + types: + Blunt: 10 + soundHit: + collection: MetalThud + - type: Reflect + reflectProb: 0.05 + spread: 90 + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/fullshield.rsi + state: icon + - type: Item + sprite: ADT/Objects/Weapons/Melee/fullshield.rsi + inhandVisuals: + left: + - state: metal-inhand + right: + - state: metal-inhand + size: Ginormous + - type: MultiHandedItem + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.4 + flatReductions: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.4 + - type: ClothingSpeedModifier + walkModifier: 0.4 + sprintModifier: 0.4 + - type: HeldSpeedModifier + - type: Construction + graph: ADTShield + node: ADTFullShield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 500 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 400 #Weaker shield + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - type: Tag + tags: + - ADTFullRiotShitmadeShield \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshieldsindi.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshieldsindi.yml new file mode 100644 index 00000000000..fb22c07834e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshieldsindi.yml @@ -0,0 +1,64 @@ +- type: entity + name: Full Riot syndicate Shield + parent: BaseShield + id: ADTFullRiotShieldSyndicate + suffix: Full Shield + description: A big big red shield. yeah. very creative. + components: + - type: MeleeWeapon + wideAnimationRotation: -10 + angle: 0 + damage: + types: + Blunt: 5 + Structural: 5 + Slash: 10 + Piercing: 10 + soundHit: + collection: MetalThud + - type: Reflect + reflectProb: 0.3 + spread: 90 + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/fullshieldsindi.rsi + state: icon + - type: Item + sprite: ADT/Objects/Weapons/Melee/fullshieldsindi.rsi + inhandVisuals: + left: + - state: metal-inhand + right: + - state: metal-inhand + size: Ginormous + - type: MultiHandedItem + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.1 + Slash: 0.1 + Piercing: 0.1 + flatReductions: + Blunt: 0.1 + Slash: 0.1 + Piercing: 0.1 + - type: ClothingSpeedModifier + walkModifier: 0.3 + sprintModifier: 0.3 + - type: HeldSpeedModifier + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 99999 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 99999 #Weaker shield + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml new file mode 100644 index 00000000000..a68d3a8ef19 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml @@ -0,0 +1,37 @@ +- type: entity + name: reinforced plasma shiv + parent: Shiv + id: ADTReinforcedPlasmaShiv + description: A crude weapon fashioned from a piece of cloth and a reinforced plasma glass shard. + components: + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 9 + - type: Item + sprite: ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi + - type: Construction + graph: ADTPShiv + node: ADTPlasmaShiv + +- type: entity + name: reinforced uranium shiv + parent: Shiv + id: ADTReinforcedUraniumShiv + description: A crude weapon fashioned from a piece of cloth and a uranium glass shard. + components: + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 9 + - type: Item + sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi + - type: Construction + graph: ADTUShiv + node: ADTUraniumShiv \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml new file mode 100644 index 00000000000..729ae60bdb5 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml @@ -0,0 +1,41 @@ +- type: entity + name: reinforced plasma spear + parent: Spear + id: SpearReinforcedPlasma + description: A spear with a reinforced plasma glass shard as a tip. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/Rplasma_spear.rsi + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Piercing: 15 + - type: DamageOtherOnHit + damage: + types: + Piercing: 18 + - type: Construction + graph: ADTPlasmaSpear + +- type: entity + name: reinforced uranium spear + parent: Spear + id: SpearReinforcedUran + description: A spear with a uran rein shard as a tip. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/Ruranium_spear.rsi + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Piercing: 18 + Radiation: 9 + - type: DamageOtherOnHit + damage: + types: + Piercing: 21 + Radiation: 9 + - type: Construction + graph: ADTUraniumSpear \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index 172ed7b79d9..f09a959c7f3 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml @@ -80,3 +80,114 @@ damage: types: Blunt: 0.1 + + +- type: entity + name: dagger plasma + parent: BaseKnife + id: ADTPlasmaDagger + description: Dogor + components: + - type: Tag + tags: + - Knife + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi + state: icon + - type: Item + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi + inhandVisuals: + left: + - state: dagger-inhand-left + right: + - state: dagger-inhand-right + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.75 + damage: + types: + Slash: 6.3 + size: Small + +- type: entity + name: dagger reinforced + parent: BaseKnife + id: ADTGlassReinDagger + description: Dogor + components: + - type: Tag + tags: + - Knife + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi + state: icon + - type: Item + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi + inhandVisuals: + left: + - state: dagger-inhand-left + right: + - state: dagger-inhand-right + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.75 + damage: + types: + Slash: 6 + size: Small + +- type: entity + name: dagger glass + parent: BaseKnife + id: ADTGlassDagger + description: Dogor + components: + - type: Tag + tags: + - Knife + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi + state: icon + - type: Item + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi + inhandVisuals: + left: + - state: dagger-inhand-left + right: + - state: dagger-inhand-right + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.75 + damage: + types: + Slash: 5 + size: Small + +- type: entity + name: dagger uranium + parent: BaseKnife + id: ADTGlassUranDagger + description: Dogor + components: + - type: Tag + tags: + - Knife + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi + state: icon + - type: Item + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi + inhandVisuals: + left: + - state: dagger-inhand-left + right: + - state: dagger-inhand-right + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.75 + damage: + types: + Slash: 9 + size: Small + + diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/barmenkettle.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/barmenkettle.yml new file mode 100644 index 00000000000..902fcc19660 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/barmenkettle.yml @@ -0,0 +1,32 @@ +- type: entity + parent: BaseHeaterMachine + id: ADTBarmenKettle + name: kettle + description: "Kettle. Wow" + components: + - type: Sprite + sprite: ADT/Structures/Machines/hotplatebarmen.rsi + drawdepth: SmallObjects + snapCardinals: true + layers: + - state: icon + - state: on + map: ["enum.SolutionHeaterVisuals.IsOn"] + shader: unshaded + - type: SolutionHeater + heatPerSecond: 160 + - type: ItemPlacer + whitelist: + components: + - FitsInDispenser + - type: PlaceableSurface + placeCentered: true + positionOffset: 0, 0.25 + - type: Machine + board: ADTBarmenKettleCircuit + - type: GenericVisualizer + visuals: + enum.SolutionHeaterVisuals.IsOn: + enum.SolutionHeaterVisuals.IsOn: + True: { visible: true } + False: { visible: false } \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml index c18d7384994..44d5b99d00e 100644 --- a/Resources/Prototypes/ADT/Flavors/flavors.yml +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -176,6 +176,11 @@ flavorType: Complex description: flavor-complex-adtrelaxing +- type: flavor + id: ADTSindiPizza + flavorType: base + description: flavor-base-adtsindipizza + - type: flavor id: adt_vanilla flavorType: Base diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml index b6a944bce5f..bb7588988f3 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml @@ -181,3 +181,102 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false + +- type: reagent + id: ADTOrangeTeaReg + name: reagent-name-orangeTea + parent: BaseDrink + desc: reagent-desc-orangetea + physicalDesc: reagent-physical-desc-orangetea + flavor: sweet + color: "#FF8C00" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.6 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + +- type: reagent + id: ADTCherryTeaReg + name: reagent-name-cherryTea + parent: BaseDrink + desc: reagent-desc-cherrytea + physicalDesc: reagent-physical-desc-cherrytea + flavor: sweet + color: "#FFB6C1" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.6 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + +- type: reagent + id: ADTWatermelonTeaReg + name: reagent-name-watermelonTea + parent: BaseDrink + desc: reagent-desc-watermelontea + physicalDesc: reagent-physical-desc-watermelontea + flavor: sweet + color: "#F08080" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.6 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + +- type: reagent + id: ADTOrangepackReg + name: reagent-name-orangePack + parent: BaseDrink + desc: reagent-desc-orangepack + physicalDesc: reagent-physical-desc-orangepack + flavor: sweet + color: "#FF8C00" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.1 + +- type: reagent + id: ADTCherrypackReg + name: reagent-name-cherryPack + parent: BaseDrink + desc: reagent-desc-cherrypack + physicalDesc: reagent-physical-desc-cherrypack + flavor: sweet + color: "#FFB6C1" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.1 + +- type: reagent + id: ADTWatermelonpackReg + name: reagent-name-watermelonPack + parent: BaseDrink + desc: reagent-desc-watermelonpack + physicalDesc: reagent-physical-desc-watermelonpack + flavor: sweet + color: "#F08080" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.1 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml index cb5843239e8..8af1ba7b339 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml @@ -44,4 +44,33 @@ FoodPlateSmall: 1 FoodCheeseSlice: 1 FoodOnion: 1 - ADTOrganVulpkaninAnimalLiver: 1 \ No newline at end of file + ADTOrganVulpkaninAnimalLiver: 1 + +# Sh4zik tea packs, Starting below + +- type: microwaveMealRecipe + id: ADTDrinkTeaPackOrange + name: OrangeTeapack + result: ADTOrangeTeapack + time: 10 + solids: + ADTEmptyTeaPack: 1 + FoodOrange: 1 + +- type: microwaveMealRecipe + id: ADTDrinkTeaPackCherry + name: CherryTeapack + result: ADTCherryTeapack + time: 10 + solids: + ADTEmptyTeaPack: 1 + FoodCherry: 1 + +- type: microwaveMealRecipe + id: ADTDrinkTeaPackWatermelon + name: WatermelonTeapack + result: ADTWatermelonTeapack + time: 10 + solids: + ADTEmptyTeaPack: 1 + FoodWatermelonSlice: 1 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml new file mode 100644 index 00000000000..8e8416381a0 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml @@ -0,0 +1,17 @@ +- type: constructionGraph + 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 \ 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 new file mode 100644 index 00000000000..47f1153f3f2 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml @@ -0,0 +1,39 @@ +- type: constructionGraph + id: ADTPShiv + start: start + graph: + - node: start + edges: + - to: ADTCompPlasmaShiv + steps: + - tag: ADTRPlasmaShard + name: "Осколок плазменного стекла" + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompPlasmaShiv + entity: ADTReinforcedPlasmaShiv + +- type: constructionGraph + id: ADTUShiv + start: start + graph: + - node: start + edges: + - to: ADTCompUraniumShiv + steps: + - tag: ADTRUranShard + name: "Осколок уранового стекла" + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompUraniumShiv + entity: ADTReinforcedUraniumShiv \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml new file mode 100644 index 00000000000..9d59ab0069a --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml @@ -0,0 +1,46 @@ +- type: constructionGraph + id: ADTPSpear + start: start + graph: + - node: start + edges: + - to: ADTCompPlasmaSpear + steps: + - material: MetalRod + amount: 2 + doAfter: 2 + - material: Cable + amount: 3 + doAfter: 1 + - tag: ADTRPlasmaShard + name: "Осколок плазменного стекла" + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: ADTCompPlasmaSpear + entity: SpearReinforcedPlasma + +- type: constructionGraph + id: ADTUSpear + start: start + graph: + - node: start + edges: + - to: ADTCompUraniumSpear + steps: + + - material: MetalRod + amount: 2 + doAfter: 2 + - material: Cable + amount: 3 + doAfter: 1 + - tag: ADTRUranShard + name: "Осколок уранового стекла" + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: ADTCompUraniumSpear + entity: SpearReinforcedUran \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml new file mode 100644 index 00000000000..f854fa41f8c --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml @@ -0,0 +1,64 @@ +- type: construction + name: Shitmade Full Shiel + id: ADTFullShield + graph: ADTShield + startNode: start + targetNode: ADTCompShield + category: construction-category-weapons + objectType: Item + description: Big shield for big people. + icon: + sprite: ADT/Objects/Weapons/Melee/fullshield.rsi + state: icon + +- type: construction + name: Reinforced Plasma Shive + id: ADTPlasmaShiv + graph: ADTPShiv + startNode: start + targetNode: ADTCompPlasmaShiv + category: construction-category-weapons + objectType: Item + description: Woah. Shive from reinforced plasma + icon: + sprite: ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi + state: icon + +- type: construction + name: Reinforced Uranium Shive + id: ADTUraniumShiv + graph: ADTUShiv + startNode: start + targetNode: ADTCompUraniumShiv + category: construction-category-weapons + objectType: Item + description: Woah. Shive from reinforced uran + icon: + sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi + state: icon + +- type: construction + name: Reinforced Uranium Spear + id: ADTUraniumSpear + graph: ADTUSpear + startNode: start + targetNode: ADTCompUraniumSpear + category: construction-category-weapons + objectType: Item + description: Woah. Spear from reinforced uran + icon: + sprite: ADT/Objects/Weapons/Melee/Ruranium_spear.rsi + state: spear + +- type: construction + name: Reinforced Plasma Spear + id: ADTPlasmaSpear + graph: ADTPSpear + startNode: start + targetNode: ADTCompPlasmaSpear + category: construction-category-weapons + objectType: Item + description: Woah. Spear from reinforced plasma + icon: + sprite: ADT/Objects/Weapons/Melee/Rplasma_spear.rsi + state: spear \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml index 3067b6ad6c6..7c19757cb9d 100644 --- a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml @@ -310,4 +310,35 @@ products: ADTLimeShade: 5 +- type: reaction + id: ADTOrangeteaReaction + minTemp: 370 + reactants: + ADTOrangepackReg: + amount: 1 + Water: + amount: 29 + products: + ADTOrangeTeaReg: 30 +- type: reaction + id: ADTCherryteaReaction + minTemp: 370 + reactants: + ADTCherrypackReg: + amount: 1 + Water: + amount: 29 + products: + ADTCherryTeaReg: 30 + +- type: reaction + id: ADTWatermelonteaReaction + minTemp: 370 + reactants: + ADTWatermelonpackReg: + amount: 1 + Water: + amount: 29 + products: + ADTWatermelonTeaReg: 30 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 043a59311a9..5667aea5d77 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -332,4 +332,16 @@ id: ADTCandies - type: Tag - id: ADTBeerCan \ No newline at end of file + id: ADTBeerCan + +- type: Tag + id: ADTTeaPack + +- type: Tag + id: ADTFullRiotShitmadeShield + +- type: Tag + id: ADTRPlasmaShard + +- type: Tag + id: ADTRUranShard \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index c411b92f7b4..f0cbb6ef9ba 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -10,6 +10,7 @@ - id: DrinkShaker - id: ClothingEyesHudBeer - id: HandLabeler + - id: ADTBarmenKettleCircuit #ADT-Tweak amount: 1 - id: DrinkBottleBeer prob: 0.5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 36f343f5ade..c0821d52f79 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -49,5 +49,6 @@ DrinkSakeBottleFull: 3 DrinkBeerCan: 5 DrinkWineCan: 5 + ADTTeabox: 1 # ADT Tweak emaggedInventory: DrinkPoisonWinebottleFull: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 0f8c73dac30..8f58e9871a3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -18,6 +18,11 @@ ClothingOuterCoatBomber: 3 ClothingHeadHatSantahat: 2 ClothingHeadHatXmasCrown: 2 + ADTClothingHeadHatDarkBenie: 3 #ADT-Tweak + ADTClothingHeadHatBlueBenie: 3 #ADT-Tweak + ADTClothingHeadHatGreenBenie: 3 #ADT-Tweak + ADTClothingHeadHatPurpleBenie: 3 #ADT-Tweak + ADTClothingHeadHatRedBenie: 3 #ADT-Tweak emaggedInventory: ClothingNeckScarfStripedSyndieGreen: 3 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index f6c61acabd4..ff2727d89a3 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -327,6 +327,30 @@ - type: Construction graph: Glass node: SheetRPGlass + - type: Destructible #ADT-Tweak_start + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + params: + volume: -4 + - !type:SpawnEntitiesBehavior + spawn: + ADTShardGlassReinforcedPlasma: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] #ADT-Tweak_End - type: Extractable grindableSolutionName: rpglass - type: SolutionContainerManager @@ -474,6 +498,30 @@ - type: Construction graph: Glass node: SheetRUGlass + - type: Destructible #ADT-Tweak_start + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + params: + volume: -4 + - !type:SpawnEntitiesBehavior + spawn: + ADTShardGlassReinforcedUran: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] #ADT-Tweak_end - type: Extractable grindableSolutionName: ruglass - type: SolutionContainerManager @@ -595,4 +643,4 @@ state: cglass - type: Stack stackType: ClockworkGlass - count: 1 + count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index eb04fdd352b..5570b1e5f19 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -592,6 +592,7 @@ - JukeboxCircuitBoard - SalvageExpeditionsComputerCircuitboard # Corvax-Cringe - ADTIndustrialSMESMachineCircuitboard #ADT + - CutterMachine #ADT-Tweak - type: EmagLatheRecipes emagDynamicRecipes: - ShuttleGunDusterCircuitboard diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..8419dbaeae85dbeb8212b42725df83603c03df22 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_1wFzAoC5{j!}uNiguJ8ptUU!>Lsm^#(+-s5C<*clX7~>Q zS5Ji)0mTk_x;TbZ%t=mBV36nxIiPXi2Vdljn-Bilim+<^X)2df&=lCZ_rp8pNla?u ztZkdqC!XOAj9R;e-IKBS4O80`OAc0_rTfh_6|@t6vmP`!kaqaUfi2wg^)E?C)af2r z&T!IlF_)WYkCsAwW6+E9oF0eXu&xd~&93Im_S;T{^_2}zzPy6A#{JJX6U8PqZLt@R zwVEipBfH*l8v81X7q^?&960*oDw7CnPG|W(@;iLR~m>^bY#`_ zHI;O~0af#r1o;Is{6_}iUbjVnGF_f7jv*Cul2aU*dz!r*1bQUi9c1-kIWVW5UxBHI zNr_G2RnMO~6UL>s0*q?Q+u3;1Bbm>|RWb?&Bo+Mo@I84)gF>^m%Ym1S0T1f7Fdr6Y z?`Sw}o5n2CICCz~|9TxUhQdP5HT%Brk74ypICgyQ`rj;yH5~`o*WLUqIf12O^+lEn hz5^9oc!MXgFr4+URFuhn8v%3`gQu&X%Q~loCIBHTV*3C9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/meta.json new file mode 100644 index 00000000000..382ac2d601f --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Sh4zik, ADT Team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..d6d1f34fd7c0d79b1898cbfb9e1e4eb395200759 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_9UL62t*ssG?JX=UoSmJGjg4(>ZH;ChF9FJNlmz(&GyI2u ztEWPYfMN$dT^vIy<|L;mFi3QU9MCxMgD-N%%?E#NMOd}|G?mLKXbNoI`{5n)BqlX+ z*0#;*6VLDlMy=h#?#WpEhN*3eB?qg|(*5R|3fc+3Sq~ZU0k* zXE<4&`)#Mf`pSkUUtU354jg@Pl}Us(r?Y$_w?NyL_!XZVL^(GH)HDkBXi0<`Fo`lS Y%rew-4Bjzw70@#bp00i_>zopr0D!i0Z~y=R literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3ab6fc20cc71d78bb169d1225e745fba5e14b69c GIT binary patch literal 360 zcmV-u0hj)XP)o+ zAaz~)1C(W{;5Q{PtTs46^Q4v>qB3B9p694-TR#9K=XM)wjm-hLzo&70FVXv;>pDMx zq9_)w*b1Q3AsJMT41mM;eQzzbbpim`gdp&tUIMcB7Jw|vRsbpGq4A-XY7W)B4-j`L z);F^{@G}5(({cOZ0G;n?n(lLetVMEw5X3MHYt!jR&&PTyg|h^_wn$F>001c0$E5(+ zJWbR0QG5g-NfP59@Drs6yY|4jzl&}41@Qn790(3P?!XJ8F3BNKklNt@0000=7YbsBCJ|}n#$!AGzGTq{qT-?5|f%Z zYuo1ZiD!5Nqt3(xf1?`02tOpGaq#ZtTU<>zr{Yw%Ob-D+Z zGn}+s%;hH9qookv81&*ir^lf;tg8c0v#U9?{kBtKePzRwFR!4jasTtpM6pRtTkOSS zttN`@$gX#s#=gqp#qH)b2adkD$|S;?(^)=|TcB-A{EANwqMVxpY8r)mv?M|em_!*E YW*O=^2Je`;3g{UIPgg&ebxsLQ0Dez$WB>pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e5fe689199012f7f61931686885bbee3ab71e040 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5w?S6XFV_l?{|tj8v2jl~s*Y)QnYCja5|)l@;|AmGqV5wdLf1NJ~yZ zSAmCJ>N`+1UrCT(FvEXj5bkwb1Sr$z>EaktF(*02fw`yI%R!(=;@v^k7EuX1tv}Tt z-ZQ#11RiibP0l+XkKGZ$qE literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/meta.json new file mode 100644 index 00000000000..382ac2d601f --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Sh4zik, ADT Team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..75bab94b44fd57594a6244ea38ce94410f537b0d GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_{gmB26&(GPTwUeu0#!X7WGuZEoqMU0k* zXE<4&`)#Mf`pSkUUtU354jg@Pl}Us(r?Y$_w?NyL_!XZVL^(GH)HDkBXi0<`Fo`lS Y%rew-4Bjzw70@#bp00i_>zopr0J?Z{umAu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e6e19f972562e60e87c03a2721ac8a29eadd4eae GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5x9Y6XFV_jTDSb6itj3jEohGO%+YdluS*POidJw4dnC<@baZ8O zbfmTQW%YK%-4_6A;4caC3ugF_0-pBHTLzTs^K@|xshE?T;=tU~?ByWPBk}Gas}GBW zoYbGaAKo*%Gz1<9WpH^r?S8-7f-USy2cD>?9QZKrX2SWa&jlD&+a~b;f1k?1VKl>m zWsV#J>$xWu1~q0496Rn93pxl!gdY6x|9KjtfcW$SYpVZShfH7ztBd)VHcz32U+~9) so15n`dN!<=_HFpi)Z>2JK-H6hA=|@BF{vSG3(#c@p00i_>zopr0H&d9WB>pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/meta.json new file mode 100644 index 00000000000..382ac2d601f --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Sh4zik, ADT Team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..3e681469676b8848cc1d9532e4d87eb802107c29 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_bBv8s_4RX%j1qNp^3BX5H8e5|41R3>AqAAQ zS5Ji)0mTk_x;TbZ%t=mBV36nxIiPXi2Vdljn-Bilim+<^X)2df&=lCZ_rp8pNla?u ztZkdqC!XOAj9R;e-IKBS4O80`OAc0_rTfh_6|@t6vmP`!kaqaUfi2wg^)E?C)af2r z&T!IlF_)WYkCsAwW6+E9oF0eXu&xd~&93Im_S;T{^_2}zzPy6A#{JJX6U8PqZLt@R zwVEipBfH*l8v81X7q^?&960*oDw7CnPG|WRL* z3`C_&#AR%xa-IP-@RtPn1vC6d0Z)79EdxsRdAc};RLn_EabWIg_Hq#Dk$88I)rUnw zPU_Fz5APXW8Uhc5GPt~*cE4Y3!4`I<15Z>`4t$t*GvWNz=K_qXZ4>zazfa}hFq+}O zGDnVq_1qH+gBr62jvaT51swzT$nqpz6uMknLfmnADK81?VycPgg&ebxsLQ0AEDn4#?y*WR zVaX6;dj7fUpR}Kr;;EcPA`>SCJ52lk@6Xi6sncgSO1KAHWi&W#|L^zF1Lu#pO;KL) ziXp(GQRd^b$JK0tb&kK<8FW^$nea}S6z7n&QjT>o-vV!rKfnGwwU^fC4_(x+OxNlfrS& zrN0Do^)7NHiapzI{$F4G;_;Ua=gh?=)xxd`fy5`~vRE=r=l0lGvqeLWxACHY1aG6G bAQOYy8z03d&2_7RK4tK9^>bP0l+XkK%@b>u literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-2.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..a60a4f935222260100cdf974e54335f205190a70 GIT binary patch literal 294 zcmV+>0oneEP)08mJQ9P#Gkdj=7HLHdUPEUE@H4Um#vKx(NT1)~n2O9=e>{N+CzFAr6s zk1Rt#4p>vsiPf`FQ=3ULlO)9;8<%C*{txLWXLz$>A65q(xNw?*6i1NkfM>He{TGRF zV!#yw4hE(SQmKAKn@hApn0G-AAe7LCw*&IqoBx-K=;I88&NmksCRWxG9kN6#M79y+ s2wW~8#q!ajcr*k?Ltr!n21N(}036XzA@5}+0RR9107*qoM6N<$f(A};?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-3.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..1b3375243cdab2ae626d02d23fff2a72cabb5f8c GIT binary patch literal 291 zcmV+;0o?wHP)08mJQ9P#Gkdj=7HLHdUPEUE@H4Um#vKx(NT1tY@&%d%_#0bd)o^S+NhR8xCAJ%|MDHNOr)p*_-~0L^v_5sp!P&00#q82B}m(qRk~* zA08mJQ9P#Gkdj=7HLHdUPEUIXp1`bVL^dDEcu*;1jDO5>P472ol$3mPA z(5#3j$xM|9G@kG(k zE;3B4tR*^e6Ri;0Mvx7(3xFI~VXVafveds4a|Fo_h}^uH!BAEOrvuJEzQeFGzz=RI$PrX^ zz|6-l7(^nR7}ivDVs(Urfhj|#f+X!7@Mgt6oS`u40GfvYq5M548~}49)yn~;^E(;J zMf7n7Lg$-{3=d2^@aBDF%_NlrAdR5X5abA4fE3F~t_xt6!b&)7jvy4|=z2&F0YV9o nRQXW{jE2By2n=`#007=CxgiJ@9nk;)002ovPDHLkV1fVuz4N2r literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/icon_empty.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..d46a00edd045b049ecb2228ee1dbf49d6f4357ee GIT binary patch literal 3069 zcmVStO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@KaetVQ!PFj6BIPy(nH z0*s7|1Lpv8EoWdLGYb56p8ktVZj-wyGbv`VkYo8YYwZAh@}xL|q$mhpdjPNH3=9km z)2y`vg4Z6v8A22};5QF9L;lWFoA9a0-+5}&Uw$6OfIVma2kbdRFn&pnf{E^C>G&Km z(cLUP=ft%c8(d7_j@aO0f-{wp>;MJ^28I>xrVK9`7}E)GvmFBo;er~`(w0{{#oeJ{0ach&#^002ov LPDHLkV1i(R=oG-u literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/meta.json new file mode 100644 index 00000000000..62d99602022 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Sh4zik", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "teapack" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/teapack.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/teapack.png new file mode 100644 index 0000000000000000000000000000000000000000..38a9e55887dee179c41c06a167ea6118977dd9dd GIT binary patch literal 483 zcmV<90UZ8`P)jIKZD|TaME3z9F9_Ol2VG) zws-ag5_9L}l9vo!E?e)C{C@erm#YU;9^RDsPzsa@I47{)T1?7O*RzL@@&CEl0)DseNA|_X~Pypdon1fL~ z6nl;RA3zA69O1Qa0lLvwN4p~A@0EGw8 zXLEFLoKu*39Mt!5dDNz#cen?~8+@fC*eHfD=q4IGl2FZmVs=Jc--J12o^a z#EGe~%ROQwfD5oEDsjMiz>6zz*LX@vnATi|8C&rzk9j-G)~l702gMHz-KmaatTyP*utFzcoHsfX8~1XQJ#~VhO)WI+)|)S Z;1{k`(;;@@0^tAv002ovPDHLkV1i0G%}W3P literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-1.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ac5669984f99897e21441264a4e13b958e4cb572 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJN1iT@ArbD$DG~_>EDn4#?y*WR zVQCBJc$542|M_(pM?ZZ2XUO(^Rj*5BpN8v^w5!gSH~;@%_rIl4#693Dqe8n};82EO`Y(jVXx`G|BllhFex0j+%6C<*my?aCgaby zXaE1*H}Bxf2H!hsJi^-9oo3TBT2GiY$uyp3T@v9J#vu@WL}+#28UclC1xZ(WLEdn4 gPB`Gqz`!=kS@C?z>N!B)GI+ZBxvXE{{6apXsa)?c2IbJ)c?f{r0Kr}H?K@$gnEQdu0p|n6V2N0WXMjbFTL*Uov zFaP@rLa|13#oX;Ad5R>(AR9Z9J^vR?Sj}*_Ga9P{PCx&}K#C(scEH{m|Npk-OBry5 zfT<)KgL4aU#W2VRBs<{VgvkFOjrZSt!x{pLB3ukg1E{{6apXsa)?c2IbJ)c?f{r0Kr}H?K@$gnEQdu0p|n6V2N0WXhNc5Ll0E<9 z@?pi??Id}MB*h?0L6#RySj}*_Ga9QKPCx&}K#C(scEH{m|Npk-OBwnKLa{o)RFaLs zxrMkw2xI`s4!AcV^1n>-Y@8vWD8j{{RIr?AbBR_6^DfK*Pv)lLOz1Rs0HG{4yd99= z-uyqG^BT@TnD||bVPa)1(NRmZLS!33j=<#tQYE{{6apXsa)?c2IbJ)c?f{r0Kr}H?L6!sd*7*O&6)ny!khq6M2cfh;mIF>S z1>$soMcsOm%p^%M$Y&tm!+eP?6bQ+q>mk_z9m$^m9ppK1W{d+5e=tp~nE z_tyC13<2ksjf^051+UjIfTDv?S|G^*Am6cm`N~jsZ4%C8(WRBg@Ry$lF2B*$lzLGB zazMe6R)(nt1vnj$ePIH_B>Nf$kj4JHPlH1WpCd>P0qfQE3=Z-fI2~}{;SYx65lwJQ zL5`rR118?+XOKyr&Cpj6iq#Qex&jP^+C{W?z>~SDI74C70W=Q*LPhhSZ~)AaR4)gV z&hKQ%=e&k95GH=tVt8QUfj93XYbL220BHmjMj%Jv0;E_DGJ|9XfHc8MIBbp}6y)f7 q$Z`OoL`aJKr~^hrU^D~#p*-=0000StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@KaetVQ!PFj6BIPy(nH z0*s7|1Lpv8EoWdLGYb56p8ktVZj-wyGbv`VkYo8YYwZAh@}xL|q$mhpdjPNH3=9km z)2y`vg4Z6v8A22};5QF9L;lWFoA9a0-+5}&Uw$6OfIVma2kbdRFn&pnf{E^C>G&Km z(cLUP=ft%c8(d7_j@aO0f-{wp>;MJ^28I>xrVK9`7}E)GvmFBo;er~`(w0{{#oeJ{0ach&#^002ov LPDHLkV1i(R=oG-u literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/meta.json new file mode 100644 index 00000000000..62d99602022 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Sh4zik", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "teapack" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/teapack.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/teapack.png new file mode 100644 index 0000000000000000000000000000000000000000..38f3111a063b30a2d0a264298cc9603188052126 GIT binary patch literal 498 zcmVq%Qsl!CztN;vhIEf@7V!xH$^?4+OC|=q|1fS_%qX ziv37aJy%Xh(%jsyp-b-4_U7LEJb80Ynu7_C+=Tg%31kTvC$L#v7{QMXFZEBYv$Qr* z=P)=8O$lv*2;4wIOMu|hRw42l8TdU=eH_XH@jEw_P!dRt{VxL(326ZyJp2sCL^>m3 zcSs4u;g$S4eB?`T)4hcgcaJ%ow(bKL5|OD1p+Fpd(A@yH_}_gs?^W)fsC zap>&AW&1G#M;R30ReNM{=!cR3?n{$+uC&?Q(8pFINe(4wifTclzfp-e95(3wpTx2^# z7?SXFpe?%_B1!-YkcmMxG=OK-!0u7!+r2=tWsefTqRIWK%|xg{1_Gg{*0hGofWNp+ z;{9<&S5%b&Mj{3tRRNK4D-jD%5|B)!z>@{q!o`lML&I*&&g%vG3j6|%EuSHp)IVMT O0000llzy16QcN8g> zgEWy80v)T${={byo;r1W#! zZ-EmWC6<%r0FWk-BOblEOR?o7I{>5s6bc~v$(x5HrFN98gTx^z4d60_67f+7jE2By c2#kgR0B=ccA(KM9w*UYD07*qoM6N<$f{Y4*5dZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-1.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1cfc9cf7b9a376faed870217d2010f7d751c86f3 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJX`U{QArbD$DG~_>EDn4#?y*WR zVR3UtAx>~L#?RmXCqDRM=T==|)2%aAj6H*RHWfyey{%_w4xYoil3Co(c)}x&NwObu zzAgK&;9bBt;qj87za3`NGg=L}Ki{7He|qgTe~DWM4f-Uvu- literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-2.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..9a5f5cb0536335edd9b83dde4f0197be8a80ecc9 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJWu7jMArbD$DG~_>EDn4#?y*WR zVR3Ut5DjYteti9T`oF2@+=%Q?D^{LWndvzxX+rPmP1*n3OQsm_iQLG)nwc-g;;ciL zvPap0%{OQN>vpj)e89!X&K%6PGQ@t-S=A`TGrJYo1+rXu^Vy$lH~+6Me(|^@$J~59 zBcC;ERIO4v!#Z-5PYCXaap-!gV0@y8VWEjb*Pj*4P=_!uL@(D?RR5j33+Q47Pgg&e KbxsLQ3=9Ch98eno literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-3.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..059b0caca25c1c660c11b4cf993c35f6f21ccc0c GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ)t)YnArbD$DG~_>EDn4#?y*WR zVR3VY5hu7BQ*UnlUl^Jc7(Cn4XtK&t1#ib`?Ilx;_e5^wUoFiSV{z7@OWC9Bz~-B? z|8=`q7_M3Q;>arocIIHVl_Bv#`?EjB zMSi)o)%}>184;1*CAXBK6gTxMxIZXj)ST9QM&UGL%c2I6pMmT>Z3i+qdfFHmw7Sd` UCpe{C1Uj3+)78&qol`;+01nPl@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-4.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..e2142ea9b17d9bbe5771328ba39a209867561712 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBc3jfArbD$DG~_>EDn4#?y*WR zVR3T?5^ZT5GPCx)uwN&1MbErX#ed=wiL{qr`&unz7eosBPnxNs$!5urVrl2iadL6H z%t^k8X|ccW2ZXVv%a;B7DBHGTmdKI;Vst1_l5hR9+eY literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7ac96a1aceeaa99ef1e69b03b08e4d0a77f01b24 GIT binary patch literal 405 zcmV;G0c!qkj4JHPlH1WpCd?$0#FDN!glp#|=lJ*XGvtl34P#ARp%|n1t@jNIT z0CObO%K@eHI~mGF^l=74=bMWR4@^Ap=6z(%B$Wdoji9ms2Y~bjIKZD|TaME3z9F9_Ol2VG) zws-ag5_9L}l9vo!E?e)C{C@erm#YU;9^RDsPzsa@I47{)T1?7O*RzL@@&CEl0)DseNA|_X~Pypdon1fL~ z6nl;RA3zA69O1Qa0lLvwN4p~A@0EGw8 zXLEFLoKu*39Mt!5dDNz#cen?~8+@fC*eHfD=q4IGl2FZmVs=Jc--J12o^a z#EGe~%ROQwfD5oEDsjMiz>6zz*LX@vnATi|8C&rzk9j-G)~l702gMHz-KmaatTyP*utFzcoHsfX8~1XQJ#~VhO)WI+)|)S Z;1{k`(;;@@0^tAv002ovPDHLkV1i0G%}W3P literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-left.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f23ab1368b29c64ba2741dd3763ff89366d7f40d GIT binary patch literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}EreaSW-5dpql3)*%OhHevos zR)02^?tl#aZ&%b`Du45=dcCx@DMawglatka%W@JAOHDrWMon1a`}vDGY5!_IpLe_A zIr+qTlTY9M85sCF<}gGl6fq|VyKpaHRZ?#d>$t=4gKGin1*VC@3egJl&z=f!Ykxek z=X`H&Nx`GS>o@nzW%Au{{c`8(k7;+0m&__~VON)U;3(Gc{^%j=tC#bp-{Eao|8o!1 z1V6R42B%Ih-SvIX{rl<+>qOfa9(?=!I4ksDj@grWkJdeY!@fqWK-R#FVKe*9KQRn$ z%G()q81778xBm5R_ABNOzc1Qx>G!nM)XVu{?CSQJE4Q6r@VnHYbJjY=eGGa3s`jWc z#J-+wGKs-w(s`TxRb{mncaCI51+Vw(n0)8Y{@c1Q8`__K`d{CD@x)1gCJw>1FC`f+ zgy?dvEofi~^)-CR;Cpq_1uk}vfU6?He8fw$1ZfvfLc3mWwlFg*hZaSb4iMqSzT`tx{bm$~R%bD$TSn dd_S0X7uW>+`0!&UFi9|Yy85}Sb4qAp0013P|1SUl literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-right.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..be740ca0481b3dcf755cfed552f1410ee6bf2ef4 GIT binary patch literal 633 zcmV-<0*3vGP)Z`ZfcMGd z1fU!YT46NDZb!FvVCHl0D68io(+I&y-lMR z03>;-r*=ZH-x-E>6<(f3MeG2i(kNzyDi6BPPEWKo`-Ro)G|?szsqy96&*p zQ%rFHr)p7X6$emIdfPO#WbGh_tP6`0V)2gD_39Zio`g9sIAx;KBe|dN*3IGt-2Z0O#OoUxM_#Xhk z9u%_gc>77&Q{Rwm5X{X_Jr^RzYz5aPEtiInoM-?bP8~_Mqpj^8LF{8tL2_vb$r%Jd z&FalLy*mCV?g+HqPp~-v?gn7*1t^d~04V;6rH&~8Qdb~#esMtR3Z%}Ty#sy#TQgHo Tpko0n00000NkvXXu0mjfCpiUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/boxclosed.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/boxclosed.png new file mode 100644 index 0000000000000000000000000000000000000000..69d097f7994c7711f7bb25a0ac80469b22b98138 GIT binary patch literal 324 zcmV-K0lWT*P)t62hR1E;{)oexhIEq>C;(5E7VJ2y+K8ZBk+Z%PSyV>Snxo=e%1& z#mMjn8|EV`U>mRv*amC^wgKKi7zB-pODW59j2Zk?6ejrS>ib9%c*gN6BD*Bv97#Y2 zzA4K=(YNP;7hn>z1$2O2v!1{sig*S)4rmL}!c>W$0{@n1>Y6XOPgD5_L<2+Xt6G6J zA;4n3mcZDVY^#b#UamV9ZGWF7Ab?%kY69Rj6~SHuEUS7BmVkbrfA2-KBmg>#zld0P z%4KwaIt3@fw#&Ea=HVClE$ XOh;T~pkW`-$qb&ZelF{r5}FtQ`Jq=G literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/fullpizza.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/fullpizza.png new file mode 100644 index 0000000000000000000000000000000000000000..5a70748703b083fde9fb3ac1954e44a820f3c36f GIT binary patch literal 858 zcmV-g1Eu_lP)0KsfgdeRQv>m9&XRPx<2K#dPUn4XC&y;i1oMaXTpzC2m)#z^~F4Y#|2@ci#+mAWMjBx zK;kI4RYKo;ZTlw-WLmyVf}Mj%5jt=|bIDgYH1MOS(j=m7?W0z`0=PoU$@ z=Yw#sEhAr{rDK=hkG#8Q@$7yFs#yc3)k*}{R$*4Cz==*ImZnpfXb=$qRD6|#(CwD! z$$^~f2aYNYbj~gWpz(Q;qt>A_=)&##N=(aH4BUH1=U~!eQ|m>-cu;aBkg^PUg*5^q z44}24Tu?au;J;76dgTJrM6n*x(kZ_WJkM_({wGM*#FHbStSX-*k*r7lsriszH<&<&l()IJ_<+To3H^-kVUaf zA@#-fQiK82m81zqHEMgil zU=$ANMF?vVup)|x9W1)p z)%G4whr`8p1Ry^&UCf~$pTN2dD*qBRnFpayRAbfcg~u^V9U|}g$yqqX+epU5;?O!% zVJ7D64mh1ZajD@vj#WO4nrzH3)q|@=V%{t~90#9A28NX(QRM~8h9!z%5ODj{5P|`y zGyzmxK82CaAvC_UGgJ2FHgjQ9ZTOC@QA~hnn|3otL|K-vI8@M__pkMP20%oohnvRs k6<{|`?WqI*1;B4d#yK$Vu-cyh0000&A7)Z z!Gy)l89_9x5O`4}^q+tAHhVkqgb9DXwmaINos)RHX)});=P{o0XLHhi{CY3%b(U`u zJLBz7sTFS(UNFpfYG409HKG2*(S(_~%w`g4mL0rB4PITEUCent_Qw&n<2*+XV<{}X?dmds%J;J9=m+rRbqCI1x`8QJ{))Td~2ekxelU z134OaSX!BODLVu*aPbCAX^=Vm<*)VO$@}k1rp&OEJSAtVB(Z6OhGLW=Pzl?gAEys| z_^GIDv7^(o;Kn7!i+m3JoD-h@k(rRe*tn@y-_xl3i9kc<31h*Z=T9Fya6m`r$cOLR z#>~dw<-F{+|Op02h)a#n72Qr(4x=->k=6v+%l!#Px=xlva7I|Fv#s(*1(vPM>$YpXIGp`D&U*2xHm%-sn54>l(EjVz+&p;rDyuLA%lm`&TmU z3H-)*Wn1Cg6?6Sb)-vWgZB(Q|I@-T!!+MiW!cV=MW~nXfnbmg$|Z klRanWVDPMnfnm~D*5cc`Po)G{6G0|;y85}Sb4q9e0D@g$D*ylh literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f8652a2ab7b43b7365b07758afe9f975428afafb GIT binary patch literal 492 zcmVK0Q@(T2E0L*e35gCS$-#&sZH?lNhc=zlbgOi6dgQUM4 z?VM+QNDelQIJOIEBQDipB=Kfzo8^1X_N3d6Yzm%u&;SxTve z=nlc@dXUdS7W(=6Fl^eqh3XdL%>|%>=IXtx4BATC4D;^Ip_%0bqX1XDQB$0v1Vjyo ij5=U61O_|=04}NGA%V9Sn*aa+07*qoM6N<$f&c(V(bV+- literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c7b1debc06950ab25b0055ad8e8549e4666e90be GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z9XwqeLn`LH zy|vKqaDc?okId6rX3kW-E2FHt!_x|_X`-zu#zCG~pYOt2)-EE7HX01HZ?K^eOk?ymfd!t|G zNM2*VAo=Cj;*Hub^EoP~Os(>eOHJDtwd!`+mtP-}PR-Ll{7d}D$FJK==g(fN^72yV z%SXFPzl5(S7K1nfNFI23;}zSSrmt@cBz_!K42>$)jce<5jFxo(8npf1^3vUm$36Dk zkO^8^dRsY+Jz=qQLC=xy`rpjEzuK)Wc31w}p!WTD<&>E>YnJ8Ro~Y7$Y@Jne+|xhD hxP*Kc+AuOSnBG^2>2wtNHT?<5Mo(8imvv4FO#q*NuWjm?HOA{NXh#TDh z&Np>QH@DE?0|9E2W;w8W8NT?xy-xPr-j`+TSb%l_fx^n5vd3x6U9S9$R1dxpDTFUwsS_T=3e)5hy&nfHBS z9iFt`Z`;4Kw6vhIVv_T*7?-+?d3vjsg_K-*vqj|R!!xQrf0ypR_v_i_>(f=g%l-|)yv8wF+b77C&eve7_?5kE)U7gAn<9>Yp g&u8tmdKI;Vst0MW^=#Q*>R literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/meta.json new file mode 100644 index 00000000000..925b9922c45 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f40352348ec5de794eac045b22fa258c9fe24f GIT binary patch literal 568 zcmV-80>}M{P)Px$@<~KNRCt{2nmtRyP!xubZ3*}>x(LN3lujMe40RAiR9xM~;8Hpi`~kHT`~#&3 zU0T{faFtF{P&0Iv^aqF*VxWsi8)*xP&2=h>AWh&@xHspS!yEGC%_Ye_00co0NQ|C_ z257%A!9E{~fQ{qLGyuTa)+x(cc?Bc$H(4vMc%BCX*GA1pTLaXh%6d5y>hWq9EAuDy zc(vQhnV@GnuzkCSCSeIH=s&nQzh>Ta3I~V#-C65Gg<4dZtjP>BGlm(qXx2LGz-$Qs zUeGd8-vbuS%JM3DCRYN+lMy(MgPO^efKS^-&*Vyg<2c~DA#Q*qN$8ne3BZ2-0XP#t z4WI^41JEgO;)5ClOG1R)YZc8|IG7VtyAWg0=|6oeDdtTo{I z<>MfFN@OLJA17e;}lQAo~YG z3ZMp11E>MMj}=ZpGLd4`fG{@zfYyL;&k@l406`E$0KNfpZLvFUE&JU700004Yjni3_HEKPY1A6eCx*<8Ee%Ba^OB4E;3#OlqVDZv`Spls&I7$jn#nQ&@x z2WPVOk_p`sQyFx)=1jPe!xtfk44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1087d3f6c678719adbbcd9fd378502e2b07cbe78 GIT binary patch literal 675 zcmV;U0$lxxP)Px%T}ebiRCt{2+P`ZPQ5*p9Z={Hj(hAx^IJz7mAOv!EQ8)?23)E7`AQ?q7RB(+A zb_rSh6I=ybC`AV$Jt1hi1PTQQ!#kl<2^~Cyqv8_Ha|qVw6wpQQ$NOG#`u)sz@4i1C z?}fYvKnNj(5JCtc39zNq$QtjQtbyWkdg@I(gz1speSn0`fJAg(&zn*^G=b55 z0E8L9`AGJV0FaRGW6|>_O7{Vf)&Mm)0^QOQ&Qk!X*hpCD1UnftdEshginNY6C#94%>-;!Q{Fo;BKbw&tPZJ*3#*D zVDH}s{${V)WpCc?YiDOa;L?SQ&er8!?PTXfO6;**KbsT*0AT&WeYkRaSr795=E{bc zBp>GeKZ))B9q$j>mybhOP!=IwSoEDh)Z+ck%wIqZTR1}e`3ZzU4U2%S$Ak44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%Px%T}ebiRCt{2+QEwwQ5*;GuMrU#t`Hug!Hb9x2#(r85L_2p5j=#)s6Du_*R7>4 zvX}mZ4qbv0WTC@?JAs6B@Y+S*1bbR!4-LU!bg_ILBzPTSpu?^@<9oU@{66RL@%#Pe zH*W^t4vdK$IiJAw zC-Rg0BXO{`FZ_D<9kyXHx8DV@4U4^a@XYtgJ6z|(2V)kLvZ#JVW;2DWKcu0e2&Gm@EONfTEGdJMXT#G_s5V7nCm~9$($WF`kPeHU6; zLpOh7%82nY(k4Z_`4dwsYxwnQihi@_`5?02?6KCTwjPVbuzkF#d_F;10g9cnzJ0uD zaz4THk1utvMR1b8eKTq{_I7dJK3BT&NnPAFEcWirTeOEAJsiFT_T{sy^_|}XKx1zg zcOJ&GGUL05^y)5?1Rspq&u?Qyv<-yw8_JUh6chkhPa=eP^B1H(1+bMu)++!2002ov JPDHLkV1fcQH2?qr literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/meta.json new file mode 100644 index 00000000000..5ee0443364a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "spear1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-back-fill-1", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-suitstorage-fill-1", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/spear.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/spear.png new file mode 100644 index 0000000000000000000000000000000000000000..079d0a26683684777b4cfaa064c699e2228e9971 GIT binary patch literal 417 zcmV;S0bc%zP)R_LPESKY# zW+-SXLh(J#902lpqiQ>Y)hcti<>+w_%l;k{v*8%SmzoEi5P60kpE5Cs->%C*c?0H4gdh_Y1bjXLOu%s0000< LMNUMnLSTXb5iz{0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/spear1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/spear1.png new file mode 100644 index 0000000000000000000000000000000000000000..fec362ac7284b04db4492b77d3b1014516e64bd2 GIT binary patch literal 1965 zcmb7FeM}Q~7(QGeh$B;RYDe5IXNVxQ*IudGOOFO=l?o*l>HwX}(O&6Edw1L&w4l?d z6E#Q_!&H!I;=qsj6*ZYt@nfK1G8O|mbsK&R=Sa*J++ZL9Wxs2Y55X<_pionyAr<_?(iI#8eubiQ>N7`~J5zeM^Xof&KE?q@n+D;(p8ne>OB~VT}v52SAic+k$qFkHSj_Bh;bY2`J za8n`)d)+QZz`X?G%Zr11$&4bf&qd57kPNd0PGETo)+jUzB@!0`>v+2ZPcyVoUF(SPL><$XjIG)JSI@29dD^4A!FPD zedAZ~lH7RCX7j(hyWOM45JY1EAYzczQ6s!AAXp1I3QeU1HlMdq#sZ2FXZx6tc)=4` z7t5ysX;1{B8a7*KFXhTG&~Azm0OQ!WN~V|`(K%Fn7)Yn>Z`!2+UHOtimN7J-#NV$k zBx4vOkog!oqD~8K~P%ill)QL8q7!Q_GcFITmYGX>g?mk5xx2)wojWo6hIY z+G$7Oe|bxahIPQ-Y{nC5L1g(tpUE%tG%C-3@*iEaPv4TlC4bT;O-CRc&)V~Cl-*a_ zr+*0*Scm8#c`7~!JYWKecQ|OkLm_ODgbrgcrog~UIVz#YNr7}DM~lTZDqQt?G<4i% ze3E->Gk)}cHRBH%+stU52b=V6O25O1g#m`}+rT0M8x0*=Y2Yxl6e$L5 zLLRKV)fI=05EQVH1~MHZPY8-E%P+eXZCE<3QQvU$^pqRf(_512Lwc8ng_l(H&y8^$ z!0tEcIvscVy_e_jc71;G(DjDXfg1u=P$#FA?Uv_eZ$8ke)9lus7jCt$?;wt>y%o5# zvia+{-X zv)Gcf_e5mbqnBUk zO{;iKMd%(?CTy&nFzb+F$=}t6m0i_4-u*6RV4(YlmcF6~&#p|i>h5qXnou-RK-;eFjr{8(M_p3?wA8struGaSi8jLx2`{({y1-@Mqxx`EXf+mGYR{&I5 zH4_-OnGEsPj4gjO%R@HBPb+R-Yn-f-HNA2*IQjP+d&zU(1b=DrJPv9t}F$I z(;RizI_nJOi+1fBm>X9w^CT}XZd{O68l{-I{)()tmJFY=v#Hj2Jq9^d(fj*_-r`St zdbY1T$IZ|qm-;5`zxz(m18vk44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6Px%SV=@dRCt{2+A(MoVH5}OeCdh-8V?YoRR{?P+r-d=7HqgxXx{B@q4pmXO?c z@8x~pCChsN5fKp)5fKp){a<38PB58D%k^~&uIoZk6o^Xkk2#IuQR%M>vpx!K1)of% z<+tw+`VOiH7PZ^!+m+Wb061~{l=Sa^|KUx`e8KeqpsLz$@uJoYYUOI;-SP?m;8Wew z=LYWM=JpNDYWL7s1QbPq<7|ft8m7>&{0#{k(-ShFni%n830a>Byr^8 zF~h$e2LPv37jw7o;^W3DzW#7@0MM>$Xe>8iZ`p`@eegUt(!#=OH)rsW%&aN3goZU| z3)h}Z>th2W<)f8BIHkH!Pxl)@;0bU_b@64jj`;@lIe6CeAL7 z=~Ek*%Km3lSFhmEU_bogfnELstXxe5-}hqizJI9}A|fIpA|fIpA|fIp`db}ob`B*? z*^S=*Ub(~07sR7T8XRm8m14~EqU+}uGI;?2<1-Tmuy=t&NmF{B3(s?*s#>T6XnO++ znYK+5 zk44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d0e078c88ae142a0de9462552c401de9837f35e6 GIT binary patch literal 650 zcmV;50(Jd~P)Px%L`g(JRCt{2+A(O)DyGkM8QYR4y$>Ji1w%{g+ zV+RG%E{b#z1fiW=T*?iC?NU*MLg^(!rBaH^c@l>roL(w~VjSd!T;PdiK2;k9jDncF7gSA9Bi;K`%x4XuIr-T z08~vy^FtHfa~TiL-?jkY+@}06sPB;_T2PRPR>(_(}!c3xB;% zvF?>{SnOX*EWWGnAeBu))l__*`2ql#7#g>Z50Bu+otscj5Bf!L)*9yQt%vxyUB|aw zrw9P`>o%^gmT~3rlqBYjl2Er2+pcz{W}aD?C{Au)w#3-vwJ97M8Ei>jaMl{;*Lnl< zPv-ow`QfL*xzkb zd*1#QF(k2eqzOv}-4ng`zCO7nkah)Ho?bKo;Oxw~SbBS+I~-guYP)>tRu|Kpw&wGfG(4-oggXmM+0%}ZrdXg+gM&KZ$+-d{h@6PI=eGCCFi kzbSyw>zzkLM09}t1f%u)4zP=m`~Uy|07*qoM6N<$f-EdDBLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..2e9af1781e3d0f297f20303a9799e27d8e2dad3e GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|4tlychE&XX zd()8Xkb%U}j}K(;RCA{vZ*sq&>AYNTo|Aygo~CCqUfb?CWVG?!T&ljpT)^(q1hqf) z#Z3L~Mz%|VMu5Pd%jH$)<|cYdpM1FQa&dLW)xT9Mm$3vg-p>sB_xS3A_K?bJZ*A=E zep@@2^V-vMn?x>h?=U@ncje9HrzW+oXprjUGB~*F_z$nCsegSog#N9E7|Ot)5d14f z&bD`|-E?>H12J(wV&uLuWz9G}^LVnJ@pR+q%nV)Mn8lX37Fj4yngY_}>FVdQ&MBb@ E0O)&Z*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..61a18d7dd0d52b6e9c46d6f1a8cc947ec4369301 GIT binary patch literal 471 zcmV;|0Vw{7P)5O7s>IRP0mzpBd;W?3Apmm#13w1?!^a==bpR=rgAymz5+TT9kb$6h2lWqNOlw;`x@Euzt2B1OtHa# zf7aChpFe(P;N|CKC{sJnkRW9b_c^JSlN<$;x;y^gzH^%)DJ6m7`HPnfcW&HaXw<$2 z&T9XGkQASj90ees8yM<=E#AImJAkV23nU~vx$g~>DL5{x=xTiZk# z4DUaFq$t6Wl?aLT3AyTs3ITErCr00>14ct&z(W84JfqhkOw9B*00000 NNkvXXu0mjf003cR%x3@q literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..09d3be9ecd3b7b660f61d4e480f060df2c487a3e GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-g~+@hE&XX zd&`io$w8p?;l&nViTq}OxLnqlU?sbGClmy z_hHlLO?P`ZfMx(eLqKWhuk3l1y=$`P{oJJ$x+yI%e5w7mn*m?WE||M|runUGb~(N0 z{bkEKPQ3kh)g$f-UjFXg*FwI?LFMzv)Pe#O;rWN zY#^D_crEvU%$4hpfwnxE=@vQh|0Rv6tqhOfe6ZS^E*a;dQn_sY(b)csyKFvzUwkic z+0D9eyFpXT`j5sFvjneii`x5j({?g6=>B9{d8+Tpf-6QhKt_AI`njxgN@xNAo=}D; literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d952312450fb51fedd53fd75e801cf8ee357811f GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|o_o4DhE&XX zd&`=u*+HcBp~?fUCU4Kl=TeuJ9hlQ z|Eooo#X9e8Wq^i&Kux#P#ixO5GgY{UV8Dz(u^3*#GG@NFYuq=o^5S+ z?$^8i=NE4oeEz;Ptas}|?Fmt#b(*Vo=&iDJo>Q|Y(Q87KueM{>(>ITKS6=dypC1fQC-ptqv*6%$keQyYelF{r5}E)yn0`(G literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/meta.json new file mode 100644 index 00000000000..925b9922c45 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..f632427c22caa6b02d1fc01b13be7bc22a397adb GIT binary patch literal 494 zcmVPx$s7XXYRCt{2nlWp_Kp2KUGDO-gUFsw_1hI>y^uW@ktGGJ0;G*E4$X^hI{sIU8 zgj6Wmf^GLs#p2YVP>Tj)$#sw{Qs||82f54p%*T8B3`~|mXwyFbLidN8 zEQ9dmp%-%Q<8TEL5#3gyEy_?tP+sk`?}{8a*NmXr0|8*J*kpw`qQCow>rfYK(w19P+e=) zGa#iruPU##Qotr!E3dUuK$bZID+OdZKd@3jmh%HE1)u?F02-jY);a<8T0^1%MQ#8Q ko&m+4Bf$Is003m*2Z!~JzYlGt3IG5A07*qoM6N<$f+X|W$^ZZW literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..fc03f154a4a441709f8f788844a3738cf9c45818 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5xIb6XFV_4gNDoZRKUpWzyExp32YvpMfDVGO|40P)ke85TuUb^W)Eo ze9Cn|7H>(AUogXeB%sUUxE3gJ($mE;q+(8T0s|u>n~y@n>PLq3w+3!9@#NR9L4*h*T{6AY&jJvhc%(ip8w0 z=8X-~8)i1FV(8{%x$AI&r76$hBdhu{n`;+b8TDF31WX!>SiLzkC0HXEl+7F&gG3B8 z6HYDe;7rzDGND^yDuWK!oC!B__##A96gD2-sHvfvz{I_Y^UZC;&;sS>qGD`iKFTs5 siVPXIO`32{ZNcwH42sO|2Lo6beCi~pP7VpO26~FY)78&qol`;+0A|K?asU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d36666f58aecde03acc12cbfb55b84f576547135 GIT binary patch literal 621 zcmV-z0+RiSP)Px%CrLy>RCt{2+CNL=P!Is{Q5NA;&_-cJRCtCQ2Z4}R9BC9Qv9(!HiG_k_b!WX_ z!9)B4i(okX3N}g_d0U8RB`Syp#Li;3&@IM77Q{mG=gr#<&aX};^WIE03-bUNV~jDz z7-Ose7Umbxwj9(IuUA(fQ=Xn4JDo!3=&n9M!8)K2)%RRqYlYeVSvcUv*iUNOY|%O~A|Kk2-NmW`%L2l2$a$wTv;w7-Nhv#u#ItB^lHf zYCN8X=lV!FQtN7z!_-3f){AGIMs-An3ds=}lbewDS=u+?>iV+B)FyQGr_Qzi?!ze(TDUR2WBUk44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%JP)Px%FiAu~RCt{2+P_O9K@d;aNx^aOO5U&g?JVr`{dj?ECIaF#|vd zA%qY@2q6h&8Wt`tETPQ1L#m63O0)SGbqUduO+jiB0H8Sqg?v%!9}AOA3IO(y8hC_bH6`R=b6dD9(Fueq^0{^X`B-wgb+dqA%qa3 zQ_@a_g7Q5YYqwje{|LT<9yq2_l8?v;NeLb6(5Eg*g}E>m@R&B?@zD6%Ea8Psv5O( zJXegJZwT3ivHSkm`9^4`xyrW{$8*Kb?I8dF1npq&q{HgGmVGsfi4Y>^4WiBLEsKFT Qk^lez07*qoM6N<$f=Brpr~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/meta.json new file mode 100644 index 00000000000..5ee0443364a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "spear1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-back-fill-1", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-suitstorage-fill-1", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/spear.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/spear.png new file mode 100644 index 0000000000000000000000000000000000000000..acb0228251cfcb40fba3e140f9c2ccf2451a2e52 GIT binary patch literal 417 zcmV;S0bc%zP)ouS1pm4R*!fLYEY$;ZHa z{XGL0KNtNR0J40=+SLr~k^&6hKYl^6926QfjRIuLfBgKx@c+jj`Z<6Y%V`z@%5lp7 zzw7IOgB_R8VYz|oQ2_Hf=fx`w-;8t_{uqcb@ILzqPju+z4%Hn1^8G?eu%?%rW| zucd|4a;irG$a1xp`V6m3A2NJ+^nu~OhZO_kj$;gW7v06_QL2T2k%8rZadAnoLFV_iL7%c&LuFw5`VyUlR(_GPfAK*cVoq$5<<5L7_O0Bn{M(t|8dkpn2ToT4b8 zhUH{CfLfN5lb)^PD+(ZiCT)PV@fQhS*w^-M*#q)LGdBIpjU?g0000< LMNUMnLSTXb7p}WQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/spear1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/spear1.png new file mode 100644 index 0000000000000000000000000000000000000000..fec362ac7284b04db4492b77d3b1014516e64bd2 GIT binary patch literal 1965 zcmb7FeM}Q~7(QGeh$B;RYDe5IXNVxQ*IudGOOFO=l?o*l>HwX}(O&6Edw1L&w4l?d z6E#Q_!&H!I;=qsj6*ZYt@nfK1G8O|mbsK&R=Sa*J++ZL9Wxs2Y55X<_pionyAr<_?(iI#8eubiQ>N7`~J5zeM^Xof&KE?q@n+D;(p8ne>OB~VT}v52SAic+k$qFkHSj_Bh;bY2`J za8n`)d)+QZz`X?G%Zr11$&4bf&qd57kPNd0PGETo)+jUzB@!0`>v+2ZPcyVoUF(SPL><$XjIG)JSI@29dD^4A!FPD zedAZ~lH7RCX7j(hyWOM45JY1EAYzczQ6s!AAXp1I3QeU1HlMdq#sZ2FXZx6tc)=4` z7t5ysX;1{B8a7*KFXhTG&~Azm0OQ!WN~V|`(K%Fn7)Yn>Z`!2+UHOtimN7J-#NV$k zBx4vOkog!oqD~8K~P%ill)QL8q7!Q_GcFITmYGX>g?mk5xx2)wojWo6hIY z+G$7Oe|bxahIPQ-Y{nC5L1g(tpUE%tG%C-3@*iEaPv4TlC4bT;O-CRc&)V~Cl-*a_ zr+*0*Scm8#c`7~!JYWKecQ|OkLm_ODgbrgcrog~UIVz#YNr7}DM~lTZDqQt?G<4i% ze3E->Gk)}cHRBH%+stU52b=V6O25O1g#m`}+rT0M8x0*=Y2Yxl6e$L5 zLLRKV)fI=05EQVH1~MHZPY8-E%P+eXZCE<3QQvU$^pqRf(_512Lwc8ng_l(H&y8^$ z!0tEcIvscVy_e_jc71;G(DjDXfg1u=P$#FA?Uv_eZ$8ke)9lus7jCt$?;wt>y%o5# zvia+{-X zv)Gcf_e5mbqnBUk zO{;iKMd%(?CTy&nFzb+F$=}t6m0i_4-u*6RV4(YlmcF6~&#p|i>h5qXnou-RK-;eFjr{8(M_p3?wA8struGaSi8jLx2`{({y1-@Mqxx`EXf+mGYR{&I5 zH4_-OnGEsPj4gjO%R@HBPb+R-Yn-f-HNA2*IQjP+d&zU(1b=DrJPv9t}F$I z(;RizI_nJOi+1fBm>X9w^CT}XZd{O68l{-I{)()tmJFY=v#Hj2Jq9^d(fj*_-r`St zdbY1T$IZ|qm-;5`zxz(m18vk44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6Px%AW1|)RCt{2+A(MoQ5XmC|3L`YE83+BQnFk{C>2Xjt^}kgg_c66E)GH@bQDoL zN^uZzc5)FEO@efDa1;^(QeNnlpd!>Z7$jJ-I7kxlUg0@}7p_5@3%ygK|KF0~z5BlR zy}L}`2M`ev5fKp)5z+s}h&sXI!m_H@_uzRR;_*1P${WAUIX#tBdS8(JVdyLP;=;0O zeQ#pum^5xH7X*lV`x{nX&-`4;_ef|C_QL`46TpGj#3G@F)4_W%F@07*qoM6N<$f+Lz3 ACIA2c literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0a78a494a7cd669dbfa0a4a7751b45e4c41d70d4 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2a7fb33315056f46a4a08cc32132d68693a1a40d GIT binary patch literal 591 zcmV-V0Px%2}wjjRCt{2+A&BQQ5XmC|3N&c7pRLKmLh_RASxjTDOn^!$LRS|63f1`Hv82%7-bJz2JFxE3 z-&WsLpNMR?<1~4Uj-C#b-v`xazuqN$09fdMT9bry$@OLqmH_~fZ{>s>zgIXw=2ga! z>#7O4ETMg_>5}Wsy?mCKf4$`E&l-IJ`k0(w@Bc(ZL_|bHL_|bHL_|c?k_&5tdX4?d z*UXidzhw+z?A_FY@mNyGT6wN>ceAaMg z9dTGZL>T34bwA6BR+}?Exf}nqS7>i5I$@&tFy;fm&(vZl9mkvA$G5Amz?pSKy5xGDThm_W*0fiz=|Xqy4NYNC56d_Z5}0F+uNY?;7i^5kMT<{b1*(HmzS84@{nnc-8lvBihiAT zPL^By-Gw(WuSyWP(=TAbsB&}Cxy4)t1uv9Ywl%X@y!8~c;45P9=8ie=oX5lA2#a1q zvG@xEx5TM$3mETnI;^VT_GwW3qSKM$R$(ua!nWAJsUcKM0p-3w z4}3`f%Ba#9!q#?w^F)>i<_5mlK9N8jJ|3Q=(;trN3NbJ&SmB{K_1;#H&lx;j{an^L HB{Ts5n`VF) literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/meta.json new file mode 100644 index 00000000000..d22a8df85e7 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Sh4zik", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "metal-inhand", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/metal-inhand.png b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/metal-inhand.png new file mode 100644 index 0000000000000000000000000000000000000000..8b704272890f3841cc424d27478a72efffb2baeb GIT binary patch literal 1287 zcmV+i1^D`jP)bhxB}IyVh!iRPL-Zs?L_Anq8Yn@i1VlYZ zdXZv?VoXf^uD&>qvw5@5{)ovg2)fSBd+#&v*UoH*)#g`6o7-h>0F&R|-dd|$TN#e(%EH2WXJ@D7C4{>C zy}iuh(9njH4x1MjODnUpuH>@-Mn^|$Feo06TdQ{pJQIF-`Q#P=lu9N0-tqA6NCp4 z%jxv`_4T#q9sv1kKYy|zusk#4O1`!SKmlBUU;|KG5RTh^0l?f&5D@<_k>3zNGMTL1 z+}zlv_Vn~v$OYVmWGOzA&*xdlPIJogb>?#Wj1~YG-qqD*>&Zdz0{~9j&NLU_#u93P>gpg+*5HEEO)b-Y)lfh)K{34-nBN^I?iU6D@1bO@f1puop?-Te2Kn?{J1k=Vx*BfXYa+9vB zJI$@_0hj=EohCwPxZSyNYp^`t?P{y!xdLFSa5Fw10cgfm2~wxX1A?U8jIxY80A*-+ zc=(xJXo$Q#9fknx^q|bj*ZKLmcGu^56(9g~5(ELHWHy^Mf-5UKJw0ugU|Ck^0B~OL zd4E46o)AOP#YDpK9RDSuuvsW9$?Mp-fbFH;wxMOsv`z@dJQt1nm%q?g4ENKwKGu;g<)9=K>@* xbPrI)mx)rU`RHpkuVoqK0H?(An(ntffd6S|)^7DjO3eTO002ovPDHLkV1iN!JQV-{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4032ec5498cf41799b77ad57fd5351c7d19d7f8b GIT binary patch literal 687 zcmV;g0#N;lP)_)rKXaT* zfAs!%Os}>R33}ezb`?t0G<~oVAfL}uU`%LP)=~gJ5C8^)f&04EYORd17Qo5d+a<4b zSstLq!|rZ400}8^`Td=F30dlzA^<=YAznC*Xn50AMoz7F4C9-|v$e#&!WF zg9nz?06zqB&xer_0Laa!A+{ms+3P?+II>1`Ga1qA^;{1iEgRPX2Eb}ih*WjpNP>Rs z?NK4(Ih z0WM^5LA#R0#t-5(BUTQT_~slG9Nz|BN?CzFpPynPPq}Nk6ZmNM*J3swr^*NbtMFGA zqOaFi0#G%qoG-CD!L=0d`T(gw8dMEim2X3#00jLjS~vgN3MiLspd-+P24bw7;vYcI VsW3xT4QBuV002ovPDHLkV1hQwF0}vv literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/meta.json new file mode 100644 index 00000000000..d22a8df85e7 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Sh4zik", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "metal-inhand", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/metal-inhand.png b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/metal-inhand.png new file mode 100644 index 0000000000000000000000000000000000000000..17b9147ec38d54a9881212cee9bb8ce7b256dd71 GIT binary patch literal 1611 zcmV-R2DJH!P)F1` z^r((^PjBB2{iJhmPdxkaY0CaYCdZ(wS7xb2Y-`Ln-_sa#~O1_bz z6B85lv$L~MojW=@ytTD8qdvI+@E*zU>+ADYR#qBvrlzLq2L}gUEArXOLO7J@>FEj8 z`RM3KJaYj-mMu}TIY$1oO67@aeZ?n_mi9*l?L|60kC6yc(qy#dcS-*0 z>Z(@X$;rvOiTtJ=j*gBB!_i?fnG6J=8U+CR`}>WbH#ax6N{4|_<#Pd;$TtG;aiQ>p zMmk7oc*8&0?1u@Ux3|}OSS*Su5C#DN{vH^ZKRi6N?g5a`i7ki~Ci2-H00qzpLJ)}G zlgWAfZlXZ5xFAmflHUvh1xge7O#zILkJpcnkA;ri-Q6M<=o(^%{LT9Mddo3DmCxzR z^cxlc7>+^*O$WgR0LU~cuHZQ|XgX*{0J7PvfUvu}>wW&_O~V=fxOdMR92^w?FBA%* zQUnNijZT4P9z~^8f%yr_u0`fFsfK33X>&aMdeNXEK`c79q8^r)M1%^$B zYPBllbE2>=3&=9Ll_2$rX=r5%phHZ7pc+7h0HL%Pu>nA5fDWMUd#wk+-Dx$5G)VJY z77Pd#zeXqy40z>oxe)^}Ep!S*H6ZHuYycQd6hdKjz(+o)y*qbAAw+e6O#qyT4jA%# zoNu&?AtFp^kW&YktjC*;AeFQ<1@W&gs3CBg$TtGOSqDH#69r5Fa58~a08oxbfjoc| z{`B?hhVFmfzuyRuauCD|t<>={6ji?L0Wene2qyr(^otv`-~3`n1tBYok;f>}&T&-Z zX#iyTa-Tr}uzhYKU%OVP5%}u;d+*3!7 zAyv|D5Lba_K~M%j@?`)3qsk$V<;ph#pgR?^J^xhzs!Zvb#8ao+jvq0Q4_ z2*6Gc(yZD_rBbAF+X?{6{ZNjSTwY#|)VFHr^z^jwFjZFU0B|1gxLUn%Z{U}F{%4L$ zbKm(km-|kA_jxKck1cp^(Gw&q(kNjHTx$RnkiMwZV)1}yiG(Kxqu-!oor%52KFe=H?m)B>v*(oU^o@2MqgXh9@T{-qO;N z730a;nVFe-S67#}{r}k{{oZx}9{Xp9XirNes{p>qWP}$y_s<^W)|LREWR%Dp6cCYd z0Jm)c&^{bCO`xa?4}kHq9I6as%>s0L3(CklMlL*nJVQR8z|q~M0ibJWqzHr)0Cl^} zB>>1L2(k{O7v~h2-ZctT@_9Wvz&QW_knvC|m&-X#gZX^^oIC(f&nk4sXL5`&0-y#b ztOevL004B8Y;kchQs1hq+1Xi<1#tK(d)uW>fo1@Zqh;50u^%AE8PpnRHvld(2nKmT zDwPUK+fH_bf&}3@&ZT7m4gk6`+W{CF8giNic6N5ojYI4J)D(m}!!8#? zxQZ(`q~cho0F+T7;E$JF6hi7BY|%}W*Z~A>insuv#vmIf(UFQ3`Ch)N+_eHA8&BTg z3V?hrKyqWB0zvsXic&%S$yeso=TT%ungW3p&=vdf+5`9xAtJARs0k1&j1iS*73*f(iSHLR(BCy_W;%c#! zGYVF?X_|PxU4t3~7=R>Ff{@;IT|;w0l75VV7X6+7#K-9?^nD+?u7hT?AV5n_XJtJ6 zbwyQGv29yuwgdoHNoKCZlnj7Kzy=WEN<`ZLi7^pN+5jS4iD(-jF(zV38$g6B5p4q` z#zZV>1Bh@XqHTc0n205901>W4v<;9L6S1TXAi|Z1wgId$A+O7kS?}ki7?28&ha=c6 zG4tvj4gh`l*Th&5-~h_9jNg+%*zf+K+3D*2a=gQ@-JvC4(@JF-0MMDKF9iVW!^+4t z00vd1OdFsyEk;)xz@Vy>X#z&ds-qFaLjcf4~#2 zi9gq$xU-*uK}DgMDWdTVbHj9nFb3@jmW*p0o-rQS&j92kcs?kwI`y~gxSC~{+mxR# zGjwJx+juF`i0{{qjT5)!E`8NAx$^084u{atO*-C&GyWd=T4Q{PMRu{Xp|Wvl?CEu{ zyN>Rf^xZpuN#P646;q~4a#=Dg2zb22k;%e$@*`GGO4%Q$HB2aHw#%+$6!?|rP`j$W z?%tu}3)_qvEu1vg9*4VpKFEDn4#?y*WR zVQH)9@R@7-xxOsR%CG;D4vT{rcfrSo;>wZ|lUiAaHBS|e2imeYOl#(0`zbg7d?Kqt zsH{WR`IYY&igcDoiA>1043%-{d@5qikn(fYUv9}udp37^72L>*+a$cOxA$y)+Rpj{ zV}3nrw`q|nnM{%YzP=7;3zKAP3!Z&`aw^-+oeXJ~=H}*y^$)K9Qp&LDse7Ny!V}L` z+8K0p)UCuXoGMx*BbURjDoxi{vq)A@wb25T zC~yXhc1+Ahv+uuegRMg0PgVH&g8|rp!U=c<3Kzg1L9c*Upl||Sfx-pwU%)Hi6#x8k!4|^ll8a=<{-({(m3BFbtvVI%qZv z0<`385!30=RZY{Rwr!!=5&&2wnYj{EG5{h08$g6B5p4q`#zZV>1Bh@XqHTc0n2059 z01>W4v<;9L6S1TXAi|Z1wgD1jB9^oPM7R>sHb7!b#F93E2v;K72C&A2ye>y(-JX|X zKrY<>^{`uF=G8kK0Q&Ib#8?pE0Ah@3GJOo+yCXC^U%j7yF7Ru2XvuL}xhw+!Iy3jB z0APJs8My|)psJK<1C*x4=xPHPRFyJqfYP)WU2On^s#0e023!F*=}tkW3miEB0000< LMNUMnLSTXb-tw&U literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/dagger-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/dagger-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2db5c289bd78b17785e855f7600b04e81016a957 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Z4^aSW-5dpm0(-ys8mw%rR( z2;Jdf>R;nHLDhy)LZ&aFg5BhOgQA5D+q{Mp#{{)X<})&E?w&_$%5!f$`?dJ{^LPK> z?N=G5Z}>brOb2B8TSjB6YoF&^+1&~6a*n8OgJ@R8v`JOhyP!sEfN-7AjPom8`& z+mrG6>~6u?m$yw`r<}aLUs~F79luxkv6FkgC9^nqt^8yozW1X4o%8(4z1Iz+M2wAs zr!8HzN^AC+rB(N`lzUzM%hArbD$DG~_>EDn4#?y*WR zVQH)9$XONl`~G@UiRJE@VoVC%j*)+Uz82?sxp~ve*9;S$uAjd*?Z=PT!p;{j8SR<3 zq>AH=?;OT&mWI=suLNFYT=GLEj4Ajmqrz#&kAJ_u4sSZx7xO3hDC3hTzo{AwM}Nv+ z+pqF_j#ePUrkacAU3vcXFsiUxhb}sB?ASB=&3Ei~M6yqpRo1pTd5L9{%#<4usS*-? zxpw~3BvafO&lKh5<+a5(#RHv@a=Kr}(rMy(Pd>(|2)`1uB~zceST;R#*K6 w!vv-Y$}6Tm*ig#2V$vkdm(gIaxj8d1xV>*v{KB|wHqiSFp00i_>zopr0F--saR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/meta.json new file mode 100644 index 00000000000..5be9e188352 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Sh4zik", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "dagger-inhand-right", + "directions": 4 + }, + { + "name": "dagger-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/dagger-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/dagger-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6242712b5e28db87b5df905afda5927ff4649349 GIT binary patch literal 411 zcmV;M0c8G(P)0k1&j1iS*73*f(iSHLR(BCy_W;%c#! zGYVF?X_|PxU4t3~7=R>Ff{@;IT|;w0l75VV7X6+7#K-9?^nD+?u7hT?AV5n_XJtJ6 zbwyQGv29yuwgdoHNoKCZlnj7Kzy=WEN<`ZLi7^pN+5jS4iD(-jF(zV38$g6B5p4q` z#zZV>1Bh@XqHTc0n205901>W4v<;9L6S1TXAi|Z1wgId$A+O7kS?}ki7?28&ha=c6 zG4tvj4gh`l*Th&5-~h_9jNg+%*zf+K+3D*2a=gQ@-JvC4(@JF-0MMDKF9iVW!^+4t z00vd1OdFsyEk;)xz@Vy>X#z&ds-qFaLjcf4~#2 zi9gq$xU-*uK}DgMDWdTVbHj9nFb3@jmW*p0o-rQS&j92kcs?kwI`y~gxSC~{+mxR# zGjwJx+juF`i0{{qjT5)!E`8NAx$^084u{atO*-C&GyWd=T4Q{PMRu{Xp|Wvl?CEu{ zyN>Rf^xZpuN#P646;q~4a#=Dg2zb22k;%e$@*`GGO4%Q$HB2aHw#%+$6!?|rP`j$W z?%tu}3)_qvEu1vg9*4VpKFEDn4#?y*WR zVQH)9@R@7-xxOsR%CG;D4vT{rcfrSo;>wZ|lUiAaHBS|e2imeYOl#(0`zbg7d?Kqt zsH{WR`IYY&igcDoiA>1043%-{d@5qikn(fYUv9}udp37^72L>*+a$cOxA$y)+Rpj{ zV}3nrw`q|nnM{%YzP=7;3zKAP3!Z&`aw^-+oeXJ~=H}*y^$)K9Qp&LDse7Ny!V}L` z+8K0p)UCuXoGMx*BbURjDoxi{Xq>!2oPP_yNF$P+6wO!`N?;!MjA5u!tY!(D)$;CS6(>^tA z+vcw8pxF`tSS6Xc5>qk&A^{sfgewtk10=>oENKIXa3!K`fW(-HC2ar^u0*sAkQfuO zqzxd#m586MBH9M9#)P~sM`pdBmtsIE{6EUDTVm$b zI~)M|@UMxnAix2{81wjR7!JE5G`n2AUoUs~wL7%rYg(l&0{}X+^rZk`eOMW}2Ed@I zlxYK$rp4%L0~l15GHrm;v>07&0E4PhX7vU<0h`NDLGq@-hyVZp07*qoM6N<$f&c)9 C0HNyu literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/dagger-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/dagger-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..73a42c0d17786aa5c00b6fb4f9dace8bb80bbd0a GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fV)aSW-5dpm0(-ys8mw%rR( zFtN2C5K0l`*p%Ym;P|P*gU5eEilf2`l|2l6%uMc{M{BBcZ$109`1|vB|KIIbESswF zCtUPhJOhJJfCb|khlh*@yaluyL^b9xge~~M@F1Q6$SF{{U^^vm`Xt|?IXx1e*LRBj z{&~yu`3Z|xkFUA;ou6$sx6mm6PXyzHpjW%r9nJVCeD`D0(oQS4{-m(9S<5cg-VdKW z_saFnn=Vy+5eYqYilXt@;l{=YmlOjE2Cl4FLe| XD~2J&1Ikwb0000EDn4#?y+iE zBT%r`{)2qcn literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/icon.png b/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..aab6a715a4c08187e71898bd6336ca6cae412660 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJrJgR1ArbD$DG~_>EDn4#?y*WR zVR3VY5E(58uKoS}e{yhog|(H?7X?RFh0{x2TuyA9|M2E)bDkC%$8F3GZTELpi@z}t zO-*IX>08pptafhZXZh)@Kblyd9r!avWY0Vm2_^&f3Bv3P1Qy+3ROoi>b0}|^yVLS8 zo4@~tf&<^)^0fQSJ5r#mc-m2lqm9ARPTlqV3TBuSK#pNxD4A`nc#A1?0not=p00i_ I>zopr0HDE69RL6T literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/meta.json new file mode 100644 index 00000000000..b4997ae6cc6 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/meta.json @@ -0,0 +1 @@ +{"license": "CC0-1.0", "copyright": "Created by Sh4zik","version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "beaker"}, {"name": "on"}]} diff --git a/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/on.png b/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/on.png new file mode 100644 index 0000000000000000000000000000000000000000..0da314bb1bd2281a10f290e0fa5603b996e4e51b GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzcTX3`kO=p;*EaG3C0HEpUi6)F z*!M=@W3CLR;x7lDuX?|>qUz&+H3mi|77hUghX Date: Tue, 3 Dec 2024 15:02:17 +0100 Subject: [PATCH 02/53] NoLocaleAt3AM --- .../ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index 1ce19a0313f..2f323eeec0e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -93,7 +93,7 @@ uplink-blackmail-bundle-desc = Набор для относительно эфф uplink-syndicate-helmet-name = шлем спецназа uplink-syndicate-helmet-desc = Очень прочный шлем, широко используемый военизированными организациями. Его украшает ужасный узор из красных и чёрных полос. Да прибудет с вами робаст -uplink-nukiesShield-name = двухручный штурмовый щит +uplink-nukiesShield-name = двуручный штурмовый щит uplink-nukiesShield-desc = Массивный и опасный, двухручный щит из элитных материалов для лучшей защиты щитоносца, имеет несколько рядов пластин защищающих от каждого типа урона, а также несколько острейших шипов на основе щита. Да прибудут с вами силы синдиката. uplink-omnizinpizza-name = коробка с пиццей синдиката From 46ba1efa4849650f47486bcd75cc01dd5ac340c4 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:03:12 +0100 Subject: [PATCH 03/53] AllMyhomieshatebugs --- .../ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index 2f323eeec0e..e8554acca45 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -94,7 +94,7 @@ uplink-syndicate-helmet-name = шлем спецназа uplink-syndicate-helmet-desc = Очень прочный шлем, широко используемый военизированными организациями. Его украшает ужасный узор из красных и чёрных полос. Да прибудет с вами робаст uplink-nukiesShield-name = двуручный штурмовый щит -uplink-nukiesShield-desc = Массивный и опасный, двухручный щит из элитных материалов для лучшей защиты щитоносца, имеет несколько рядов пластин защищающих от каждого типа урона, а также несколько острейших шипов на основе щита. Да прибудут с вами силы синдиката. +uplink-nukiesShield-desc = Массивный и опасный, двуручный щит из элитных материалов для лучшей защиты щитоносца, имеет несколько рядов пластин защищающих от каждого типа урона, а также несколько острейших шипов на основе щита. Да прибудут с вами силы синдиката. uplink-omnizinpizza-name = коробка с пиццей синдиката uplink-omnizinpizza-desc = Это самая обычная коробка, с самой обычной пиццей внутри, это именно то, что используют элитные агенты для перекуса между стрельбой с капитаном, и кражей Иана. From 2e1b48f747e885929682e49e892fa21692b4bc9f Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:04:13 +0100 Subject: [PATCH 04/53] bru? --- .../ADT/prototypes/Entities/Objects/Shields/shields.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl index af43cb110e4..282e79eea07 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl @@ -1,8 +1,8 @@ ent-ADTEctoShield = эктоплазменный щит .desc = Не позволяет фантому взаимодействовать с носителем, так ещё и выглядит модно. -ent-ADTFullRiotShield = самодельный двухручный щит +ent-ADTFullRiotShield = самодельный двуручный щит .desc = Обладает довольно массивной защитой для носителя, выглядит громостко, но выполняет свою работу -ent-ADTFullRiotShieldSyndicate = штурмовый двухручный щит синдиката - .desc = Громосткий щит созданный синдикатом из самых тяжёлых и крепких материалов, создан для длительных штурмов, и имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. \ No newline at end of file +ent-ADTFullRiotShieldSyndicate = штурмовый двуручный щит синдиката + .desc = Громосткий щит созданный синдикатом из самых тяжёлых и крепких материалов, создан для длительных штурмов, и имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. From a2bcf3334a84736d396b982453f86346dc951636 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:09:51 +0100 Subject: [PATCH 05/53] DamageBalance --- .../Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml index a68d3a8ef19..5a5d127446b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml @@ -8,7 +8,7 @@ attackRate: 1.5 damage: types: - Slash: 9 + Slash: 13 - type: Item sprite: ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi - type: Sprite @@ -28,10 +28,11 @@ damage: types: Slash: 9 + Radiation: 4 - type: Item sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi - type: Sprite sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi - type: Construction graph: ADTUShiv - node: ADTUraniumShiv \ No newline at end of file + node: ADTUraniumShiv From b2c502e5d15a62640527d9285b2b2f9db7a48af5 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:17:38 +0100 Subject: [PATCH 06/53] AAAAAAUUUUGHGHHGG I hate you, Dear YAML. --- .../Objects/Consumable/Drinks/drinks.yml | 726 ++++++++---------- 1 file changed, 340 insertions(+), 386 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml index 5ecf715a85c..6332f243275 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1,554 +1,508 @@ -#Безалкогольные коктейли от Кекса/Стычинского - - type: entity parent: DrinkGlass id: ADTDrinkSummerShadeGlass suffix: SummerShade components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTSummerShade - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/summershade.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSummerShade + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/summershade.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkWinterSunGlass suffix: WinterSun components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTWinterSun - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/wintersun.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTWinterSun + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/wintersun.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkHungoverAngelGlass suffix: HungoverAngel components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTHungoverAngel - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/hungoverangel.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTHungoverAngel + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/hungoverangel.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkCitrusBalanceGlass suffix: CitrusBalance components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTCitrusBalance - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/citrucbalance.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTCitrusBalance + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/citrucbalance.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkDobryiDrinkGlass suffix: DobryiDrink components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTDobryiDrink - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/dobryi.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTDobryiDrink + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/dobryi.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkMilkEclipseGlass suffix: MilkEclipse components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTMilkEclipse - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/milkeclipse.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTMilkEclipse + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/milkeclipse.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkArcticExplosionGlass suffix: ArcticExplosion components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTArcticExplosion - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/arcticexplosion.rsi - state: icon - -#Базовый алкоголь от ADT - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTArcticExplosion + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/arcticexplosion.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkAppleLiqueurGlass suffix: AppleLiqueur components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTAppleLiqueur - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/apple_liqueur_glass.rsi - state: icon - -#Алкогольные коктейли от Кекса/Стычинского и Кермита - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTAppleLiqueur + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/apple_liqueur_glass.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkSugarKnightGlass suffix: SugarKnight components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTSugarKnight - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/sugarknight.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSugarKnight + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sugarknight.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkGrapeLadyGlass suffix: GrapeLady components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTGrapeLady - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/grapelady.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTGrapeLady + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/grapelady.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkSaturdayBaronGlass suffix: SaturdayBaron components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTSaturdayBaron - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/saturdaybaron.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSaturdayBaron + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/saturdaybaron.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkArcticLatteGlass suffix: ArcticLatte components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTArcticLatte - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/arcticlatte.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTArcticLatte + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/arcticlatte.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkSpecialTeaOolongGlass suffix: SpecialTeaOolong components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTSpecialTeaOolong - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/teaoolong.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSpecialTeaOolong + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/teaoolong.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkAzureBlueGlass suffix: AzureBlue components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTAzureBlue - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/azureblue.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTAzureBlue + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/azureblue.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkPenetrationGlass suffix: PenetrationDrink components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTPenetrationDrink - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/penetration.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTPenetrationDrink + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/penetration.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkEclipsedEclispeGlass suffix: EclipsedEclispe components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTEclipsedEclispe - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/eclipsedeclipse.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTEclipsedEclispe + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/eclipsedeclipse.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkSpaceBushGlass suffix: SpaceBush components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTSpaceBush - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/spacebush.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSpaceBush + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/spacebush.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkBusinessConversationGlass suffix: BusinessConversation components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTBusinessConversation - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/buisinessconservation.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTBusinessConversation + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/buisinessconservation.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkAppleMartiniGlass suffix: AppleMartini components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTAppleMartini - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/applemartini.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTAppleMartini + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/applemartini.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkBacardiAppleGlass suffix: BacardiApple components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTBacardiApple - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/bacardiapple.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTBacardiApple + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/bacardiapple.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkElderGuardsGlass suffix: ElderGuards components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTElderGuards - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/elderguards.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTElderGuards + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/elderguards.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkLimeShadeGlass suffix: LimeShade components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTLimeShade - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/limeshade.rsi - state: icon - -#Пиво к Октоберфесту - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTLimeShade + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/limeshade.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkGoldenAleGlass suffix: GoldenAle components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTGoldenAle - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/goldenale.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTGoldenAle + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/goldenale.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkSausageBeerGlass suffix: SausageBeer components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTSausageBeer - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/sausagebeer.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSausageBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sausagebeer.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkTechnoBeerGlass suffix: TechnoBeer components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTTechnoBeer - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/technarbeer.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTTechnoBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/technarbeer.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkClassicPaulanerBeerGlass suffix: ClassicPaulanerBeer components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTClassicPaulanerBeer - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/classicalpaulaner.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTClassicPaulanerBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/classicalpaulaner.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkLivseyBeerGlass suffix: LivseyBeer components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTLivseyBeer - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/doctorlivsey.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTLivseyBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/doctorlivsey.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkLuckyJonnyBeerGlass suffix: LuckyJonnyBeer components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTLuckyJonnyBeer - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/luckyjonny.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTLuckyJonnyBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/luckyjonny.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkSecUnfilteredBeerGlass suffix: SecUnfilteredBeer components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTSecUnfilteredBeer - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/secbeer.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSecUnfilteredBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/secbeer.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkGlyphidStoutBeerGlass suffix: GlyphidStoutBeer components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTGlyphidStoutBeer - Quantity: 30 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/glyfidstout.rsi - state: icon - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTGlyphidStoutBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/glyfidstout.rsi + state: icon - type: entity parent: DrinkGlassBase id: ADTDrinkCocoaGlass name: hot cocoa description: A heated drink consisting cocoa powder. components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTCocoaDrink - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi - - -#Sh4zik drinks, oh my. Im alive? Surprised. Hello, btw! - + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTCocoaDrink + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi - type: entity parent: DrinkGlass id: ADTDrinkOrangeTeaGlass components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 25 - reagents: - - ReagentId: ADTOrangeTeaReg - Quantity: 25 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi - state: icon - - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 25 + reagents: + - ReagentId: ADTOrangeTeaReg + Quantity: 25 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkCherryTeaGlass components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 25 - reagents: - - ReagentId: ADTCherryTeaReg - Quantity: 25 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi - state: icon - - + - type: SolutionContainerManager + solutions: + drink: + maxVol: 25 + reagents: + - ReagentId: ADTCherryTeaReg + Quantity: 25 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi + state: icon - type: entity parent: DrinkGlass id: ADTDrinkWatermelonTeaGlass components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 25 - reagents: - - ReagentId: ADTWatermelonTeaReg - Quantity: 25 - - type: Icon - sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi - state: icon \ No newline at end of file + - type: SolutionContainerManager + solutions: + drink: + maxVol: 25 + reagents: + - ReagentId: ADTWatermelonTeaReg + Quantity: 25 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi + state: icon From 619fef37683015d98c042766b4e842d6f35a1bce Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:25:22 +0100 Subject: [PATCH 07/53] why.. --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index 92daba1bcd4..af2ea0ad9b1 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,22 +1,21 @@ -reagent-name-orangeTea = апельсиновый чай -reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости -reagent-physical-desc-orangetea = тёплая, сладкая субстанция + reagent-name-orangeTea = апельсиновый чай reagent-desc-orangetea = Тёплый и + мягкий чай с ноткой сладости reagent-physical-desc-orangetea = тёплая, сладкая + субстанция -reagent-name-cherryTea = вишнёвый чай -reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости -reagent-physical-desc-cherrytea = тёплая, сладкая субстанция + reagent-name-cherryTea = вишнёвый чай reagent-desc-cherrytea = Тёплый и мягкий + чай с ноткой сладости reagent-physical-desc-cherrytea = тёплая, сладкая + субстанция -reagent-name-watermelonTea = арбузный чай -reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. -reagent-physical-desc-watermelontea = тёплая, сладкая субстанция + reagent-name-watermelonTea = арбузный чай reagent-desc-watermelontea = Тёплый + и мягкий чай с ноткой.. арбуза?.. reagent-physical-desc-watermelontea = + тёплая, сладкая субстанция -reagent-name-orangePack = апельсиновый сироп -reagent-desc-orangepack = Горький сироп для приготовления чая -reagent-physical-desc-orangepack = горькая, металлическая субстанция -reagent-name-cherryPack = вишнёвый сироп -reagent-desc-cherrypack = Горький сироп для приготовления чая -reagent-physical-desc-cherrypack = горькая, металлическая субстанция + reagent-name-orangePack = апельсиновый сироп reagent-desc-orangepack = Горький + сироп для приготовления чая reagent-physical-desc-orangepack = горькая, + металлическая субстанция reagent-name-cherryPack = вишнёвый сироп + reagent-desc-cherrypack = Горький сироп для приготовления чая + reagent-physical-desc-cherrypack = горькая, металлическая субстанция -reagent-name-watermelonPack = арбузный сироп -reagent-desc-watermelonpack = Горький сироп для приготовления чая -reagent-physical-desc-watermelonpack = горькая, металлическая субстанция \ No newline at end of file + reagent-name-watermelonPack = арбузный сироп reagent-desc-watermelonpack = + Горький сироп для приготовления чая reagent-physical-desc-watermelonpack = + горькая, металлическая субстанция From f97ba9287061b61c869adedcdb3760d421e41913 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:37:14 +0100 Subject: [PATCH 08/53] Why my file that broken? Its wasnt broken like that.. --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index af2ea0ad9b1..97a03666446 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,21 +1,20 @@ - reagent-name-orangeTea = апельсиновый чай reagent-desc-orangetea = Тёплый и - мягкий чай с ноткой сладости reagent-physical-desc-orangetea = тёплая, сладкая - субстанция + reagent-name-orangeTea = апельсиновый чай reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости + reagent-physical-desc-orangetea = тёплая, сладкая субстанция - reagent-name-cherryTea = вишнёвый чай reagent-desc-cherrytea = Тёплый и мягкий - чай с ноткой сладости reagent-physical-desc-cherrytea = тёплая, сладкая - субстанция + reagent-name-cherryTea = вишнёвый чай reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости + reagent-physical-desc-cherrytea = тёплая, сладкая субстанция - reagent-name-watermelonTea = арбузный чай reagent-desc-watermelontea = Тёплый - и мягкий чай с ноткой.. арбуза?.. reagent-physical-desc-watermelontea = - тёплая, сладкая субстанция + reagent-name-watermelonTea = арбузный чай reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. + reagent-physical-desc-watermelontea = тёплая, сладкая субстанция - reagent-name-orangePack = апельсиновый сироп reagent-desc-orangepack = Горький - сироп для приготовления чая reagent-physical-desc-orangepack = горькая, - металлическая субстанция reagent-name-cherryPack = вишнёвый сироп + reagent-name-orangePack = апельсиновый сироп + reagent-desc-orangepack = Горький сироп для приготовления чая + reagent-physical-desc-orangepack = горькая, металлическая субстанция + + reagent-name-cherryPack = вишнёвый сироп reagent-desc-cherrypack = Горький сироп для приготовления чая reagent-physical-desc-cherrypack = горькая, металлическая субстанция - reagent-name-watermelonPack = арбузный сироп reagent-desc-watermelonpack = - Горький сироп для приготовления чая reagent-physical-desc-watermelonpack = - горькая, металлическая субстанция + reagent-name-watermelonPack = арбузный сироп + reagent-desc-watermelonpack = Горький сироп для приготовления чая + reagent-physical-desc-watermelonpack = горькая, металлическая субстанция From 74d36478162b6f9713a30a707591bf9ba5853ffb Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:42:11 +0100 Subject: [PATCH 09/53] svintusprisheellll... --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index 97a03666446..746f001161b 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,20 +1,20 @@ - reagent-name-orangeTea = апельсиновый чай reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости - reagent-physical-desc-orangetea = тёплая, сладкая субстанция +reagent-name-orangeTea = апельсиновый чай reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости +reagent-physical-desc-orangetea = тёплая, сладкая субстанция - reagent-name-cherryTea = вишнёвый чай reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости - reagent-physical-desc-cherrytea = тёплая, сладкая субстанция +reagent-name-cherryTea = вишнёвый чай reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости +reagent-physical-desc-cherrytea = тёплая, сладкая субстанция - reagent-name-watermelonTea = арбузный чай reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. - reagent-physical-desc-watermelontea = тёплая, сладкая субстанция +reagent-name-watermelonTea = арбузный чай reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. +reagent-physical-desc-watermelontea = тёплая, сладкая субстанция - reagent-name-orangePack = апельсиновый сироп - reagent-desc-orangepack = Горький сироп для приготовления чая - reagent-physical-desc-orangepack = горькая, металлическая субстанция +reagent-name-orangePack = апельсиновый сироп +reagent-desc-orangepack = Горький сироп для приготовления чая +reagent-physical-desc-orangepack = горькая, металлическая субстанция - reagent-name-cherryPack = вишнёвый сироп - reagent-desc-cherrypack = Горький сироп для приготовления чая - reagent-physical-desc-cherrypack = горькая, металлическая субстанция +reagent-name-cherryPack = вишнёвый сироп +reagent-desc-cherrypack = Горький сироп для приготовления чая +reagent-physical-desc-cherrypack = горькая, металлическая субстанция - reagent-name-watermelonPack = арбузный сироп - reagent-desc-watermelonpack = Горький сироп для приготовления чая - reagent-physical-desc-watermelonpack = горькая, металлическая субстанция +reagent-name-watermelonPack = арбузный сироп +reagent-desc-watermelonpack = Горький сироп для приготовления чая +reagent-physical-desc-watermelonpack = горькая, металлическая субстанция From f943ea1f327f00bef223d436a7e5c56b057cfc2f Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:49:18 +0100 Subject: [PATCH 10/53] ERP With YAML --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index 746f001161b..b1ec2fc26bd 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,20 +1,23 @@ -reagent-name-orangeTea = апельсиновый чай reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости -reagent-physical-desc-orangetea = тёплая, сладкая субстанция + reagent-name-orangeTea = апельсиновый чай + reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости + reagent-physical-desc-orangetea = тёплая, сладкая субстанция -reagent-name-cherryTea = вишнёвый чай reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости -reagent-physical-desc-cherrytea = тёплая, сладкая субстанция + reagent-name-cherryTea = вишнёвый чай + reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости + reagent-physical-desc-cherrytea = тёплая, сладкая субстанция -reagent-name-watermelonTea = арбузный чай reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. -reagent-physical-desc-watermelontea = тёплая, сладкая субстанция + reagent-name-watermelonTea = арбузный чай + reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. + reagent-physical-desc-watermelontea = тёплая, сладкая субстанция -reagent-name-orangePack = апельсиновый сироп -reagent-desc-orangepack = Горький сироп для приготовления чая -reagent-physical-desc-orangepack = горькая, металлическая субстанция + reagent-name-orangePack = апельсиновый сироп + reagent-desc-orangepack = Горький сироп для приготовления чая + reagent-physical-desc-orangepack = горькая, металлическая субстанция -reagent-name-cherryPack = вишнёвый сироп -reagent-desc-cherrypack = Горький сироп для приготовления чая -reagent-physical-desc-cherrypack = горькая, металлическая субстанция + reagent-name-cherryPack = вишнёвый сироп + reagent-desc-cherrypack = Горький сироп для приготовления чая + reagent-physical-desc-cherrypack = горькая, металлическая субстанция -reagent-name-watermelonPack = арбузный сироп -reagent-desc-watermelonpack = Горький сироп для приготовления чая -reagent-physical-desc-watermelonpack = горькая, металлическая субстанция + reagent-name-watermelonPack = арбузный сироп + reagent-desc-watermelonpack = Горький сироп для приготовления чая + reagent-physical-desc-watermelonpack = горькая, металлическая субстанция From 9a48248d511c7f065c6d6616e3f34d737ea5c3d8 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 15:57:00 +0100 Subject: [PATCH 11/53] Killthatthing --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index b1ec2fc26bd..47801efd514 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,23 +1,23 @@ - reagent-name-orangeTea = апельсиновый чай - reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости - reagent-physical-desc-orangetea = тёплая, сладкая субстанция + reagent-name-orangeTea = "апельсиновый чай" + reagent-desc-orangetea = "Тёплый и мягкий чай с ноткой сладости" + reagent-physical-desc-orangetea = "тёплая, сладкая субстанция" - reagent-name-cherryTea = вишнёвый чай - reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости - reagent-physical-desc-cherrytea = тёплая, сладкая субстанция + reagent-name-cherryTea = "вишнёвый чай" + reagent-desc-cherrytea = "Тёплый и мягкий чай с ноткой сладости" + reagent-physical-desc-cherrytea = "тёплая, сладкая субстанция" - reagent-name-watermelonTea = арбузный чай - reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. - reagent-physical-desc-watermelontea = тёплая, сладкая субстанция + reagent-name-watermelonTea = "арбузный чай" + reagent-desc-watermelontea = "Тёплый и мягкий чай с ноткой.. арбуза?.." + reagent-physical-desc-watermelontea = "тёплая, сладкая субстанция" - reagent-name-orangePack = апельсиновый сироп - reagent-desc-orangepack = Горький сироп для приготовления чая - reagent-physical-desc-orangepack = горькая, металлическая субстанция + reagent-name-orangePack = "апельсиновый сироп" + reagent-desc-orangepack = "Горький сироп для приготовления чая" + reagent-physical-desc-orangepack = "горькая, металлическая субстанция" - reagent-name-cherryPack = вишнёвый сироп - reagent-desc-cherrypack = Горький сироп для приготовления чая - reagent-physical-desc-cherrypack = горькая, металлическая субстанция + reagent-name-cherryPack = "вишнёвый сироп" + reagent-desc-cherrypack = "Горький сироп для приготовления чая" + reagent-physical-desc-cherrypack = "горькая, металлическая субстанция" - reagent-name-watermelonPack = арбузный сироп - reagent-desc-watermelonpack = Горький сироп для приготовления чая - reagent-physical-desc-watermelonpack = горькая, металлическая субстанция + reagent-name-watermelonPack = "арбузный сироп" + reagent-desc-watermelonpack = "Горький сироп для приготовления чая" + reagent-physical-desc-watermelonpack = "горькая, металлическая субстанция" From cd7f428a54314b6027462c5d99cd395fd6544d42 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 16:06:08 +0100 Subject: [PATCH 12/53] wooohooooooaoaoaoaoo --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index 47801efd514..c3d6ffb1556 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,23 +1,23 @@ - reagent-name-orangeTea = "апельсиновый чай" - reagent-desc-orangetea = "Тёплый и мягкий чай с ноткой сладости" - reagent-physical-desc-orangetea = "тёплая, сладкая субстанция" + reagent-name-orangeTea = "апельсиновый чай" + reagent-desc-orangetea = "Тёплый и мягкий чай с ноткой сладости" + reagent-physical-desc-orangetea = "тёплая, сладкая субстанция" - reagent-name-cherryTea = "вишнёвый чай" - reagent-desc-cherrytea = "Тёплый и мягкий чай с ноткой сладости" - reagent-physical-desc-cherrytea = "тёплая, сладкая субстанция" + reagent-name-cherryTea = "вишнёвый чай" + reagent-desc-cherrytea = "Тёплый и мягкий чай с ноткой сладости" + reagent-physical-desc-cherrytea = "тёплая, сладкая субстанция" - reagent-name-watermelonTea = "арбузный чай" - reagent-desc-watermelontea = "Тёплый и мягкий чай с ноткой.. арбуза?.." - reagent-physical-desc-watermelontea = "тёплая, сладкая субстанция" + reagent-name-watermelonTea = "арбузный чай" + reagent-desc-watermelontea = "Тёплый и мягкий чай с ноткой.. арбуза?.." + reagent-physical-desc-watermelontea = "тёплая, сладкая субстанция" - reagent-name-orangePack = "апельсиновый сироп" - reagent-desc-orangepack = "Горький сироп для приготовления чая" - reagent-physical-desc-orangepack = "горькая, металлическая субстанция" + reagent-name-orangePack = "апельсиновый сироп" + reagent-desc-orangepack = "Горький сироп для приготовления чая" + reagent-physical-desc-orangepack = "горькая, металлическая субстанция" - reagent-name-cherryPack = "вишнёвый сироп" - reagent-desc-cherrypack = "Горький сироп для приготовления чая" - reagent-physical-desc-cherrypack = "горькая, металлическая субстанция" + reagent-name-cherryPack = "вишнёвый сироп" + reagent-desc-cherrypack = "Горький сироп для приготовления чая" + reagent-physical-desc-cherrypack = "горькая, металлическая субстанция" - reagent-name-watermelonPack = "арбузный сироп" - reagent-desc-watermelonpack = "Горький сироп для приготовления чая" - reagent-physical-desc-watermelonpack = "горькая, металлическая субстанция" + reagent-name-watermelonPack = "арбузный сироп" + reagent-desc-watermelonpack = "Горький сироп для приготовления чая" + reagent-physical-desc-watermelonpack = "горькая, металлическая субстанция" From 64fd781f5d58eabbcaca3b1247e28213a45e45d3 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 16:11:48 +0100 Subject: [PATCH 13/53] WWWHHYYYYYYYYY --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index c3d6ffb1556..dd249f0f55e 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,23 +1,18 @@ - reagent-name-orangeTea = "апельсиновый чай" - reagent-desc-orangetea = "Тёплый и мягкий чай с ноткой сладости" - reagent-physical-desc-orangetea = "тёплая, сладкая субстанция" - - reagent-name-cherryTea = "вишнёвый чай" - reagent-desc-cherrytea = "Тёплый и мягкий чай с ноткой сладости" - reagent-physical-desc-cherrytea = "тёплая, сладкая субстанция" - - reagent-name-watermelonTea = "арбузный чай" - reagent-desc-watermelontea = "Тёплый и мягкий чай с ноткой.. арбуза?.." - reagent-physical-desc-watermelontea = "тёплая, сладкая субстанция" - - reagent-name-orangePack = "апельсиновый сироп" - reagent-desc-orangepack = "Горький сироп для приготовления чая" - reagent-physical-desc-orangepack = "горькая, металлическая субстанция" - - reagent-name-cherryPack = "вишнёвый сироп" - reagent-desc-cherrypack = "Горький сироп для приготовления чая" - reagent-physical-desc-cherrypack = "горькая, металлическая субстанция" - - reagent-name-watermelonPack = "арбузный сироп" - reagent-desc-watermelonpack = "Горький сироп для приготовления чая" - reagent-physical-desc-watermelonpack = "горькая, металлическая субстанция" +reagent-name-orangeTea = "апельсиновый чай" +reagent-desc-orangetea = "Тёплый и мягкий чай с ноткой сладости" +reagent-physical-desc-orangetea = "тёплая, сладкая субстанция" +reagent-name-cherryTea = "вишнёвый чай" +reagent-desc-cherrytea = "Тёплый и мягкий чай с ноткой сладости" +reagent-physical-desc-cherrytea = "тёплая, сладкая субстанция" +reagent-name-watermelonTea = "арбузный чай" +reagent-desc-watermelontea = "Тёплый и мягкий чай с ноткой.. арбуза?.." +reagent-physical-desc-watermelontea = "тёплая, сладкая субстанция" +reagent-name-orangePack = "апельсиновый сироп" +reagent-desc-orangepack = "Горький сироп для приготовления чая" +reagent-physical-desc-orangepack = "горькая, металлическая субстанция" +reagent-name-cherryPack = "вишнёвый сироп" +reagent-desc-cherrypack = "Горький сироп для приготовления чая" +reagent-physical-desc-cherrypack = "горькая, металлическая субстанция" +reagent-name-watermelonPack = "арбузный сироп" +reagent-desc-watermelonpack = "Горький сироп для приготовления чая" +reagent-physical-desc-watermelonpack = "горькая, металлическая субстанция" From 54d050b23a685f111b0780a2746abc6cafa6c05e Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 16:17:46 +0100 Subject: [PATCH 14/53] wompwomp --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index dd249f0f55e..9b62fdfecf6 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,18 +1,18 @@ -reagent-name-orangeTea = "апельсиновый чай" -reagent-desc-orangetea = "Тёплый и мягкий чай с ноткой сладости" -reagent-physical-desc-orangetea = "тёплая, сладкая субстанция" -reagent-name-cherryTea = "вишнёвый чай" -reagent-desc-cherrytea = "Тёплый и мягкий чай с ноткой сладости" -reagent-physical-desc-cherrytea = "тёплая, сладкая субстанция" -reagent-name-watermelonTea = "арбузный чай" -reagent-desc-watermelontea = "Тёплый и мягкий чай с ноткой.. арбуза?.." -reagent-physical-desc-watermelontea = "тёплая, сладкая субстанция" -reagent-name-orangePack = "апельсиновый сироп" -reagent-desc-orangepack = "Горький сироп для приготовления чая" -reagent-physical-desc-orangepack = "горькая, металлическая субстанция" -reagent-name-cherryPack = "вишнёвый сироп" -reagent-desc-cherrypack = "Горький сироп для приготовления чая" -reagent-physical-desc-cherrypack = "горькая, металлическая субстанция" -reagent-name-watermelonPack = "арбузный сироп" -reagent-desc-watermelonpack = "Горький сироп для приготовления чая" -reagent-physical-desc-watermelonpack = "горькая, металлическая субстанция" + reagent-name-orangeTea = апельсиновый чай + reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости + reagent-physical-desc-orangetea = тёплая, сладкая субстанция + reagent-name-cherryTea = вишнёвый чай + reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости + reagent-physical-desc-cherrytea = тёплая, сладкая субстанция + reagent-name-watermelonTea = арбузный чай + reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. + reagent-physical-desc-watermelontea = тёплая, сладкая субстанция + reagent-name-orangePack = апельсиновый сироп + reagent-desc-orangepack = Горький сироп для приготовления чая + reagent-physical-desc-orangepack = горькая, металлическая субстанция + reagent-name-cherryPack = вишнёвый сироп + reagent-desc-cherrypack = Горький сироп для приготовления чая + reagent-physical-desc-cherrypack = горькая, металлическая субстанция + reagent-name-watermelonPack = арбузный сироп + reagent-desc-watermelonpack = Горький сироп для приготовления чая + reagent-physical-desc-watermelonpack = горькая, металлическая субстанция From de68ac1295f69c2a7c16d2661682d55edb519e5a Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 23:38:53 +0100 Subject: [PATCH 15/53] wh.. --- .../ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index 9b62fdfecf6..389c9b4eaae 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,16 +1,16 @@ - reagent-name-orangeTea = апельсиновый чай + reagent-name-orangetea = апельсиновый чай reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости reagent-physical-desc-orangetea = тёплая, сладкая субстанция - reagent-name-cherryTea = вишнёвый чай + reagent-name-cherrytea = вишнёвый чай reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости reagent-physical-desc-cherrytea = тёплая, сладкая субстанция - reagent-name-watermelonTea = арбузный чай + reagent-name-watermelontea = арбузный чай reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. reagent-physical-desc-watermelontea = тёплая, сладкая субстанция - reagent-name-orangePack = апельсиновый сироп + reagent-name-orangepack = апельсиновый сироп reagent-desc-orangepack = Горький сироп для приготовления чая reagent-physical-desc-orangepack = горькая, металлическая субстанция - reagent-name-cherryPack = вишнёвый сироп + reagent-name-cherrypack = вишнёвый сироп reagent-desc-cherrypack = Горький сироп для приготовления чая reagent-physical-desc-cherrypack = горькая, металлическая субстанция reagent-name-watermelonPack = арбузный сироп From ffeec1ff5ac3a2981f5bb19dcff95b34b8e451e3 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 23:43:53 +0100 Subject: [PATCH 16/53] mm. watermelon. --- Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index 389c9b4eaae..382687d098d 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -13,6 +13,6 @@ reagent-name-cherrypack = вишнёвый сироп reagent-desc-cherrypack = Горький сироп для приготовления чая reagent-physical-desc-cherrypack = горькая, металлическая субстанция - reagent-name-watermelonPack = арбузный сироп + reagent-name-watermelonpack = арбузный сироп reagent-desc-watermelonpack = Горький сироп для приготовления чая reagent-physical-desc-watermelonpack = горькая, металлическая субстанция From d16f2aab06df9f3c6e3b1f10e34a18c1aaf4fda4 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 3 Dec 2024 23:53:07 +0100 Subject: [PATCH 17/53] do-do-do.. --- .../ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index 382687d098d..b772bf44adb 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,18 +1,18 @@ reagent-name-orangetea = апельсиновый чай - reagent-desc-orangetea = Тёплый и мягкий чай с ноткой сладости + reagent-desc-orangetea = тёплый и мягкий чай с ноткой сладости reagent-physical-desc-orangetea = тёплая, сладкая субстанция reagent-name-cherrytea = вишнёвый чай - reagent-desc-cherrytea = Тёплый и мягкий чай с ноткой сладости + reagent-desc-cherrytea = тёплый и мягкий чай с ноткой сладости reagent-physical-desc-cherrytea = тёплая, сладкая субстанция reagent-name-watermelontea = арбузный чай - reagent-desc-watermelontea = Тёплый и мягкий чай с ноткой.. арбуза?.. + reagent-desc-watermelontea = тёплый и мягкий чай с ноткой.. арбуза?.. reagent-physical-desc-watermelontea = тёплая, сладкая субстанция reagent-name-orangepack = апельсиновый сироп - reagent-desc-orangepack = Горький сироп для приготовления чая + reagent-desc-orangepack = горький сироп для приготовления чая reagent-physical-desc-orangepack = горькая, металлическая субстанция reagent-name-cherrypack = вишнёвый сироп - reagent-desc-cherrypack = Горький сироп для приготовления чая + reagent-desc-cherrypack = горький сироп для приготовления чая reagent-physical-desc-cherrypack = горькая, металлическая субстанция reagent-name-watermelonpack = арбузный сироп - reagent-desc-watermelonpack = Горький сироп для приготовления чая + reagent-desc-watermelonpack = горький сироп для приготовления чая reagent-physical-desc-watermelonpack = горькая, металлическая субстанция From 6855ba4a2d7d78926bc5a215b6638ca0672cdb58 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Wed, 4 Dec 2024 12:45:06 +0100 Subject: [PATCH 18/53] Update drink.ftl --- .../ADT/reagents/Consumable/Drinks/drink.ftl | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl index b772bf44adb..e394e9371c5 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -1,18 +1,18 @@ - reagent-name-orangetea = апельсиновый чай - reagent-desc-orangetea = тёплый и мягкий чай с ноткой сладости - reagent-physical-desc-orangetea = тёплая, сладкая субстанция - reagent-name-cherrytea = вишнёвый чай - reagent-desc-cherrytea = тёплый и мягкий чай с ноткой сладости - reagent-physical-desc-cherrytea = тёплая, сладкая субстанция - reagent-name-watermelontea = арбузный чай - reagent-desc-watermelontea = тёплый и мягкий чай с ноткой.. арбуза?.. - reagent-physical-desc-watermelontea = тёплая, сладкая субстанция - reagent-name-orangepack = апельсиновый сироп - reagent-desc-orangepack = горький сироп для приготовления чая - reagent-physical-desc-orangepack = горькая, металлическая субстанция - reagent-name-cherrypack = вишнёвый сироп - reagent-desc-cherrypack = горький сироп для приготовления чая - reagent-physical-desc-cherrypack = горькая, металлическая субстанция - reagent-name-watermelonpack = арбузный сироп - reagent-desc-watermelonpack = горький сироп для приготовления чая - reagent-physical-desc-watermelonpack = горькая, металлическая субстанция +reagent-name-orangetea = апельсиновый чай +reagent-desc-orangetea = тёплый и мягкий чай с ноткой сладости +reagent-physical-desc-orangetea = тёплая, сладкая субстанция +reagent-name-cherrytea = вишнёвый чай +reagent-desc-cherrytea = тёплый и мягкий чай с ноткой сладости +reagent-physical-desc-cherrytea = тёплая, сладкая субстанция +reagent-name-watermelontea = арбузный чай +reagent-desc-watermelontea = тёплый и мягкий чай с ноткой.. арбуза?.. +reagent-physical-desc-watermelontea = тёплая, сладкая субстанция +reagent-name-orangepack = апельсиновый сироп +reagent-desc-orangepack = горький сироп для приготовления чая +reagent-physical-desc-orangepack = горькая, металлическая субстанция +reagent-name-cherrypack = вишнёвый сироп +reagent-desc-cherrypack = горький сироп для приготовления чая +reagent-physical-desc-cherrypack = горькая, металлическая субстанция +reagent-name-watermelonpack = арбузный сироп +reagent-desc-watermelonpack = горький сироп для приготовления чая +reagent-physical-desc-watermelonpack = горькая, металлическая субстанция From 49c6d1269f2b6ba0d360bd4e1e639592d3803797 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Wed, 4 Dec 2024 12:57:49 +0100 Subject: [PATCH 19/53] Update drinks.yml --- .../ADT/Reagents/Consumable/Drink/drinks.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml index edafbdfef16..18c2be51b71 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml @@ -184,7 +184,7 @@ - type: reagent id: ADTOrangeTeaReg - name: reagent-name-orangeTea + name: reagent-name-orangetea parent: BaseDrink desc: reagent-desc-orangetea physicalDesc: reagent-physical-desc-orangetea @@ -203,7 +203,7 @@ - type: reagent id: ADTCherryTeaReg - name: reagent-name-cherryTea + name: reagent-name-cherrytea parent: BaseDrink desc: reagent-desc-cherrytea physicalDesc: reagent-physical-desc-cherrytea @@ -222,7 +222,7 @@ - type: reagent id: ADTWatermelonTeaReg - name: reagent-name-watermelonTea + name: reagent-name-watermelontea parent: BaseDrink desc: reagent-desc-watermelontea physicalDesc: reagent-physical-desc-watermelontea @@ -241,7 +241,7 @@ - type: reagent id: ADTOrangepackReg - name: reagent-name-orangePack + name: reagent-name-orangepack parent: BaseDrink desc: reagent-desc-orangepack physicalDesc: reagent-physical-desc-orangepack @@ -255,7 +255,7 @@ - type: reagent id: ADTCherrypackReg - name: reagent-name-cherryPack + name: reagent-name-cherrypack parent: BaseDrink desc: reagent-desc-cherrypack physicalDesc: reagent-physical-desc-cherrypack @@ -269,7 +269,7 @@ - type: reagent id: ADTWatermelonpackReg - name: reagent-name-watermelonPack + name: reagent-name-watermelonpack parent: BaseDrink desc: reagent-desc-watermelonpack physicalDesc: reagent-physical-desc-watermelonpack @@ -300,4 +300,4 @@ state: icon_empty metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- - metamorphicChangeColor: false \ No newline at end of file + metamorphicChangeColor: false From ba11689e9f54f5f6960088a71eb1921af6fb4450 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Wed, 4 Dec 2024 13:35:15 +0100 Subject: [PATCH 20/53] fix --- Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml index 18c2be51b71..408a9cd9c45 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml @@ -190,7 +190,7 @@ physicalDesc: reagent-physical-desc-orangetea flavor: sweet color: "#FF8C00" - metabolisms: + metabolisms: Drink: effects: - !type:SatiateThirst From f749f0caa022fcff558251400bf761738380a151 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Wed, 4 Dec 2024 13:50:25 +0100 Subject: [PATCH 21/53] TheWonderOfYou.. --- .../ADT/Entities/Objects/Weapons/Melee/swords.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index f09a959c7f3..d5f78576d5d 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml @@ -95,6 +95,7 @@ sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi state: icon - type: Item + size: Small sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi inhandVisuals: left: @@ -107,7 +108,6 @@ damage: types: Slash: 6.3 - size: Small - type: entity name: dagger reinforced @@ -122,6 +122,7 @@ sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi state: icon - type: Item + size: Small sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi inhandVisuals: left: @@ -134,7 +135,6 @@ damage: types: Slash: 6 - size: Small - type: entity name: dagger glass @@ -149,6 +149,7 @@ sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi state: icon - type: Item + size: Small sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi inhandVisuals: left: @@ -161,7 +162,6 @@ damage: types: Slash: 5 - size: Small - type: entity name: dagger uranium @@ -176,6 +176,7 @@ sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi state: icon - type: Item + size: Small sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi inhandVisuals: left: @@ -188,6 +189,5 @@ damage: types: Slash: 9 - size: Small From 18bb9ccc868dcd2cee323f4c5dcea12041c193c8 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Wed, 4 Dec 2024 14:03:05 +0100 Subject: [PATCH 22/53] Ineverythingofyouitsthe --- Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml index f854fa41f8c..dd86fcf536b 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml @@ -52,7 +52,7 @@ - type: construction name: Reinforced Plasma Spear - id: ADTPlasmaSpear + id: SpearReinforcedPlasma graph: ADTPSpear startNode: start targetNode: ADTCompPlasmaSpear @@ -61,4 +61,4 @@ description: Woah. Spear from reinforced plasma icon: sprite: ADT/Objects/Weapons/Melee/Rplasma_spear.rsi - state: spear \ No newline at end of file + state: spear From 4578938df05e8415227d8382102ff789a4d396c5 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Wed, 4 Dec 2024 14:03:19 +0100 Subject: [PATCH 23/53] wonder..wonderofyou. --- .../Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml index 729ae60bdb5..aec8bdb7da7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml @@ -16,7 +16,7 @@ types: Piercing: 18 - type: Construction - graph: ADTPlasmaSpear + graph: SpearReinforcedPlasma - type: entity name: reinforced uranium spear @@ -38,4 +38,4 @@ Piercing: 21 Radiation: 9 - type: Construction - graph: ADTUraniumSpear \ No newline at end of file + graph: ADTUraniumSpear From df7a459e513779176da481e1962b4bf63cefb96d Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 16:28:28 +0100 Subject: [PATCH 24/53] fi --- .../ADT/Recipes/Crafting/Graphs/Improvised/spear.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml index 9d59ab0069a..ddc22beb8b0 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml @@ -1,5 +1,5 @@ - type: constructionGraph - id: ADTPSpear + id: SpearReinforcedPlasma start: start graph: - node: start @@ -43,4 +43,4 @@ state: shard1 doAfter: 1 - node: ADTCompUraniumSpear - entity: SpearReinforcedUran \ No newline at end of file + entity: SpearReinforcedUran From d090a18c46c76445d4f79d251d0efd55d18d4340 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 16:40:44 +0100 Subject: [PATCH 25/53] Update spear.yml --- .../Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml index aec8bdb7da7..e33d1c6e972 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml @@ -16,7 +16,7 @@ types: Piercing: 18 - type: Construction - graph: SpearReinforcedPlasma + graph: ADTPSpear - type: entity name: reinforced uranium spear From 4dc6eca314f50bdefbf9ee6605ed28e0f84a00b6 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 16:48:19 +0100 Subject: [PATCH 26/53] Update spear.yml --- .../Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml index ddc22beb8b0..9df5666cdb7 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml @@ -1,5 +1,5 @@ - type: constructionGraph - id: SpearReinforcedPlasma + id: ADTPSpear start: start graph: - node: start From 68be17e16748ddd03959669fabe97f9f847e9571 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 16:59:07 +0100 Subject: [PATCH 27/53] Update spear.yml --- .../ADT/Recipes/Crafting/Graphs/Improvised/spear.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml index 9df5666cdb7..68fa4861e7c 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml @@ -22,14 +22,13 @@ entity: SpearReinforcedPlasma - type: constructionGraph - id: ADTUSpear + id: ADTUraniumSpear start: start graph: - node: start edges: - to: ADTCompUraniumSpear steps: - - material: MetalRod amount: 2 doAfter: 2 From 4c4e048e9bd7e43b90eba3b931a7d494a6b6c97c Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 17:06:09 +0100 Subject: [PATCH 28/53] u-p --- Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml index dd86fcf536b..665f99871ee 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml @@ -40,7 +40,7 @@ - type: construction name: Reinforced Uranium Spear id: ADTUraniumSpear - graph: ADTUSpear + graph: ADTPSpear startNode: start targetNode: ADTCompUraniumSpear category: construction-category-weapons From f3f2ce1596cd3c4a67b5a695567804cc3adebbfb Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 17:12:25 +0100 Subject: [PATCH 29/53] Update lathe.yml --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 02dfe949803..caec532f46e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -521,6 +521,7 @@ - CutterMachineCircuitboard - StationAnchorCircuitboard - ADTCustomLawCircuitBoard # ADT tweak + - CutterMachine #ADT-Tweak - SalvageMagnetMachineCircuitboard dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard @@ -592,7 +593,6 @@ - JukeboxCircuitBoard - SalvageExpeditionsComputerCircuitboard # Corvax-Cringe - ADTIndustrialSMESMachineCircuitboard #ADT - - CutterMachine #ADT-Tweak - type: EmagLatheRecipes emagDynamicRecipes: - ShuttleGunDusterCircuitboard From 53e5636ba8dd25dd2050ccd7cb981136f40130b3 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 17:23:30 +0100 Subject: [PATCH 30/53] what. --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index caec532f46e..b63a3a44fbe 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -521,7 +521,6 @@ - CutterMachineCircuitboard - StationAnchorCircuitboard - ADTCustomLawCircuitBoard # ADT tweak - - CutterMachine #ADT-Tweak - SalvageMagnetMachineCircuitboard dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard From 2bc85da6896ec45d5025f31634a87bf6add69863 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 17:55:00 +0100 Subject: [PATCH 31/53] Update improvised.yml --- Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml index 665f99871ee..8221f94dfda 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml @@ -40,7 +40,7 @@ - type: construction name: Reinforced Uranium Spear id: ADTUraniumSpear - graph: ADTPSpear + graph: ADTUraniumSpear startNode: start targetNode: ADTCompUraniumSpear category: construction-category-weapons From ff25f5d4529ab467440850a91f75e86e85c24779 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Fri, 6 Dec 2024 18:41:09 +0100 Subject: [PATCH 32/53] whatimdoingwithmylife.. --- .../Crafting/Graphs/Improvised/shield.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml index 8e8416381a0..20e5715883a 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml @@ -2,16 +2,16 @@ 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 \ No newline at end of file + - node: start + edges: + - to: ADTCompShield + steps: + - material: Steel + amount: 20 + - material: ReinforcedGlass + amount: 10 + - material: Cable + amount: 2 + doAfter: 5 + - node: ADTCompShield + entity: ADTFullRiotShield From 20a38dfe6f4381dd692bf661fe9719db8ed368e5 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Mon, 9 Dec 2024 18:09:03 +0100 Subject: [PATCH 33/53] Update fullshield.yml --- .../Prototypes/ADT/Entities/Objects/Shields/fullshield.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml index f7b765b5baa..c25945c8734 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: ADTFullShield + node: start - type: Destructible thresholds: - trigger: @@ -64,4 +64,4 @@ collection: WoodDestroy - type: Tag tags: - - ADTFullRiotShitmadeShield \ No newline at end of file + - ADTFullRiotShitmadeShield From 4ce6d4dc88bbb25e863ba830a126379a92407cb8 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Mon, 9 Dec 2024 18:36:42 +0100 Subject: [PATCH 34/53] Update shives.yml --- .../Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml index 5a5d127446b..b907baf3069 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: ADTPlasmaShiv + node: start - type: entity name: reinforced uranium shiv @@ -35,4 +35,4 @@ sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi - type: Construction graph: ADTUShiv - node: ADTUraniumShiv + node: start From 13f6a95e6c74e4e2064973b8d8ee7a8f376e48f4 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Mon, 9 Dec 2024 19:32:09 +0100 Subject: [PATCH 35/53] Update spear.yml --- .../Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml index e33d1c6e972..86cf8957c9a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml @@ -17,6 +17,7 @@ Piercing: 18 - type: Construction graph: ADTPSpear + node: start - type: entity name: reinforced uranium spear @@ -39,3 +40,4 @@ Radiation: 9 - type: Construction graph: ADTUraniumSpear + node: start From d07a486dac3c373ab57ebaa9fd6ed5a686cc5068 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:37:05 +0100 Subject: [PATCH 36/53] Update drinks.yml --- .../Objects/Consumable/Drinks/drinks.yml | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml index 6332f243275..86467506360 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml @@ -13,6 +13,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/summershade.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkWinterSunGlass @@ -28,6 +30,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/wintersun.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkHungoverAngelGlass @@ -43,6 +47,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/hungoverangel.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkCitrusBalanceGlass @@ -58,6 +64,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/citrucbalance.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkDobryiDrinkGlass @@ -73,6 +81,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/dobryi.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkMilkEclipseGlass @@ -88,6 +98,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/milkeclipse.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkArcticExplosionGlass @@ -103,6 +115,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/arcticexplosion.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkAppleLiqueurGlass @@ -118,6 +132,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/apple_liqueur_glass.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkSugarKnightGlass @@ -133,6 +149,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/sugarknight.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkGrapeLadyGlass @@ -148,6 +166,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/grapelady.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkSaturdayBaronGlass @@ -163,6 +183,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/saturdaybaron.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkArcticLatteGlass @@ -178,6 +200,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/arcticlatte.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkSpecialTeaOolongGlass @@ -193,6 +217,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/teaoolong.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkAzureBlueGlass @@ -208,6 +234,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/azureblue.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkPenetrationGlass @@ -223,6 +251,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/penetration.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkEclipsedEclispeGlass @@ -238,6 +268,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/eclipsedeclipse.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkSpaceBushGlass @@ -253,6 +285,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/spacebush.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkBusinessConversationGlass @@ -268,6 +302,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/buisinessconservation.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkAppleMartiniGlass @@ -283,6 +319,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/applemartini.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkBacardiAppleGlass @@ -298,6 +336,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/bacardiapple.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkElderGuardsGlass @@ -313,6 +353,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/elderguards.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkLimeShadeGlass @@ -328,6 +370,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/limeshade.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkGoldenAleGlass @@ -343,6 +387,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/goldenale.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkSausageBeerGlass @@ -358,6 +404,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/sausagebeer.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkTechnoBeerGlass @@ -373,6 +421,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/technarbeer.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkClassicPaulanerBeerGlass @@ -388,6 +438,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/classicalpaulaner.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkLivseyBeerGlass @@ -403,6 +455,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/doctorlivsey.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkLuckyJonnyBeerGlass @@ -418,6 +472,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/luckyjonny.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkSecUnfilteredBeerGlass @@ -433,6 +489,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/secbeer.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkGlyphidStoutBeerGlass @@ -448,6 +506,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/glyfidstout.rsi state: icon + + - type: entity parent: DrinkGlassBase id: ADTDrinkCocoaGlass @@ -464,6 +524,8 @@ Quantity: 30 - type: Sprite sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi + + - type: entity parent: DrinkGlass id: ADTDrinkOrangeTeaGlass @@ -478,6 +540,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkCherryTeaGlass @@ -492,6 +556,8 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi state: icon + + - type: entity parent: DrinkGlass id: ADTDrinkWatermelonTeaGlass From 2ae1fcce5ca2cc5536e3851b41d5b49d05aa66f2 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:42:59 +0100 Subject: [PATCH 37/53] DontDoLocalesIfYouSleepy.Never. --- .../prototypes/Entities/Objects/Weapons/Melee/melee.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ab744f500d6..ab0ce203d7e 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 @@ -31,13 +31,13 @@ ent-ADTJasonMachette = мачете Джейсона .desc = Мачете одного из самых ужасающих маньяков. Сбоку маленькая надпись "полиуретан". ent-SpearReinforcedUran = копьё из закалённого урана - .desc = Копьё созданное из осколка закалённого урана, для более удобной нарезки ваших оппонентов. + .desc = Копьё, созданное из осколка закалённого урана, для более удобного убийства ваших оппонентов. ent-ADTReinforcedUraniumShiv = заточка из закалённого урана - .desc = Заточка созданная из осколка закалённого урана, имеющий тканневую основу, для более удобной нарезки ваших оппонентов. + .desc = Заточка, созданная из осколка закалённого урана, имеющий тканевую основу, для более удобной нарезки ваших оппонентов. ent-SpearReinforcedPlasma = копьё из закалённой плазмы - .desc = Копьё созданное из осколка закалённой плазмы, для более удобной нарезки ваших оппонентов. + .desc = Копьё, созданное из осколка закалённой плазмы, для более удобного убийства ваших оппонентов. ent-ADTReinforcedPlasmaShiv = заточка из закалённой плазмы - .desc = Заточка созданная из осколка закалённой плазмы, имеющий тканневую основу, для более удобной нарезки ваших оппонентов. + .desc = Заточка, созданная из осколка закалённой плазмы, имеющий тканевую основу, для более удобной нарезки ваших оппонентов. From bd08ee7d15e226ed3b38f20b4a92f7e7b65ce2c0 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:45:54 +0100 Subject: [PATCH 38/53] Update shields.ftl --- .../ADT/prototypes/Entities/Objects/Shields/shields.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl index 282e79eea07..28a822d243e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl @@ -2,7 +2,7 @@ ent-ADTEctoShield = эктоплазменный щит .desc = Не позволяет фантому взаимодействовать с носителем, так ещё и выглядит модно. ent-ADTFullRiotShield = самодельный двуручный щит - .desc = Обладает довольно массивной защитой для носителя, выглядит громостко, но выполняет свою работу + .desc = Обладает довольно массивной защитой для носителя, выглядит громоздко, но выполняет свою работу -ent-ADTFullRiotShieldSyndicate = штурмовый двуручный щит синдиката - .desc = Громосткий щит созданный синдикатом из самых тяжёлых и крепких материалов, создан для длительных штурмов, и имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. +ent-ADTFullRiotShieldSyndicate = штурмовой двуручный щит синдиката + .desc = Громоздкий щит созданный синдикатом из самых тяжёлых и крепких материалов, создан для длительных штурмов, и имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. From 59f5248ea0395944a54b54d88bb63f0fd7a9d698 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:46:49 +0100 Subject: [PATCH 39/53] Update shields.ftl --- .../ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl index 28a822d243e..7e21247ddec 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl @@ -2,7 +2,7 @@ ent-ADTEctoShield = эктоплазменный щит .desc = Не позволяет фантому взаимодействовать с носителем, так ещё и выглядит модно. ent-ADTFullRiotShield = самодельный двуручный щит - .desc = Обладает довольно массивной защитой для носителя, выглядит громоздко, но выполняет свою работу + .desc = Выглядит громоздко, но выполняет свою работу ent-ADTFullRiotShieldSyndicate = штурмовой двуручный щит синдиката - .desc = Громоздкий щит созданный синдикатом из самых тяжёлых и крепких материалов, создан для длительных штурмов, и имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. + .desc = Громоздкий щит созданный синдикатом из самых крепких материалов, создан для длительных штурмов. Имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. From ab67e631bac13fde24618e88fdbad7be8c71ad38 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:54:55 +0100 Subject: [PATCH 40/53] Update uplink-catalog.ftl --- .../ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index e8554acca45..d247a70ad98 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -94,7 +94,7 @@ uplink-syndicate-helmet-name = шлем спецназа uplink-syndicate-helmet-desc = Очень прочный шлем, широко используемый военизированными организациями. Его украшает ужасный узор из красных и чёрных полос. Да прибудет с вами робаст uplink-nukiesShield-name = двуручный штурмовый щит -uplink-nukiesShield-desc = Массивный и опасный, двуручный щит из элитных материалов для лучшей защиты щитоносца, имеет несколько рядов пластин защищающих от каждого типа урона, а также несколько острейших шипов на основе щита. Да прибудут с вами силы синдиката. +uplink-nukiesShield-desc = Массивный и опасный, двуручный щит из элитных материалов для лучшей защиты, имеет несколько рядов пластин, а также несколько острейших шипов на основе щита. uplink-omnizinpizza-name = коробка с пиццей синдиката -uplink-omnizinpizza-desc = Это самая обычная коробка, с самой обычной пиццей внутри, это именно то, что используют элитные агенты для перекуса между стрельбой с капитаном, и кражей Иана. +uplink-omnizinpizza-desc = Это коробка, с самой обычной пиццей внутри, это именно то, что используют элитные агенты для перекуса между стрельбой с капитаном, и кражей Иана. From 453b346320f365bf8f5df36a0633d1f0a761c318 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:55:50 +0100 Subject: [PATCH 41/53] Update uplink-catalog.ftl --- .../ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index d247a70ad98..4336a487a07 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -94,7 +94,7 @@ uplink-syndicate-helmet-name = шлем спецназа uplink-syndicate-helmet-desc = Очень прочный шлем, широко используемый военизированными организациями. Его украшает ужасный узор из красных и чёрных полос. Да прибудет с вами робаст uplink-nukiesShield-name = двуручный штурмовый щит -uplink-nukiesShield-desc = Массивный и опасный, двуручный щит из элитных материалов для лучшей защиты, имеет несколько рядов пластин, а также несколько острейших шипов на основе щита. +uplink-nukiesShield-desc = Массивный и опасный, двуручный щит из элитных материалов для лучшей защиты, имеет несколько рядов пластин, а также несколько шипов на основе щита. uplink-omnizinpizza-name = коробка с пиццей синдиката uplink-omnizinpizza-desc = Это коробка, с самой обычной пиццей внутри, это именно то, что используют элитные агенты для перекуса между стрельбой с капитаном, и кражей Иана. From bc0bd742229405b428b650b0186529d8ca9249e8 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:56:43 +0100 Subject: [PATCH 42/53] Update uplink-catalog.ftl --- .../ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index 4336a487a07..9b66cde0162 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -93,7 +93,7 @@ uplink-blackmail-bundle-desc = Набор для относительно эфф uplink-syndicate-helmet-name = шлем спецназа uplink-syndicate-helmet-desc = Очень прочный шлем, широко используемый военизированными организациями. Его украшает ужасный узор из красных и чёрных полос. Да прибудет с вами робаст -uplink-nukiesShield-name = двуручный штурмовый щит +uplink-nukiesShield-name = двуручный штурмовой щит uplink-nukiesShield-desc = Массивный и опасный, двуручный щит из элитных материалов для лучшей защиты, имеет несколько рядов пластин, а также несколько шипов на основе щита. uplink-omnizinpizza-name = коробка с пиццей синдиката From 582b63667cd5ce18ba2a42fdfcdd6d854289a5d3 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:57:37 +0100 Subject: [PATCH 43/53] Update containers.ftl --- .../prototypes/Entities/Objects/Consumable/Food/containers.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl index 45d74cb606c..16102e4cbec 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl @@ -5,4 +5,4 @@ ent-ADTFoodTinCondensedMilk = сгущеное молоко .desc = Стандартная банка сгущенки с удобным язычком. ent-ADTFoodBoxSyndiPizza = пицца синдиката - .desc = Довольно большая коробка с пиццей синдиката внутри, возможно, тот кто ест эту пиццу настоящий безсердечный ублюдок, но её вкус замечателен. + .desc = Довольно большая коробка с пиццей синдиката внутри, возможно, тот кто ест эту пиццу настоящий бессердечный ублюдок, но её вкус замечателен. From 07f906a77d145f230cef2a77d22ca5b78f62bc4e Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 13:58:28 +0100 Subject: [PATCH 44/53] Update shields.ftl --- .../ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl index 7e21247ddec..e7c2bc81f26 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl @@ -2,7 +2,7 @@ ent-ADTEctoShield = эктоплазменный щит .desc = Не позволяет фантому взаимодействовать с носителем, так ещё и выглядит модно. ent-ADTFullRiotShield = самодельный двуручный щит - .desc = Выглядит громоздко, но выполняет свою работу + .desc = Выглядит громоздко, но выполняет свою работу. ent-ADTFullRiotShieldSyndicate = штурмовой двуручный щит синдиката .desc = Громоздкий щит созданный синдикатом из самых крепких материалов, создан для длительных штурмов. Имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. From d3a8821464d87272509cb940a370fad6727b1e77 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 14:00:47 +0100 Subject: [PATCH 45/53] Update batmenkettle.ftl --- .../prototypes/Entities/Structures/Machines/batmenkettle.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl index 8569afbee41..e9d2ac50186 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl @@ -1,2 +1,2 @@ ent-ADTBarmenKettle = чайник бармена - .desc = Этот ультрасовременный технологический шедевр — чайник (Обычная грелка собранная из металлолома), который не просто кипятит воду, а выводит ежедневный комфорт на новый уровень! (Он потребляет много электричества, и довольно взрывоопасен.) И всё это — абсолютно бесплатно. Великолепие, доступное каждому! (Большое количество ресурсов уходит на создание обычного чайника.) \ No newline at end of file + .desc = Это обычный нагревательный прибор, в нём нет ничего примечательного. From 639ba49c5ad26e94f9d122a5a95af7f4119f7353 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 14:02:30 +0100 Subject: [PATCH 46/53] Update teapacks.ftl --- .../Entities/Objects/Consumable/Food/teapacks.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl index ae553032c1a..56ee54f661e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl @@ -1,11 +1,11 @@ -ent-ADTOrangeTeapack = пакетик сиропа апельсинового чая +ent-ADTOrangeTeapack = пакетик сиропа для апельсинового чая .desc = Это пакетик, заполненный сиропом для апельсинового чая, его, в основном используют для приготовления чая. -ent-ADTCherryTeapack = пакетик сиропа вишнёвого чая +ent-ADTCherryTeapack = пакетик сиропа для вишнёвого чая .desc = Это пакетик, заполненный сиропом для вишнёвого чая, его, в основном используют для приготовления чая. -ent-ADTWatermelonTeapack = пакетик сиропа арбузного чая +ent-ADTWatermelonTeapack = пакетик сиропа для арбузного чая .desc = Это пакетик, заполненный сиропом для арбузного чая?.. Его, в основном используют для приготовления чая. ent-ADTEmptyTeaPack = пустой пакетик для сиропа чая - .desc = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни, и апельсина в микроволновке, довольно креативно, должно быть.. \ No newline at end of file + .desc = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни, и апельсина в микроволновке, довольно креативно, должно быть.. From 2daf406d84535c50479cc3b2eeef686b059886d0 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Tue, 10 Dec 2024 14:04:14 +0100 Subject: [PATCH 47/53] Update teapacks.ftl --- .../Entities/Objects/Consumable/Food/teapacks.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl index 56ee54f661e..bda2256c123 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl @@ -1,11 +1,11 @@ ent-ADTOrangeTeapack = пакетик сиропа для апельсинового чая - .desc = Это пакетик, заполненный сиропом для апельсинового чая, его, в основном используют для приготовления чая. + .desc = Это пакетик, заполненный сиропом для апельсинового чая, в основном его используют для приготовления чая. ent-ADTCherryTeapack = пакетик сиропа для вишнёвого чая - .desc = Это пакетик, заполненный сиропом для вишнёвого чая, его, в основном используют для приготовления чая. + .desc = Это пакетик, заполненный сиропом для вишнёвого чая, в основном его используют для приготовления чая. ent-ADTWatermelonTeapack = пакетик сиропа для арбузного чая - .desc = Это пакетик, заполненный сиропом для арбузного чая?.. Его, в основном используют для приготовления чая. + .desc = Это пакетик, заполненный сиропом для арбузного чая?.. В основном его используют для приготовления чая. ent-ADTEmptyTeaPack = пустой пакетик для сиропа чая - .desc = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни, и апельсина в микроволновке, довольно креативно, должно быть.. + .desc = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни, и апельсина в микроволновке, довольно креативно, должно быть... From 02acbf70987394aa352f942ad302abd714bed716 Mon Sep 17 00:00:00 2001 From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com> Date: Fri, 13 Dec 2024 02:03:13 +0400 Subject: [PATCH 48/53] Update containers.ftl --- .../Entities/Objects/Consumable/Food/containers.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl index 16102e4cbec..1b07fd22ea5 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl @@ -4,5 +4,5 @@ ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто) ent-ADTFoodTinCondensedMilk = сгущеное молоко .desc = Стандартная банка сгущенки с удобным язычком. -ent-ADTFoodBoxSyndiPizza = пицца синдиката - .desc = Довольно большая коробка с пиццей синдиката внутри, возможно, тот кто ест эту пиццу настоящий бессердечный ублюдок, но её вкус замечателен. +ent-ADTFoodBoxSyndiPizza = пицца Синдиката + .desc = Довольно большая коробка с пиццей Синдиката внутри. Возможно тот, кто ест эту пиццу - настоящий бессердечный ублюдок, но её вкус замечателен. From c21d43eac5c8b3338760da18af23a51d36bc2ec8 Mon Sep 17 00:00:00 2001 From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com> Date: Fri, 13 Dec 2024 02:04:25 +0400 Subject: [PATCH 49/53] Update teapacks.ftl --- .../Entities/Objects/Consumable/Food/teapacks.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl index bda2256c123..e03d0da1adb 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl @@ -1,11 +1,11 @@ ent-ADTOrangeTeapack = пакетик сиропа для апельсинового чая - .desc = Это пакетик, заполненный сиропом для апельсинового чая, в основном его используют для приготовления чая. + .desc = Это пакетик, заполненный сиропом для апельсинового чая. ent-ADTCherryTeapack = пакетик сиропа для вишнёвого чая - .desc = Это пакетик, заполненный сиропом для вишнёвого чая, в основном его используют для приготовления чая. + .desc = Это пакетик, заполненный сиропом для вишнёвого чая. ent-ADTWatermelonTeapack = пакетик сиропа для арбузного чая - .desc = Это пакетик, заполненный сиропом для арбузного чая?.. В основном его используют для приготовления чая. + .desc = Это пакетик, заполненный сиропом для арбузного чая? Да, есть и такой. ent-ADTEmptyTeaPack = пустой пакетик для сиропа чая - .desc = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни, и апельсина в микроволновке, довольно креативно, должно быть... + .desc = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни и апельсина в микроволновке. From 3c97fc9a07aaf18fa6eeb29f34c778e82bb0c681 Mon Sep 17 00:00:00 2001 From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com> Date: Fri, 13 Dec 2024 02:04:51 +0400 Subject: [PATCH 50/53] Update teapacks.ftl --- .../prototypes/Entities/Objects/Consumable/Food/teapacks.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl index e03d0da1adb..75797be4aaf 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/teapacks.ftl @@ -7,5 +7,5 @@ ent-ADTCherryTeapack = пакетик сиропа для вишнёвого ч ent-ADTWatermelonTeapack = пакетик сиропа для арбузного чая .desc = Это пакетик, заполненный сиропом для арбузного чая? Да, есть и такой. -ent-ADTEmptyTeaPack = пустой пакетик для сиропа чая +ent-ADTEmptyTeaPack = пустой пакетик от чайного сиропа .desc = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни и апельсина в микроволновке. From 2dde34cb93627666736af67a54041aafde9ea255 Mon Sep 17 00:00:00 2001 From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com> Date: Fri, 13 Dec 2024 02:05:47 +0400 Subject: [PATCH 51/53] Update shields.ftl --- .../ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl index e7c2bc81f26..b7da0909747 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Shields/shields.ftl @@ -4,5 +4,5 @@ ent-ADTEctoShield = эктоплазменный щит ent-ADTFullRiotShield = самодельный двуручный щит .desc = Выглядит громоздко, но выполняет свою работу. -ent-ADTFullRiotShieldSyndicate = штурмовой двуручный щит синдиката - .desc = Громоздкий щит созданный синдикатом из самых крепких материалов, создан для длительных штурмов. Имеет несколько шипов на своей основной стороне, позволяющий резать корпоративных крыс Nanotrasen. +ent-ADTFullRiotShieldSyndicate = штурмовой двуручный щит Синдиката + .desc = Громоздкий щит, созданный Синдикатом из самых крепких материалов, создан для длительных штурмов. Имеет несколько шипов на своей внешней стороне, позволяющие резать корпоративных крыс Nanotrasen. From 0b042787833cfa95e3b4f635fe7336862316b8e1 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Thu, 12 Dec 2024 23:20:19 +0100 Subject: [PATCH 52/53] Fix --- .../Prototypes/ADT/Recipes/Reactions/drinks.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml index 7c19757cb9d..b80c353b180 100644 --- a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml @@ -315,9 +315,9 @@ minTemp: 370 reactants: ADTOrangepackReg: - amount: 1 + amount: 5 Water: - amount: 29 + amount: 25 products: ADTOrangeTeaReg: 30 @@ -326,9 +326,9 @@ minTemp: 370 reactants: ADTCherrypackReg: - amount: 1 + amount: 5 Water: - amount: 29 + amount: 25 products: ADTCherryTeaReg: 30 @@ -337,8 +337,8 @@ minTemp: 370 reactants: ADTWatermelonpackReg: - amount: 1 + amount: 5 Water: - amount: 29 + amount: 25 products: - ADTWatermelonTeaReg: 30 \ No newline at end of file + ADTWatermelonTeaReg: 30 From 89c6ef7b37c124f9f02b28cf6794267f0de482c2 Mon Sep 17 00:00:00 2001 From: sh4zik Date: Thu, 12 Dec 2024 23:22:47 +0100 Subject: [PATCH 53/53] Fix2 --- .../Entities/Objects/Consumable/Food/teapacks.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/teapacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/teapacks.yml index 5e837309985..4be043102a6 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/teapacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/teapacks.yml @@ -17,10 +17,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 1 + maxVol: 5 reagents: - ReagentId: ADTOrangepackReg - Quantity: 1 + Quantity: 5 - type: Item size: Tiny @@ -43,10 +43,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 1 + maxVol: 5 reagents: - ReagentId: ADTCherrypackReg - Quantity: 1 + Quantity: 5 - type: Item size: Tiny @@ -69,10 +69,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 1 + maxVol: 5 reagents: - ReagentId: ADTWatermelonpackReg - Quantity: 1 + Quantity: 5 - type: Item size: Tiny