From 026f2df7ecba6808ce6cdbf29dcc8a16771e0c33 Mon Sep 17 00:00:00 2001 From: Filo <98309485+Filokini@users.noreply.github.com> Date: Sat, 26 Oct 2024 02:47:28 +0500 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=80=D0=B0=D0=B7=D0=BD=D1=8B=D1=85=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B3=D0=BE=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D0=BE=D0=BC=D0=B0=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=87=D0=B5=D0=BB=D0=BE=D0=B2=D0=B5=D0=BA=D0=B0=20(#672)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Содержит разные исправления и доработки последних проблем что я нашел, ну и немного добавки. Плюс починка тестов за хеллоуин. :cl: Filo - add: Еще немного носочков в одеждомат. - add: Добавлено создание сумок в принтер гп - add: Добавлен хвост для людей?... - tweak: Изменил отображение урона на теле у новакидов и сумеречников - fix: Пофиксил одевание носков с пчелками и программиста - fix: Мелкие исправления по типу: ослаблении хеллоуинского броника, уменьшении цены стильномата(70к это перебор), порезы таярам, лоадаута бригмедика. --- .../Entities/Clothing/Underwear/socks.ftl | 4 +- .../Mobs/Customization/Markings/Human.ftl | 5 +- .../ADT/Catalog/Cargo/cargo_food.yml | 2 +- .../ADT/Entities/Clothing/Belt/belts.yml | 6 +- .../ADT/Entities/Clothing/Eyes/glasses.yml | 2 +- .../ADT/Entities/Clothing/Head/hats.yml | 4 +- .../ADT/Entities/Clothing/Neck/misc.yml | 6 +- .../ADT/Entities/Clothing/Neck/ties.yml | 4 +- .../Entities/Clothing/OuterClothing/armor.yml | 6 + .../Entities/Clothing/OuterClothing/coats.yml | 4 +- .../Clothing/OuterClothing/wintercoats.yml | 2 +- .../ADT/Entities/Clothing/Shoes/misc.yml | 6 +- .../Clothing/Underwear/Bottom/bottom.yml | 6 +- .../Underwear/Socks/base_clothingsocks.yml | 2 + .../Clothing/Underwear/Socks/socks.yml | 15 +- .../Entities/Clothing/Underwear/Top/top.yml | 10 +- .../Entities/Clothing/Uniforms/Jumpsuits.yml | 32 ++--- .../Mobs/Customization/Markings/Human.yml | 32 ++++- .../ADT/Entities/Mobs/Species/Tajaran.yml | 8 +- .../ADT/Entities/Mobs/Species/kobolt.yml | 7 + .../ADT/Entities/Mobs/Species/novakid.yml | 7 + .../ADT/Entities/Mobs/Species/shadekin.yml | 9 +- .../Objects/Consumable/Food/Baked/pie.yml | 5 + .../ADT/Entities/Objects/Fun/misc.yml | 2 + .../Structures/Machines/vending_machines.yml | 3 + .../ADT/Loadouts/Jobs/Security/brigmedic.yml | 33 ++--- .../ADT/Loadouts/loadout_groups.yml | 13 +- .../Prototypes/ADT/Loadouts/role_loadouts.yml | 3 +- .../Prototypes/ADT/Reagents/biological.yml | 2 +- .../ADT/Recipes/Lathes/clothing.yml | 135 ++++++++++++++++++ .../Roles/Jobs/Medical/senior_physician.yml | 1 - .../ADT/Roles/Jobs/Security/brigmedic.yml | 1 - .../Catalog/Cargo/cargo_vending.yml | 2 +- .../Inventories/clothesmate.yml | 3 + .../Entities/Clothing/Under/under.yml | 12 +- .../Entities/Mobs/Species/arachnid.yml | 51 ++++++- .../Entities/Mobs/Species/reptilian.yml | 7 + .../Entities/Structures/Machines/lathe.yml | 22 +++ .../Socks/bee.rsi/equipped-SOCKS.png | Bin 0 -> 416 bytes .../Clothing/Underwear/Socks/bee.rsi/icon.png | Bin 0 -> 233 bytes .../Underwear/Socks/bee.rsi/meta.json | 18 +++ .../Socks/coder.rsi/equipped-SOCKS.png | Bin 0 -> 310 bytes .../Underwear/Socks/coder.rsi/icon.png | Bin 0 -> 207 bytes .../Underwear/Socks/coder.rsi/meta.json | 18 +++ .../Socks/socksbee.rsi/equipped-SOCKS.png | Bin 0 -> 528 bytes .../Underwear/Socks/socksbee.rsi/icon.png | Bin 0 -> 235 bytes .../Underwear/Socks/socksbee.rsi/meta.json | 18 +++ .../Customization/Human/demon.rsi/meta.json | 39 +++++ .../Human/demon.rsi/milky_ears.png | Bin 0 -> 157 bytes .../Human/demon.rsi/milky_horns.png | Bin 0 -> 256 bytes .../Human/demon.rsi/milky_tail.png | Bin 0 -> 691 bytes .../Human/demon.rsi/milky_tail_secondary.png | Bin 0 -> 2864 bytes .../Shadekin/displacement.rsi/jumpsuit.png | Bin 423 -> 624 bytes 53 files changed, 455 insertions(+), 112 deletions(-) create mode 100644 Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/equipped-SOCKS.png create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/equipped-SOCKS.png create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/equipped-SOCKS.png create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/meta.json create mode 100644 Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/meta.json create mode 100644 Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_ears.png create mode 100644 Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_horns.png create mode 100644 Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail.png create mode 100644 Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail_secondary.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl index 95858e1c850..592b7578d1b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl @@ -51,9 +51,7 @@ ent-ADTClothingUnderwearSocksStockingsHeart = длинные чулки с се ent-ADTClothingUnderwearSocksRabbit = носки с кроликами .desc = Теплый и необычные носочки в виде кроликов. -ent-ClothingUnderwearSocksCoder = носочки для програмиста - .desc = Пришло время отдаться коду!11!! -ent-ClothingUnderwearSocksBee = носочки с пчёлами +ent-ADTClothingUnderwearSocksBee = носочки с пчёлами .desc = Заставь их загудеть от волнения. ent-ADTClothingUnderwearSocksBlueshield = носки офицера "Синего Щита" diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/Human.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/Human.ftl index b65a3ecd947..4568b902c4b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/Human.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/Human.ftl @@ -6,6 +6,9 @@ marking-HumanPiercingNippleR = Правый сосок marking-HumanPiercingNipple = Сосок marking-ADTFoxTail = Лисий хвост +marking-ADTMilkyTail = Шипастый хвост, Человек +marking-ADTMilkyEars = Удлинённые уши, Человек +marking-ADTMilkyHorns = Рога, Человек # Аргументации marking-AugmentsRoboticArmRight-r_roboarm = Аугментация, правая рука (Робот) @@ -47,4 +50,4 @@ marking-AugmentsAugTorso = Аугментация, корпус мужской ( marking-Malstrem = Мальстрём marking-Beholder = Наблюдатель marking-Terminator = Терминатор -marking-Iron_jaw = Стальная челюсть \ No newline at end of file +marking-Iron_jaw = Стальная челюсть diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml index a8836a6e9ac..af96ddc3799 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml @@ -94,6 +94,6 @@ sprite: ADT/Objects/Misc/halloween_smilecandy_bowl.rsi state: icon-0 product: ADTCrateHalloweenFood - cost: 1200 + cost: 2300 category: cargoproduct-category-name-food group: market diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml index c12fffd7270..2eb4e5539d4 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml @@ -133,7 +133,7 @@ sprite: ADT/Clothing/Belt/black_suspenders.rsi #спрайты от prazat911 quickEquip: true - type: StaticPrice - price: 160 + price: 15 - type: entity parent: ClothingBeltBase @@ -147,7 +147,7 @@ sprite: ADT/Clothing/Belt/leather_suspenders.rsi #спрайты от prazat911 quickEquip: true - type: StaticPrice - price: 160 + price: 15 # Разгрузка и подсумки ТСФ @@ -227,7 +227,7 @@ sprite: ADT/Clothing/Belt/killa_webbing.rsi - type: Clothing sprite: ADT/Clothing/Belt/killa_webbing.rsi - + - type: entity parent: ClothingBeltStorageBase id: ADTClothingBeltMedicalBag diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml index f8adb555b68..a83cb5a9b6f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml @@ -26,7 +26,7 @@ - type: Clothing sprite: ADT/Clothing/Eyes/Glasses/pink_glasses.rsi #спрайты от dion_clawed - type: StaticPrice - price: 200 + price: 25 - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index 8a7558be72e..ddb66428b5b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -43,7 +43,7 @@ - type: Clothing sprite: ADT/Clothing/Head/Hats/cinnamon_flat_cap.rsi #спрайты от prazat911 - type: StaticPrice - price: 150 + price: 15 - type: entity parent: ClothingHeadBase @@ -56,7 +56,7 @@ - type: Clothing sprite: ADT/Clothing/Head/Hats/grey_flat_cap.rsi #спрайты от prazat911 - type: StaticPrice - price: 150 + price: 15 - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml index a0966a995d3..9c7376d57b9 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: ADT/Clothing/Neck/Misc/gold_chain.rsi #спрайты от prazat911 - type: StaticPrice - price: 500 + price: 75 - type: entity parent: ClothingNeckBase @@ -30,7 +30,7 @@ - type: Sprite sprite: ADT/Clothing/Neck/Misc/choker_with_spike.rsi - type: StaticPrice - price: 300 + price: 40 - type: entity parent: ClothingNeckBase @@ -41,7 +41,7 @@ - type: Sprite sprite: ADT/Clothing/Neck/Misc/choker_with_heart.rsi - type: StaticPrice - price: 300 + price: 40 # halloween diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/ties.yml index 1dbfbf93dc5..52016e5460f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/ties.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: ADT/Clothing/Neck/Ties/blue_tie.rsi #спрайты от prazat911 - type: StaticPrice - price: 150 + price: 65 - type: entity parent: ClothingNeckBase @@ -22,4 +22,4 @@ - type: Clothing sprite: ADT/Clothing/Neck/Ties/gold_tie.rsi #спрайты от prazat911 - type: StaticPrice - price: 150 + price: 75 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml index 5d3b566c59f..c507d98580c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml @@ -166,5 +166,11 @@ sprite: ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi - type: Clothing sprite: ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.85 - type: ExplosionResistance damageCoefficient: 0.9 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 5136fc8c1da..60765ff88da 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -46,7 +46,7 @@ - type: Clothing sprite: ADT/Clothing/OuterClothing/Coats/gray_sweatshirttop.rsi - type: StaticPrice - price: 800 + price: 65 - type: entity parent: ClothingOuterStorageBase @@ -59,7 +59,7 @@ - type: Clothing sprite: ADT/Clothing/OuterClothing/Coats/black_sweatshirttop.rsi - type: StaticPrice - price: 800 + price: 65 - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml index 4024dc48939..5bf9ef0e347 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml @@ -25,4 +25,4 @@ - type: Clothing sprite: ADT/Clothing/OuterClothing/WinterCoats/russian_coat.rsi #спрайты от prazat911 - type: StaticPrice - price: 1000 + price: 120 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml index 9c3122dde58..f040a0a8fe5 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: ADT/Clothing/Shoes/Boots/light_shoes.rsi - type: StaticPrice - price: 120 + price: 15 - type: entity parent: ClothingShoesBaseButcherable @@ -22,7 +22,7 @@ - type: Clothing sprite: ADT/Clothing/Shoes/Boots/white_sandals.rsi #спрайты от dion_clawed - type: StaticPrice - price: 240 + price: 23 - type: entity parent: ClothingShoesBaseButcherable @@ -35,7 +35,7 @@ - type: Clothing sprite: ADT/Clothing/Shoes/Boots/black_boots.rsi #спрайты от dion_clawed - type: StaticPrice - price: 240 + price: 23 - type: entity parent: ClothingShoesBaseButcherable diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom/bottom.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom/bottom.yml index 6dee498a4c7..e7302938ebb 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom/bottom.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom/bottom.yml @@ -176,7 +176,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Bottom/lace_panties.rsi #спрайты от prazat911 - type: StaticPrice - price: 100 + price: 28 #New Year. - type: entity @@ -216,7 +216,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Bottom/red_panties.rsi - type: StaticPrice - price: 100 + price: 25 - type: entity parent: ADTClothingUnderwearBottomBase @@ -227,7 +227,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Bottom/black_panties.rsi - type: StaticPrice - price: 100 + price: 25 - type: entity parent: ADTClothingUnderwearBottomBase diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/base_clothingsocks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/base_clothingsocks.yml index bbcc8780b2e..ddc173d82a2 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/base_clothingsocks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/base_clothingsocks.yml @@ -27,6 +27,8 @@ reagents: - ReagentId: Fiber Quantity: 10 + - type: StaticPrice + price: 14 - type: Tag tags: - ClothMade diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml index 5f0a51da593..30a79fdab94 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml @@ -40,21 +40,12 @@ - type: entity parent: ADTClothingUnderwearSocksBase - id: ClothingUnderwearSocksBee # HACK + id: ADTClothingUnderwearSocksBee # HACK name: bee socks description: Make them loins buzz! components: - type: Sprite - sprite: Clothing/Under/Socks/bee.rsi - -- type: entity - parent: ADTClothingUnderwearSocksBase - id: ClothingUnderwearSocksCoder # HACK - name: coder socks - description: It's time to code sisters!!11! - components: - - type: Sprite - sprite: Clothing/Under/Socks/coder.rsi + sprite: ADT/Clothing/Underwear/Socks/socksbee.rsi #приколы празата - type: entity @@ -244,7 +235,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Socks/socks_rabbit.rsi - type: StaticPrice - price: 120 + price: 26 # TGS diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top/top.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top/top.yml index a201ea7b039..15f53fcea18 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top/top.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top/top.yml @@ -122,7 +122,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Top/sportsbrablack.rsi - type: StaticPrice - price: 100 + price: 28 - type: entity parent: ADTClothingUnderwearTopBase @@ -133,7 +133,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Top/peabra.rsi - type: StaticPrice - price: 100 + price: 28 - type: entity parent: ADTClothingUnderwearTopBase @@ -144,7 +144,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Top/lace_bra.rsi - type: StaticPrice - price: 100 + price: 28 - type: entity parent: ADTClothingUnderwearTopBase @@ -173,7 +173,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Top/red_bra.rsi - type: StaticPrice - price: 100 + price: 28 - type: entity parent: ADTClothingUnderwearTopBase @@ -184,7 +184,7 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Top/black_bra.rsi - type: StaticPrice - price: 100 + price: 28 - type: entity parent: ADTClothingUnderwearTopBase diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index b8a09410595..5acd68eba30 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -299,7 +299,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/denim_pants.rsi - type: StaticPrice - price: 300 + price: 40 - type: entity parent: ClothingUniformBase @@ -312,7 +312,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/denim_jumpsuit.rsi - type: StaticPrice - price: 500 + price: 40 - type: entity parent: ClothingUniformBase @@ -325,7 +325,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/camo_suit.rsi - type: StaticPrice - price: 500 + price: 40 - type: entity parent: ClothingUniformBase @@ -338,7 +338,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/desert_camo_suit.rsi - type: StaticPrice - price: 500 + price: 40 - type: entity parent: ClothingUniformBase @@ -351,7 +351,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/serious_suit.rsi - type: StaticPrice - price: 500 + price: 40 - type: entity parent: ClothingUniformBase @@ -364,7 +364,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/black_shirt.rsi #спрайты от prazat911 - type: StaticPrice - price: 600 + price: 45 - type: entity parent: ClothingUniformBase @@ -377,7 +377,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/blue_shirt.rsi #спрайты от prazat911 - type: StaticPrice - price: 600 + price: 45 - type: entity parent: ClothingUniformBase @@ -390,7 +390,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/purple_shirt.rsi #спрайты от prazat911 - type: StaticPrice - price: 600 + price: 45 - type: entity parent: ClothingUniformBase @@ -403,7 +403,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/red_shirt.rsi #спрайты от prazat911 - type: StaticPrice - price: 600 + price: 45 - type: entity parent: ClothingUniformBase @@ -416,7 +416,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/fancy_shirt.rsi #спрайты от prazat911 - type: StaticPrice - price: 700 + price: 55 - type: entity parent: ClothingUniformBase @@ -429,7 +429,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/red_plaid_shirt.rsi #спрайты от prazat911 - type: StaticPrice - price: 700 + price: 55 - type: entity parent: ClothingUniformBase @@ -442,7 +442,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/hawaiian_shirt.rsi #спрайты от prazat911 - type: StaticPrice - price: 800 + price: 60 - type: entity parent: ClothingUniformBase @@ -455,7 +455,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/gothic_attire.rsi #спрайты от dion_clawed - type: StaticPrice - price: 700 + price: 55 - type: entity parent: ClothingUniformBase @@ -468,7 +468,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/grey_suit.rsi #спрайты от prazat911 - type: StaticPrice - price: 700 + price: 55 - type: entity parent: ClothingUniformBase @@ -481,7 +481,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/old_brown_shirt.rsi #спрайты от prazat911 - type: StaticPrice - price: 700 + price: 55 - type: entity parent: ClothingUniformBase @@ -494,7 +494,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/sweatshirt_bright.rsi #спрайты от dion_clawed - type: StaticPrice - price: 700 + price: 55 # SPACE SEC - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Human.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Human.yml index 8f865151a09..f73cfce3882 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Human.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Human.yml @@ -74,4 +74,34 @@ - sprite: ADT/Mobs/Customization/Human/fox_parts.rsi state: tail_fox_wag_stripes_second # AdventureTime-Sponsors - sprite: ADT/Mobs/Customization/Human/fox_parts.rsi - state: tail_fox_wag_stripes_third # AdventureTime-Sponsors \ No newline at end of file + state: tail_fox_wag_stripes_third # AdventureTime-Sponsors + +- type: marking + id: ADTMilkyTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Human] + sprites: + - sprite: ADT/Mobs/Customization/Human/demon.rsi + state: milky_tail + - sprite: ADT/Mobs/Customization/Human/demon.rsi + state: milky_tail_secondary + +- type: marking + id: ADTMilkyEars + bodyPart: Head + markingCategory: HeadTop + speciesRestriction: [Human] + sprites: + - sprite: ADT/Mobs/Customization/Human/demon.rsi + state: milky_ears + +- type: marking + id: ADTMilkyHorns + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [Human] + sprites: + - sprite: ADT/Mobs/Customization/Human/demon.rsi + state: milky_horns + diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml index fd28e038444..593919ea79c 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml @@ -25,14 +25,12 @@ damageContainer: Biological damageModifierSet: Tajaran - type: MeleeWeapon - hidden: true soundHit: - path: /Audio/Weapons/pierce.ogg - angle: 30 - animation: WeaponArcPunch + path: /Audio/Weapons/slash.ogg + animation: WeaponArcClaw damage: types: - Piercing: 5 + Slash: 5 - type: Temperature heatDamageThreshold: 325 coldDamageThreshold: 240 diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/kobolt.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/kobolt.yml index 0382e1e7f23..2d038a6d3b0 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/kobolt.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/kobolt.yml @@ -72,6 +72,13 @@ - MobMask layer: - MobLayer + - type: DamageVisuals + damageOverlayGroups: + Brute: + sprite: Mobs/Effects/brute_damage.rsi + color: "#801900" + Burn: + sprite: Mobs/Effects/burn_damage.rsi - type: TemperatureSpeed thresholds: 283: 0.8 diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml index 41b9e1ae167..9eb25009290 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml @@ -128,6 +128,13 @@ visualType: Large messages: [ "novakid-hurt-by-water-popup" ] probability: 0.25 + - type: DamageVisuals + damageOverlayGroups: + Brute: + sprite: Mobs/Effects/brute_damage.rsi + color: "#7e009e" + Burn: + sprite: Mobs/Effects/burn_damage.rsi - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/shadekin.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/shadekin.yml index 6070b6db379..b31cc379c8c 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/shadekin.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/shadekin.yml @@ -158,7 +158,14 @@ messagePerceivedByOthers: petting-success-soft-floofy-others - type: MovementSpeedModifier baseWalkSpeed : 4.5 - baseSprintSpeed : 2.7 + baseSprintSpeed : 2.5 + - type: DamageVisuals + damageOverlayGroups: + Brute: + sprite: Mobs/Effects/brute_damage.rsi + color: "#3C0F24" + Burn: + sprite: Mobs/Effects/burn_damage.rsi - type: Inventory displacements: jumpsuit: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml index 572d99ffaad..cf0020d7f82 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -18,6 +18,8 @@ tags: - Fruit - Pie + - type: StaticPrice + price: 5 - type: entity name: slice of pumpkin pie @@ -36,3 +38,6 @@ tags: - Fruit - Pie + - Slice + - type: StaticPrice + price: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml index 21944b57834..8e279c8bea9 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml @@ -13,6 +13,8 @@ types: Blunt: 2 Structural: 5 + - type: StaticPrice + price: 25 #- type: ClothingSpeedModifier # walkModifier: 0.9 # sprintModifier: 1.2 diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml index 0396250876e..c61abddaa92 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml @@ -37,6 +37,7 @@ description: A vending machine for specific clothing. components: - type: VendingMachine + priceMultiplier: 0.8 pack: ADTPrazatClothesMateInventory offState: off brokenState: broken @@ -64,6 +65,8 @@ color: "#c2adff" - type: TTS # Corvax-TTS voice: bebey + - type: StaticPrice + price: -4000 # Оружейная тсф diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/brigmedic.yml index 069f7e1d88f..37641c35d24 100644 --- a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/brigmedic.yml @@ -72,69 +72,58 @@ - type: loadout id: ADTEyesGlassesMed equipment: - back: ADTClothingEyesGlassesMed + eyes: ADTClothingEyesGlassesMed - type: loadout id: ADTEyesGlassesSecurity equipment: - back: ClothingEyesGlassesSecurity + eyes: ClothingEyesGlassesSecurity - type: loadout id: ADTEyesGlassesSunglasses equipment: - back: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSunglasses # Hands Gloves - type: loadout id: ADTHandsGlovesLatex equipment: - back: ClothingHandsGlovesLatex + gloves: ClothingHandsGlovesLatex - type: loadout id: ADTHandsGlovesNitrile equipment: - back: ClothingHandsGlovesNitrile - -- type: loadout - id: ADTHandsGlovesCombat - equipment: - back: ClothingHandsGlovesCombat - -# PDA -- type: loadout - id: ADTBrigmedicPDA - equipment: - back: BrigmedicPDA + gloves: ClothingHandsGlovesNitrile # belt - type: loadout id: ADTBeltMedicalFilled equipment: - back: ClothingBeltMedicalFilled + belt: ClothingBeltMedicalFilled - type: loadout id: ADTBeltSecurityRPS equipment: - back: ClothingBeltSecurityWebbingFilled + belt: ClothingBeltSecurityWebbingFilled - type: loadout id: ADTBeltSecurityForBrigmedic equipment: - back: ClothingBeltSecurityFilled + belt: ClothingBeltSecurityFilled # outerwear - type: loadout id: ADTOuterCoatBrigmedicWB equipment: - back: ADTClothingOuterCoatBrigmedicWB + outerClothing: ADTClothingOuterCoatBrigmedicWB - type: loadout id: ADTOuterVestSecurityMedic equipment: - back: ClothingOuterVestSecurityMedic + outerClothing: ClothingOuterVestSecurityMedic - type: loadout id: ADTOuterCoatLabSecurityMedic equipment: - back: ClothingOuterCoatLabSecurityMedic + outerClothing: ClothingOuterCoatLabSecurityMedic diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 1d052192bab..33a6a0cfe0f 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -307,16 +307,6 @@ loadouts: - ADTHandsGlovesLatex - ADTHandsGlovesNitrile - - ADTHandsGlovesCombat - - # PDA -- type: loadoutGroup - id: ADTBrigmedicPDA - name: loadout-brigmedic-pda-adt - minLimit: 0 - maxLimit: 1 - loadouts: - - ADTBrigmedicPDA # Eyes - type: loadoutGroup @@ -337,8 +327,7 @@ maxLimit: 1 loadouts: - ADTBeltMedicalFilled - - ADTBeltSecurityRPS - - ADTBeltSecurityForBrigmedic + - ADTMedicalBeltBag # outerwear - type: loadoutGroup diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index d7cf3d54f3b..37a4e8f910a 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -170,10 +170,9 @@ - ADTBrigmedicOuterWear - ADTBrigmedicBack # Another stuffs - - ADTBrigmedicBelts + - ADTMedicalBelt - ADTBrigmedicEyes - ADTBrigmedicGloves - - ADTBrigmedicPDA # another: - SecurityShoes - SurvivalSecurity diff --git a/Resources/Prototypes/ADT/Reagents/biological.yml b/Resources/Prototypes/ADT/Reagents/biological.yml index d868173ccfe..15adefb0c71 100644 --- a/Resources/Prototypes/ADT/Reagents/biological.yml +++ b/Resources/Prototypes/ADT/Reagents/biological.yml @@ -54,7 +54,7 @@ desc: reagent-desc-corelander-blood physicalDesc: reagent-physical-desc-viscous flavor: metallic - color: "#800000" + color: "#801900" metabolisms: Medicine: metabolismRate: 0.5 diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml b/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml new file mode 100644 index 00000000000..5ffeea5eb3f --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml @@ -0,0 +1,135 @@ +# basebackpacksrecipe + +- type: latheRecipe + abstract: true + id: ADTBaseBackpackRecipe + completetime: 4 + materials: + Cloth: 800 + +- type: latheRecipe + abstract: true + id: ADTBaseBackpackSatchelRecipe + completetime: 4 + materials: + Cloth: 900 + +- type: latheRecipe + abstract: true + id: ADTBaseBackpackDuffelRecipe + completetime: 4 + materials: + Cloth: 1000 + +# result + +- type: latheRecipe + parent: ADTBaseBackpackRecipe + id: ADTClothingBackpack + result: ClothingBackpack + +- type: latheRecipe + parent: ADTBaseBackpackRecipe + id: ADTClothingBackpackSecurity + result: ClothingBackpackSecurity + +- type: latheRecipe + parent: ADTBaseBackpackRecipe + id: ADTClothingBackpackScience + result: ClothingBackpackScience + +- type: latheRecipe + parent: ADTBaseBackpackRecipe + id: ADTClothingBackpackCargo + result: ClothingBackpackCargo + +- type: latheRecipe + parent: ADTBaseBackpackRecipe + id: ADTClothingBackpackMedical + result: ClothingBackpackMedical + +- type: latheRecipe + parent: ADTBaseBackpackRecipe + id: ADTClothingBackpackEngineering + result: ClothingBackpackEngineering + +# satchels + +- type: latheRecipe + parent: ADTBaseBackpackSatchelRecipe + id: ADTClothingBackpackSatchel + result: ClothingBackpackSatchel + +- type: latheRecipe + parent: ADTBaseBackpackSatchelRecipe + id: ADTClothingBackpackSatchelSecurity + result: ClothingBackpackSatchelSecurity + +- type: latheRecipe + parent: ADTBaseBackpackSatchelRecipe + id: ADTClothingBackpackSatchelScience + result: ClothingBackpackSatchelScience + +- type: latheRecipe + parent: ADTBaseBackpackSatchelRecipe + id: ADTClothingBackpackSatchelCargo + result: ClothingBackpackSatchelCargo + +- type: latheRecipe + parent: ADTBaseBackpackSatchelRecipe + id: ADTClothingBackpackSatchelMedical + result: ClothingBackpackSatchelMedical + +- type: latheRecipe + parent: ADTBaseBackpackSatchelRecipe + id: ADTClothingBackpackSatchelEngineering + result: ClothingBackpackSatchelEngineering + +# Duffel + + +- type: latheRecipe + parent: ADTBaseBackpackDuffelRecipe + id: ADTClothingBackpackDuffel + result: ClothingBackpackDuffel + +- type: latheRecipe + parent: ADTBaseBackpackDuffelRecipe + id: ADTClothingBackpackDuffelSecurity + result: ClothingBackpackDuffelSecurity + +- type: latheRecipe + parent: ADTBaseBackpackDuffelRecipe + id: ADTClothingBackpackDuffelScience + result: ClothingBackpackDuffelScience + +- type: latheRecipe + parent: ADTBaseBackpackDuffelRecipe + id: ADTClothingBackpackDuffelCargo + result: ClothingBackpackDuffelCargo + +- type: latheRecipe + parent: ADTBaseBackpackDuffelRecipe + id: ADTClothingBackpackDuffelMedical + result: ClothingBackpackDuffelMedical + +- type: latheRecipe + parent: ADTBaseBackpackDuffelRecipe + id: ADTClothingBackpackDuffelEngineering + result: ClothingBackpackDuffelEngineering + +- type: latheRecipe + id: ADTClothingBackpackDuffelSyndicate + result: ClothingBackpackDuffelSyndicate + completetime: 4 + materials: + Cloth: 500 + Durathread: 1000 + +- type: latheRecipe + id: ADTClothingBackpackDuffelDurathead + result: ADTClothingBackpackDuffelDurathead + completetime: 4 + materials: + Cloth: 500 + Durathread: 1000 diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/senior_physician.yml index d0c2402da9e..884f0c9579f 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/senior_physician.yml @@ -26,4 +26,3 @@ equipment: id: SeniorPhysicianPDA ears: ClothingHeadsetMedical - belt: ClothingBeltMedicalFilled \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml index c0aca988a94..916d7b7381a 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml @@ -27,7 +27,6 @@ - type: startingGear id: BrigmedicGear equipment: - jumpsuit: ADTClothingUniformBrigmedicJumpsuitTurtleneck id: BrigmedicPDA ears: ClothingHeadsetBrigmedic pocket1: WeaponPistolMk58 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index d1508a61e75..c7e9a4b3a84 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 3600 #ADT_Tweak + cost: 3650 #ADT_Tweak category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 07e50d4a594..1c8b54342de 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -95,6 +95,9 @@ ADTClothingUnderwearSocksKneeComfyGrey: 2 ADTClothingUnderwearSocksKneeComfyRed: 2 ADTClothingUnderwearSocksKneeComfyViolet: 2 + ADTClothingUnderwearSocksBee: 2 + ClothingUnderSocksBee: 2 + ClothingUnderSocksCoder: 1 # ADT конец носков # ADT бельё/обмотки/плащи начало ADTClothingFootWrapsWhite: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Entities/Clothing/Under/under.yml index ce2ffc629e9..9a02fc35534 100644 --- a/Resources/Prototypes/Entities/Clothing/Under/under.yml +++ b/Resources/Prototypes/Entities/Clothing/Under/under.yml @@ -2,23 +2,23 @@ # I would cry if we didn't have them. -swept - type: entity - parent: ClothingShoesBase + parent: ADTClothingUnderwearSocksBase # ADT tweak id: ClothingUnderSocksBee name: bee socks description: Make them loins buzz! components: - type: Sprite - sprite: Clothing/Under/Socks/bee.rsi + sprite: ADT/Clothing/Underwear/Socks/bee.rsi # ADT tweak - type: Clothing - sprite: Clothing/Under/Socks/bee.rsi + sprite: ADT/Clothing/Underwear/Socks/bee.rsi # ADT tweak - type: entity - parent: ClothingShoesBase + parent: ADTClothingUnderwearSocksBase # ADT tweak id: ClothingUnderSocksCoder name: coder socks description: It's time to code sisters!!11! components: - type: Sprite - sprite: Clothing/Under/Socks/coder.rsi + sprite: ADT/Clothing/Underwear/Socks/coder.rsi # ADT tweak - type: Clothing - sprite: Clothing/Under/Socks/coder.rsi + sprite: ADT/Clothing/Underwear/Socks/coder.rsi # ADT tweak diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 70d10202a9a..57a6caeac56 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -152,6 +152,55 @@ components: - type: HumanoidAppearance species: Arachnid - + # Start ADT tweak + - type: Sprite # I'd prefer if these maps were better. Insert map pun here. + scale: 1.07, 1.07 # ADT tweak + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + # ADT tweak start + - map: [ "underwearb" ] #Sirena + - map: [ "underweart" ] #Sirena + - map: [ "socks" ] #Sirena + # ADT tweak end + - map: ["jumpsuit"] + - map: ["enum.HumanoidVisualLayers.LFoot"] + - map: ["enum.HumanoidVisualLayers.RFoot"] + - map: ["enum.HumanoidVisualLayers.LHand"] + - map: ["enum.HumanoidVisualLayers.RHand"] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "id" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol. + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] # Do these need to be here? (arachnid hair arachnid hair) + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: ["enum.HumanoidVisualLayers.Handcuffs"] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "clownedon" ] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_arachnid" + visible: false + # End ADT tweak #>88w88< diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 028dfe40a38..eb241ef8eec 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -83,6 +83,13 @@ - Draconic - CintaTaj #Start ADT tweak + - type: DamageVisuals + damageOverlayGroups: + Brute: + sprite: Mobs/Effects/brute_damage.rsi + color: "#800000" + Burn: + sprite: Mobs/Effects/burn_damage.rsi - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. allowedStates: - Alive diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index b64273a77d9..ef19156dd16 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1235,6 +1235,27 @@ - ClothingUniformJumpsuitRDClassical - ClothingUniformJumpskirtRDClassical # Corvax-Clothing-End + # ADT Backpacks Start + - ADTClothingBackpack + - ADTClothingBackpackSecurity + - ADTClothingBackpackScience + - ADTClothingBackpackCargo + - ADTClothingBackpackMedical + - ADTClothingBackpackEngineering + - ADTClothingBackpackSatchel + - ADTClothingBackpackSatchelSecurity + - ADTClothingBackpackSatchelScience + - ADTClothingBackpackSatchelCargo + - ADTClothingBackpackSatchelMedical + - ADTClothingBackpackSatchelEngineering + - ADTClothingBackpackDuffel + - ADTClothingBackpackDuffelSecurity + - ADTClothingBackpackDuffelScience + - ADTClothingBackpackDuffelCargo + - ADTClothingBackpackDuffelMedical + - ADTClothingBackpackDuffelEngineering + - ADTClothingBackpackDuffelDurathead + # ADT Backpacks End - type: EmagLatheRecipes emagStaticRecipes: - ClothingHeadHatCentcomcap @@ -1259,6 +1280,7 @@ - ClothingOuterWinterCentcom - ClothingOuterWinterSyndie - ClothingOuterWinterSyndieCap + - ADTClothingBackpackDuffelSyndicate # ADT tweak - type: MaterialStorage whitelist: tags: diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/equipped-SOCKS.png new file mode 100644 index 0000000000000000000000000000000000000000..6a803d7431f23e1e17042debb2218f36b684c021 GIT binary patch literal 416 zcmV;R0bl-!P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJeBIz9a)Ep~S_Rl37#?(#XY`R+N~V3St{_DJ!`8xqyuZ0JxtU ztz{tnkN^Mxx=BPqR7i>KlfeqYFc3tO=HNAp;yGopUgHwMbNd5A!4D|*E`feQe_RBi znG^)i&D;idUa|wLR8i4JrO6Wg@Tv-)Iq`;FkaWO2Tq_u8`iw9#1~LM#2=Jt;TF)H@ z1PDC3>);n3#B=WwfP4rG(=@#c&jg|OwIx{=*N2NGh9ZiJHYiQm6%bkQhR-+<#e=Wp zh68iwkkDm>X~+oUzl0c8e|V*SH#c`AoN$dO89^UgD1x~D_V5OH(HZgaDBEQK0000< KMNUMnLSTYI_^%KE literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/icon.png b/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..469f0f2ee2becfcbec4a1af019f1740773eb34e6 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJArY;~60D08M0%P64IVKn z2Qq$;caqgh|JARPbNgq%;B1Mn%wO$U{{P?h_5bHorT>l$E{i)HGiO9CGSuW_i2U$= zzw!+BO#*Ki1RRQ3d}SMSSsaWM+%M{~T&VT_F5s|DAbrJ!LyQI96PskBcPZQybh+6t za-_wnA;f)yz~csG-hBaKHq9;voLKCIBK<_1`y?EK99_5%xL7alWM0fCQF>qnvzx5J f2EK%Z1O|q0P38-bP0l+XkKN^Vc* literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/meta.json b/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/meta.json new file mode 100644 index 00000000000..54b721b87c6 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, fix digi sprites by DreamlyJack", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/equipped-SOCKS.png new file mode 100644 index 0000000000000000000000000000000000000000..4bb67f166d56d5f19bef9043173cbda39fdc12e0 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z?n<0@@%-7JKYw1Y-USranMpx}H@7srqY_qS6W`5F`im>qxqpPhS9BjKQg{;@6WBD-gr#hERc zZgha*6a%vc^FB6?0Lv{);^QA}I#QJ3xj%EmI*$hnRsYtTa=16GTk!X@>m-qs&1~gSqOA0gQu&X%Q~loCIEUqauWam literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/icon.png b/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ada609941eaec92b4a24ab7ff46e55dd63218ecc GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJX`U{QArY;~60D08M0%P64IVKn z2Qq$;cY5nJ>$`m9jodgPWivyAW{b(4EdLdMJo>r$fBnBdoW~T*^bFhnACW%m)MXv# zx9h|KwXb4_>b|u!Cd!o=zG}WGAi<-^;PqBtlB4~AUR&k=hn9^|3^%9$aAI)no2AI` zN%h3{O+iKp|B@%XcTA9z+ZkxU<#td*g4LPHz`%fkA@A+Y>)#SXg@G<)@O1TaS?83{ F1OVUVOw#}W literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/meta.json b/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/meta.json new file mode 100644 index 00000000000..6eab0b5f672 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, equipped-FEET modified by Psychpsyo, fix digi sprites by DreamlyJack", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/equipped-SOCKS.png new file mode 100644 index 0000000000000000000000000000000000000000..a84c75f0e1ce206bae3490defbb5efe3be06bb9d GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zPkFjHhE&XX zJIm4Ukb^{Py_A1~!AAzU1I!Pam}h)pyT`O$Wz7Szyn?GojubRiG4Mawwx-CE49X7L3f=ME2D zHior|M|AGZVi0ufOf+s;@HLus7TdN*hRz1_v;7-_GUs68lemdYV|C`)t|!uj)UR7xdV7zJBy4 zk>M8G7LtgaANC!7nw#CT{e)w5to0w}4$mb@^~!(5UKsu6`rH0Fg0VgA9*^1wt&jW; zyS=|m{x|WU%vGt))t{7Ps~hdK4_tNbdCx3$H)^x;?4@^i9h~=zX`+(%_g#nL&VM;1 zWFCFx=pOzxYImJJT+!bo65)GmKevS|Lz(`*&t4xc=x^E*`+JJEg1qVpchAEI%5=&Y e&fV&(VVK?V%W8yH;K92PB2;=Xg~keJC$1!fmcVFMR4kC*cwF>x(9ps=*# zhySLW`TphV%t}g1|Mj>|Ey|tRZOM~=&Q9v6p52;f;Thez2i5#NC;86%qVDD5dMRteme3fvCTfS#VTyC5W|dDd+*18n>%g3O6JH$Ny(vr@*?-;@2-##;x6zj~r>mzLe;(NOKxvXdhyssm;EZ{p8~$&dvA2TJ&#=p7qDxK6iHvuepFbKm>hUqwo;g#sZolpS%hKys zP5&Np^{;ZyS#x9IiN_fP4cDvf`83Q@upADM|F7C-&Z!)kIQ^Ap@03g11A3gd ty3Org_dDWl^J^E6?(K7&U literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail.png b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail.png new file mode 100644 index 0000000000000000000000000000000000000000..19bfeb547e1a3ab3c099fa088632a449bebdf1b3 GIT binary patch literal 691 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 JkN2g1{cjSA3zz@^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Species/Shadekin/displacement.rsi/jumpsuit.png b/Resources/Textures/ADT/Mobs/Species/Shadekin/displacement.rsi/jumpsuit.png index 81d4db70a71b15909ae7b5f862a0d2377b582781..bdafcec2b99b42b3d0f1a7727b12e8e221ae255e 100644 GIT binary patch delta 610 zcmV-o0-gP*1Mmcp8Gi-<0063Kaozv`00DDSM?wIu&K&6g00JsWL_t(|ob6gmRs$gr ztoG#qxkXOpI!kY$m>amv+Ee8gxdATnCT~QBK!0czYNs$$Jw?+L5DEbi1LMg%0B=kI zyaVvY6u>(GZ%hHa1MtQaz&ikMGzk!KLBu87MmU3TRtc&nKYvXtJUAW;Kv&+IxzBax zpBYeWr7IBk_di1bm5NXZp!+}KUY-RV_{&8w31A^79I^r2`W!c(Z$=0Hat26(|0B;g z)qwYKpi=u=I2PNbu;8CQz&ikM3@^YAz^1=W@uT|2Pk^42KJ|Wlso0+U!)L%0z&ikM z>{>e4I5A6D@P7}V0aJk12Xg5LB%2UJX!AD-uthEn!joS%1rig|9SZ!zZ-$zd!8J6N zy;dt+!lUW2h2d8Lb_S#cr-u>x&c_?^6lxjJYZ(OeJ|37;fIkIt;AVm5h_+(*3{VxI zbbG4-iyP>+?J%8gfyCEryLBo*nqovRw|?=X`kkyA5P#`(7hydjy;g#CmMx+$AKwZ! zE1bQWGC=82gadUSU}=c7KORsof_5TUd^|9hK|LeXYcKF?Yd{K3K`gz+oC38Sb8Bz8 zzut04I8DUU%#fX%9;TIRd-uD3uwDtrn0X$D} wbC8&@Sp=mo=w*RZXk{VqP}Jyjh6{=KUqpJi>{^8f5dZ)H07*qoM6N<$f`#@1KL7v# delta 408 zcmeysvYdH>WIZzj1H;_yjcNS%G|s0G|-o zh6aZE28PB4hK5FlhI)qjMux^lpd3R$qi7e9;wTC73;quQ4ELJ%Mgqk+3p^r=85sBu zfG}g$wN6f;MJ%2!jv*25ZztWZ7iw1EahV$S_rJX!r!~{VO>3{MEVJQvx{-SIKtXY_ z)v-YK=Or46zt&eK@I0A%;LBacO`8^Ya=#K;_S)&z(SB+HuAKL& zKycmv@P>#zj6n^rpL2bfYM#QkPMs}&g<@&JT?vs6rtAB8ij*VynKoQIxb4JpMyC30 zY(5M+EN?m&?AGy}k^(Q-6D}>CTQIZu z&R^~who*gh|LIvn=zG~E0cY*S-^wLaY4q)BefgW&OyO+j57w6tyDqNPIorn4lgG@} y%&8F