diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl index d235bb6cbe..ab04ffdea8 100644 --- a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -41,4 +41,6 @@ flavor-base-adtvanilla = ванильно flavor-base-mandarin = сочная мандаринка flavor-complex-ADTChocolateDrinkFlavor = как теплый растопленный шоколад -flavor-complex-ADTCocoaDrink = как тепло, уют и какао +flavor-complex-ADTCocoaDrink = как тепло, уют и какао + +flavor-base-adtsindipizza = зловеще сырно 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 beb65be488..5fcc3d4ebe 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 @@ -91,4 +91,10 @@ uplink-blackmail-bundle-name = набор шантажиста uplink-blackmail-bundle-desc = Набор для относительно эффективных (в зависимости от вашей цели) угроз. А именно: три с-4, два продвинутых передатчика сигналов, голосовую маску и карту агента. uplink-syndicate-helmet-name = шлем спецназа -uplink-syndicate-helmet-desc = Очень прочный шлем, широко используемый военизированными организациями. Его украшает ужасный узор из красных и чёрных полос. Да пребудет с вами робаст. +uplink-syndicate-helmet-desc = Очень прочный шлем, широко используемый военизированными организациями. Его украшает ужасный узор из красных и чёрных полос. Да прибудет с вами робаст + +uplink-nukiesShield-name = двуручный штурмовой щит +uplink-nukiesShield-desc = Массивный и опасный, двуручный щит из элитных материалов для лучшей защиты, имеет несколько рядов пластин, а также несколько шипов на основе щита. + +uplink-omnizinpizza-name = коробка с пиццей синдиката +uplink-omnizinpizza-desc = Это коробка, с самой обычной пиццей внутри, это именно то, что используют элитные агенты для перекуса между стрельбой с капитаном, и кражей Иана. \ No newline at end of file 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 268a903824..4deba54ae2 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 0000000000..d88b1a45c5 --- /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 41e11979fa..1bf8cb510d 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 @@ -121,3 +121,15 @@ ent-ADTDrinkGlyphidStoutBeerGlass = { ent-DrinkGlass } ent-ADTDrinkCocoaGlass = стакан какао .desc = Бодрящий и вкусный способ начать рабочий день .suffix = Новый Год + +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 } 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 0000000000..de07cc5d0f --- /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 e060ddfb87..1b07fd22ea 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 0000000000..75797be4aa --- /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 = Это пустой пакетик, который используется для создания сиропа из арбуза, вишни и апельсина в микроволновке. 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 0000000000..cd2f334b39 --- /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 70fd365b78..b7da090974 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. 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 c34729023e..ab0ce203d7 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 0000000000..e9d2ac5018 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/batmenkettle.ftl @@ -0,0 +1,2 @@ +ent-ADTBarmenKettle = чайник бармена + .desc = Это обычный нагревательный прибор, в нём нет ничего примечательного. 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 0000000000..e394e9371c --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Drinks/drink.ftl @@ -0,0 +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 = горькая, металлическая субстанция diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index 0a66378bf0..319ee8a6ca 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -437,6 +437,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 @@ -447,6 +463,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 4e093cf3f8..64001cfedb 100644 --- a/Resources/Prototypes/ADT/Datasets/tags.yml +++ b/Resources/Prototypes/ADT/Datasets/tags.yml @@ -122,3 +122,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 fe567b4310..5b91432c2b 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 0e0d19bdc8..8646750636 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1,504 +1,574 @@ -#Безалкогольные коктейли от Кекса/Стычинского - - 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 + - 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: 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 0000000000..eccd056ccd --- /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 0000000000..8645c950b1 --- /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 0000000000..4be043102a --- /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: 5 + reagents: + - ReagentId: ADTOrangepackReg + Quantity: 5 + - 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: 5 + reagents: + - ReagentId: ADTCherrypackReg + Quantity: 5 + - 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: 5 + reagents: + - ReagentId: ADTWatermelonpackReg + Quantity: 5 + - 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 748512c1dc..b2ece5381b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -44,3 +44,15 @@ Capacitor: 2 Manipulator: 2 MatterBin: 2 + +- 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 0000000000..95ba1c1b79 --- /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 0000000000..74e25bfc4d --- /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 0000000000..c25945c873 --- /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: start + - 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 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 0000000000..fb22c07834 --- /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 0000000000..b907baf306 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml @@ -0,0 +1,38 @@ +- 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: 13 + - 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: start + +- 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 + 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: start 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 0000000000..86cf8957c9 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml @@ -0,0 +1,43 @@ +- 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: ADTPSpear + node: start + +- 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 + node: start diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index 172ed7b79d..d5f78576d5 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 + size: Small + 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 + +- 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 + size: Small + 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 + +- 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 + size: Small + 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 + +- 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 + size: Small + 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 + + 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 0000000000..902fcc1966 --- /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 54e07fccca..17d761864e 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 26a0c90ba4..408a9cd9c4 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml @@ -182,6 +182,105 @@ 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 + - type: reagent id: ADTCocoaDrink name: cocoa-drink-name diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml index d7ee1aa935..2a716e74f8 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml @@ -89,3 +89,32 @@ time: 5 solids: ADTFoodMeatChickenWing: 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 0000000000..20e5715883 --- /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 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 0000000000..47f1153f3f --- /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 0000000000..68fa4861e7 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml @@ -0,0 +1,45 @@ +- 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: ADTUraniumSpear + 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 diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml new file mode 100644 index 0000000000..8221f94dfd --- /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: ADTUraniumSpear + 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: SpearReinforcedPlasma + 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 diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml index 3067b6ad6c..b80c353b18 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: 5 + Water: + amount: 25 + products: + ADTOrangeTeaReg: 30 + +- type: reaction + id: ADTCherryteaReaction + minTemp: 370 + reactants: + ADTCherrypackReg: + amount: 5 + Water: + amount: 25 + products: + ADTCherryTeaReg: 30 +- type: reaction + id: ADTWatermelonteaReaction + minTemp: 370 + reactants: + ADTWatermelonpackReg: + amount: 5 + Water: + amount: 25 + products: + ADTWatermelonTeaReg: 30 diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 0d2fc1bbf6..448071b494 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -334,7 +334,7 @@ - type: Tag id: ADTBeerCan - + # New Year - type: Tag @@ -412,3 +412,17 @@ - type: Tag id: ADTWeaponMeleePrasatChainsword + +#sponsor_items - End + +- type: Tag + id: ADTTeaPack + +- type: Tag + id: ADTFullRiotShitmadeShield + +- type: Tag + id: ADTRPlasmaShard + +- type: Tag + id: ADTRUranShard diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index c411b92f7b..f0cbb6ef9b 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 d659c0b799..e450940906 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -53,5 +53,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 0f8c73dac3..8f58e9871a 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 f6c61acabd..ff2727d89a 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/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 0000000000..8419dbaeae Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/icon.png new file mode 100644 index 0000000000..0484e6801e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi/icon.png differ 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 0000000000..382ac2d601 --- /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 0000000000..d6d1f34fd7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/equipped-HELMET.png differ 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 0000000000..3ab6fc20cc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi/meta.json new file mode 100644 index 0000000000..382ac2d601 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.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/greenbeanie.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..020d4318d0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/equipped-HELMET.png differ 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 0000000000..e5fe689199 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi/icon.png differ 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 0000000000..382ac2d601 --- /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 0000000000..75bab94b44 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/equipped-HELMET.png differ 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 0000000000..e6e19f9725 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi/icon.png differ 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 0000000000..382ac2d601 --- /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 0000000000..3e68146967 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/icon.png new file mode 100644 index 0000000000..3168b65308 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi/meta.json new file mode 100644 index 0000000000..382ac2d601 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.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/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-1.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-1.png new file mode 100644 index 0000000000..60b5b7c39c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-1.png differ 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 0000000000..a60a4f9352 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-2.png differ 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 0000000000..1b3375243c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-3.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-4.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-4.png new file mode 100644 index 0000000000..e9b4c1df7e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/fill-4.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/icon.png new file mode 100644 index 0000000000..22a6711875 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/icon.png differ 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 0000000000..d46a00edd0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/icon_empty.png differ 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 0000000000..62d9960202 --- /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 0000000000..38a9e55887 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi/teapack.png differ 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 0000000000..ac5669984f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-1.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-2.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-2.png new file mode 100644 index 0000000000..ff74f09203 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-2.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-3.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-3.png new file mode 100644 index 0000000000..5590474242 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-3.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-4.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-4.png new file mode 100644 index 0000000000..323bee1d92 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/fill-4.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/icon.png new file mode 100644 index 0000000000..1751b026c7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/icon_empty.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/icon_empty.png new file mode 100644 index 0000000000..d46a00edd0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/icon_empty.png differ 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 0000000000..62d9960202 --- /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 0000000000..38f3111a06 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi/teapack.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/icon.png new file mode 100644 index 0000000000..f01ae8a789 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/meta.json new file mode 100644 index 0000000000..39040134fc --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Sh4zik", + "states": + [ + { + "name": "teabox" + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/teabox.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/teabox.png new file mode 100644 index 0000000000..70bf2d15c9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi/teabox.png differ 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 0000000000..1cfc9cf7b9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-1.png differ 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 0000000000..9a5f5cb053 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-2.png differ 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 0000000000..059b0caca2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-3.png differ 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 0000000000..e2142ea9b1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/fill-4.png differ 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 0000000000..7ac96a1ace Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/icon_empty.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/icon_empty.png new file mode 100644 index 0000000000..49864fe769 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/icon_empty.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/meta.json new file mode 100644 index 0000000000..62d9960202 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.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/watermelontea.rsi/teapack.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/teapack.png new file mode 100644 index 0000000000..38a9e55887 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi/teapack.png differ 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 0000000000..f23ab1368b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-left.png differ 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 0000000000..be740ca048 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-right.png differ 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 0000000000..69d097f799 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/boxclosed.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/boxopen.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/boxopen.png new file mode 100644 index 0000000000..eff10f124b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/boxopen.png differ 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 0000000000..5a70748703 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/fullpizza.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/meta.json new file mode 100644 index 0000000000..7c24479f53 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Sh4zik ow-", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "fullpizza" + }, + { + "name": "boxopen" + }, + { + "name": "boxclosed" + }, + { + "name": "pizzaslice" + }, + { + "name": "box-inhand-right", + "directions": 4 + }, + { + "name": "box-inhand-left", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/pizzaslice.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/pizzaslice.png new file mode 100644 index 0000000000..f66515389c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi/pizzaslice.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/equipped-BELT.png new file mode 100644 index 0000000000..0270b70896 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/equipped-BELT.png differ 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 0000000000..f8652a2ab7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/icon.png differ 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 0000000000..c7b1debc06 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/inhand-right.png new file mode 100644 index 0000000000..0bf4ca3525 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi/inhand-right.png differ 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 0000000000..925b9922c4 --- /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 0000000000..e3f4035234 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..648fff08e4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000..db23cdc2a4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-back-fill-1.png differ 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 0000000000..db23cdc2a4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/equipped-suitstorage-fill-1.png differ 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 0000000000..87a1358a8c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-left-fill-1.png differ 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 0000000000..1087d3f6c6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..4d0d61d0c1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-right.png new file mode 100644 index 0000000000..d3231408f4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/inhand-right.png differ 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 0000000000..5ee0443364 --- /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 0000000000..079d0a2668 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/spear.png differ 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 0000000000..fec362ac72 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/spear1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000..e50787d3f9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-left-fill-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..68675e7f9d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000..0a78a494a7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-right-fill-1.png differ 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 0000000000..d0e078c88a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi/wielded-inhand-right.png differ 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 0000000000..2e9af1781e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/equipped-BELT.png differ 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 0000000000..61a18d7dd0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/icon.png differ 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 0000000000..09d3be9ecd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/inhand-left.png differ 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 0000000000..d952312450 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi/inhand-right.png differ 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 0000000000..925b9922c4 --- /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 0000000000..f632427c22 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-BACKPACK.png differ 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 0000000000..fc03f154a4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-SUITSTORAGE.png differ 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 0000000000..db23cdc2a4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-back-fill-1.png differ 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 0000000000..db23cdc2a4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/equipped-suitstorage-fill-1.png differ 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 0000000000..87a1358a8c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-left-fill-1.png differ 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 0000000000..d36666f58a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..4d0d61d0c1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-right.png new file mode 100644 index 0000000000..e174b79a61 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/inhand-right.png differ 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 0000000000..5ee0443364 --- /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 0000000000..acb0228251 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/spear.png differ 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 0000000000..fec362ac72 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/spear1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000..e50787d3f9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-left-fill-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..ee6b47b327 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-left.png differ 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 0000000000..0a78a494a7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-right-fill-1.png differ 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 0000000000..2a7fb33315 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/icon.png new file mode 100644 index 0000000000..f8082644d4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/icon.png differ 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 0000000000..d22a8df85e --- /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 0000000000..8b70427289 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi/metal-inhand.png differ 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 0000000000..4032ec5498 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/icon.png differ 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 0000000000..d22a8df85e --- /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 0000000000..17b9147ec3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi/metal-inhand.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/dagger-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/dagger-inhand-left.png new file mode 100644 index 0000000000..6242712b5e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/dagger-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/dagger-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/dagger-inhand-right.png new file mode 100644 index 0000000000..87f678b5f1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/dagger-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/icon.png new file mode 100644 index 0000000000..e6e4f72a23 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi/meta.json new file mode 100644 index 0000000000..5be9e18835 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.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/plasmadagger.rsi/dagger-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/dagger-inhand-left.png new file mode 100644 index 0000000000..97032512e1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/dagger-inhand-left.png differ 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 0000000000..2db5c289bd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/dagger-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/icon.png new file mode 100644 index 0000000000..ca6a47c060 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi/icon.png differ 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 0000000000..5be9e18835 --- /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 0000000000..6242712b5e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/dagger-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/dagger-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/dagger-inhand-right.png new file mode 100644 index 0000000000..87f678b5f1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/dagger-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/icon.png new file mode 100644 index 0000000000..e6e4f72a23 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi/meta.json new file mode 100644 index 0000000000..5be9e18835 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.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/uraniumdagger.rsi/dagger-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/dagger-inhand-left.png new file mode 100644 index 0000000000..ea26277c50 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/dagger-inhand-left.png differ 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 0000000000..73a42c0d17 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/dagger-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/icon.png new file mode 100644 index 0000000000..2ad92a3c5a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi/meta.json new file mode 100644 index 0000000000..5be9e18835 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.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/Structures/Machines/hotplatebarmen.rsi/beaker.png b/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/beaker.png new file mode 100644 index 0000000000..fb4d799dd7 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/beaker.png differ 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 0000000000..aab6a715a4 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/icon.png differ 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 0000000000..b4997ae6cc --- /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 0000000000..0da314bb1b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi/on.png differ