From 226a0b10455edaeb63ffc96c4d144107e8c61dda Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sun, 18 Feb 2024 01:29:30 +0300 Subject: [PATCH 1/4] Urss UPDATE --- Resources/Changelog/ChangelogADT.yml | 11 + .../ADT/Clothing/OuterClothing/furcoat.ftl | 3 + Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl | 3 + .../ru-RU/ADT/Markings/vulpmarkings.ftl | 8 +- Resources/Locale/ru-RU/ADT/Ursus/custom.ftl | 42 ++ .../Prototypes/ADT/Damage/ADTmodifiers.yml | 6 +- .../ADT/Entities/Clothing/Head/Hats/hats.yml | 18 +- .../Entities/Clothing/OuterClothing/coats.yml | 18 + .../Mobs/SecurityCyborg/sec_cyborg.yml | 1 - .../ADT/Entities/Objects/Fun/toys.yml | 10 + .../Mobs/Customization/Markings/Ursus.yml | 399 ++++++++++++++++++ .../ADT/Ursus/Entities/Mobs/Player/Ursus.yml | 13 + .../ADT/Ursus/Entities/Mobs/Species/Ursus.yml | 12 +- .../Prototypes/ADT/Ursus/Species/Ursus.yml | 15 +- .../Mobs/Customization/Markings/Vulpkanin.yml | 18 + .../Customization/Markings/Vulpkanin_hair.yml | 6 +- .../ADT/Vulpkanin/Species/Vulpkanin.yml | 2 +- .../Corvax/Roles/Jobs/Command/iaa.yml | 3 + .../Mobs/Customization/Markings/gauze.yml | 18 +- .../Mobs/Customization/Markings/kobalt.yml | 367 ++++++++-------- .../Mobs/Customization/Markings/reptilian.yml | 72 ++-- .../Entities/Mobs/Customization/ears.yml | 10 +- .../Entities/Mobs/Customization/snouts.yml | 4 +- .../Entities/Mobs/Customization/tails.yml | 16 +- .../urs_coat.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1413 bytes .../OuterClothing/Coats/urs_coat.rsi/icon.png | Bin 0 -> 521 bytes .../Coats/urs_coat.rsi/meta.json | 18 + .../ADT/Mobs/Ursus/custom.rsi/foot_left.png | Bin 0 -> 191 bytes .../ADT/Mobs/Ursus/custom.rsi/foot_right.png | Bin 0 -> 176 bytes .../ADT/Mobs/Ursus/custom.rsi/hand_left.png | Bin 0 -> 180 bytes .../ADT/Mobs/Ursus/custom.rsi/hand_right.png | Bin 0 -> 183 bytes .../ADT/Mobs/Ursus/custom.rsi/meta.json | 16 + .../ADT/Objects/Fun/toys.rsi/meta.json | 3 + .../Objects/Fun/toys.rsi/plushie_ursus.png | Bin 0 -> 755 bytes .../Hats/urs_hat.rsi/equipped-HELMET-urs.png | Bin 0 -> 626 bytes .../Head/Hats/urs_hat.rsi/equipped-HELMET.png | Bin 0 -> 636 bytes .../Clothing/Head/Hats/urs_hat.rsi/icon.png | Bin 0 -> 267 bytes .../Clothing/Head/Hats/urs_hat.rsi/meta.json | 22 + .../vulpkanin_head.rsi/ear_back.png | Bin 0 -> 417 bytes .../vulpkanin_head.rsi/meta.json | 4 + .../vulpkanin_tail.rsi/meta.json | 10 + .../vulpkanin_tail.rsi/tail_m.png | Bin 0 -> 4353 bytes 42 files changed, 879 insertions(+), 269 deletions(-) create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/urs_coat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/urs_coat.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/urs_coat.rsi/meta.json create mode 100644 Resources/Textures/ADT/Mobs/Ursus/custom.rsi/foot_left.png create mode 100644 Resources/Textures/ADT/Mobs/Ursus/custom.rsi/foot_right.png create mode 100644 Resources/Textures/ADT/Mobs/Ursus/custom.rsi/hand_left.png create mode 100644 Resources/Textures/ADT/Mobs/Ursus/custom.rsi/hand_right.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_ursus.png create mode 100644 Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET-urs.png create mode 100644 Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/vulpkanin_head.rsi/ear_back.png create mode 100644 Resources/Textures/Mobs/Customization/vulpkanin_tail.rsi/tail_m.png diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 6e0c6fb69f7..69128b48d9d 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1215,3 +1215,14 @@ Entries: - {message: "Добавлен язык Орлуум", type: Add} id: 55681 #костыль отображения в Обновлениях time: '2024-02-11T08:20:00.0000000+00:00' + + +- author: Xelasto + changes: + - {message: "Добавлен язык Орлуум", type: Add} + - {message: "Добавлен язык Орлуум", type: Add} + - {message: "Добавлен язык Орлуум", type: Add} + - {message: "Добавлен язык Орлуум", type: Add} + id: 55681 #костыль отображения в Обновлениях + time: '2024-02-15T08:20:00.0000000+00:00' + diff --git a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/furcoat.ftl b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/furcoat.ftl index 477af8d7593..bc79cb66c57 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/furcoat.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/furcoat.ftl @@ -18,3 +18,6 @@ ent-ADTClothingOuterSuitChefPovar = поварской китель Шеф-по ent-ADTClothingOuterCoatSchroCoat = плащ Шрёдингера .desc = Это темное-зелёное пальто, тяжелее, чем кажется на первый взгляд + +ent-ADTClothingOuterCoatUrs = костюм Урса + .desc = Очень тёплый пуховик, сделанный точно не из Урса.. diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index 2aaeaed2c9d..642730cf3bb 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -29,3 +29,6 @@ ent-ADTPlushieAfi = плюшевая Афи ent-ADTPlushieRicker = плюшевый Рикер .desc = Милая плюшевая игрушка Унатха красного цвета в одежде главы службы безопасности. От игрушки веет строгостью и верностью. В заде игрушки есть этикетка, которая глоссит "Рога не трогать! Они настоящие"! + +ent-ADTPlushieUrs = плюшевый Урс + .desc = Милая плюшевая игрушка Урса. diff --git a/Resources/Locale/ru-RU/ADT/Markings/vulpmarkings.ftl b/Resources/Locale/ru-RU/ADT/Markings/vulpmarkings.ftl index 3687e0e90fc..24d94c1612c 100644 --- a/Resources/Locale/ru-RU/ADT/Markings/vulpmarkings.ftl +++ b/Resources/Locale/ru-RU/ADT/Markings/vulpmarkings.ftl @@ -1,7 +1,8 @@ marking-ADTVulpkanintail1 = Хвост 1 marking-ADTVulpkanintail2 = Хвост 2 - +marking-ADTVulpkanintailAll = Весь хвост marking-ADTVulpkaninear = Окрас ушей +marking-ADTVulpkaninearBack = Окраска ушей marking-ADTVulpkaninmuzzle = Окрас лица marking-ADTVulpkaninmuzzleear = Окрас лица и ушей marking-ADTVulpkaninnose = Окрас носа @@ -18,8 +19,3 @@ marking-ADTVulpkaninfullbelly = Окрас живота marking-ADTVulpkaninpointsfade = Окрас лап marking-ADTVulpkaninpointsfadebelly = Пятнистый окрас лап, груди и живота marking-ADTVulpkaninsharppoints = Резкие пятна -marking-ADTVulpkanintail2 = Хвост 2 -marking-ADTVulpkanintail2 = Хвост 2 -marking-ADTVulpkanintail2 = Хвост 2 -marking-ADTVulpkanintail2 = Хвост 2 -marking-ADTVulpkanintail2 = Хвост 2 diff --git a/Resources/Locale/ru-RU/ADT/Ursus/custom.ftl b/Resources/Locale/ru-RU/ADT/Ursus/custom.ftl index 5b9a11db0d1..fe7533af34c 100644 --- a/Resources/Locale/ru-RU/ADT/Ursus/custom.ftl +++ b/Resources/Locale/ru-RU/ADT/Ursus/custom.ftl @@ -25,3 +25,45 @@ marking-ADTUrsusFallencone = Упавшая шишка marking-ADTUrsusTailbigdipper = Хвост большой медведицы marking-ADTUrsusCone = Шишка marking-ADTUrsusYoungboy = Юный молодец +marking-ADTUrsusfluffiness = Покров 1 +marking-ADTUrsusfluffiness2 = Покров 2 +marking-ADTUrsusfluffiness3 = Покров 3 +marking-ADTUrsuspanda = Панда +marking-ADTUrsusspace_bear = Космический медведь +marking-ADTUrsustattoo_leader = Лидер +marking-ADTUrsusbig_heart = Большое сердце +marking-ADTUrsussoft_belly = Мягкое пузико 1 +marking-ADTUrsussoft_belly2 = Мягкое пузико 2 +marking-ADTUrsusgrizzly_necklace = Ожерелье гризли 1 +marking-ADTUrsusgrizzly_necklace2 = Ожерелье гризли 2 +marking-ADTUrsusgrizzly_necklace3 = Ожерелье гризли 3 +marking-ADTUrsusMuzzle = Морда 1 +marking-ADTUrsusMuzzle2 = Морда 2 +marking-ADTUrsusnose = Нос +marking-ADTUrsusears = Уши 1 +marking-ADTUrsusears2 = Уши 2 +marking-ADTUrsusthird_eye = Третий глаз +marking-ADTUrsusarrow = Стрела +marking-ADTUrsusembarrassment = Стестняшки +marking-ADTUrsusspots = Пятна +marking-ADTUrsusspots_left = Пятно слева +marking-ADTUrsusspots_right = Пятно справа +marking-ADTUrsusrigth_eye = Правый глаз +marking-ADTUrsusleft_eye = Левый глаз +marking-ADTUrsusstar = Звезда +marking-ADTUrsuskiss = Кисс +marking-ADTUrsuseyeliner = Подводка +marking-ADTUrsushand_left = Левая рука +marking-ADTUrsusgradienthand_left = Левая рука градиент 1 +marking-ADTUrsusgradienthand_left2 = Левая рука градиент 2 +marking-ADTUrsushand_right = Правая рука +marking-ADTUrsusgradienthand_right = Правая рука градиент 1 +marking-ADTUrsusgradienthand_right2 = Правая рука градиент 2 +marking-ADTUrsusfoot_left = Левая ступня +marking-ADTUrsusgradientfoot_left = Левая ступня градиент 1 +marking-ADTUrsusgradientfoot_left2 = Левая ступня градиент 2 +marking-ADTUrsusfoot_right = Правая ступня +marking-ADTUrsusgradientfoot_right = Правая ступня градиент 1 +marking-ADTUrsusgradientfoot_right2 = Правая ступня градиент 2 +marking-ADTUrsuscardigan = Кардиган1(Спина) +marking-ADTUrsuscardigan2 = Кардиган2(Спина) diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml index 76d4aab44f7..cd7efde5c7f 100644 --- a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml +++ b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml @@ -2,8 +2,8 @@ id: Fur # 1) - ебучий годспид, балансим уроном. 2) - шерсть должна гореть coefficients: Blunt: 1 - Piercing: 1.4 - Slash: 1.4 + Piercing: 1.2 + Slash: 1.2 Cold: 0.6 Heat: 1.5 Poison: 1 @@ -73,7 +73,7 @@ - type: damageModifierSet - id: CyborgMetallicStrong + id: CyborgMetallicStrong coefficients: Blunt: 0.6 Slash: 0.6 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml index b25b98d138f..be2a9feef5d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml @@ -314,7 +314,7 @@ description: A cap with rounded crown and short margins. Sewn from thick fabric, that makes it perfect for cold weather. Made by company "Modeling Agency Dar-Vaxed". components: - type: Sprite - sprite: ADT/Clothing/Head/Hats/cinnamon_flat_cap.rsi + sprite: ADT/Clothing/Head/Hats/cinnamon_flat_cap.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/cinnamon_flat_cap.rsi #спрайты от prazat911 @@ -325,7 +325,7 @@ description: A cap with rounded crown and short margins. Sewn from thick fabric, that makes it perfect for cold weather. Made by company "Modeling Agency Dar-Vaxed". components: - type: Sprite - sprite: ADT/Clothing/Head/Hats/grey_flat_cap.rsi + sprite: ADT/Clothing/Head/Hats/grey_flat_cap.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/grey_flat_cap.rsi #спрайты от prazat911 @@ -351,7 +351,7 @@ sprite: ADT/Clothing/Head/Hats/beret_HOP.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/beret_HOP.rsi - + - type: entity parent: ClothingHeadBase id: ADTClothingHeadHatsBeretSOO @@ -558,3 +558,15 @@ sprite: ADT/Clothing/Head/Hats/sport_step_hat.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/sport_step_hat.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadUrsHat + name: urs hat + description: A futuristic looking striped hat from "STEP" clothing series. + components: + - type: Sprite + sprite: Clothing/Head/Hats/urs_hat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/urs_hat.rsi +#Resources\Textures\Clothing\Head\Hats\urs_hat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index a7e71da3a07..526f0e8be90 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -91,3 +91,21 @@ Heat: 0.8 - type: ExplosionResistance damageCoefficient: 0.90 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatUrs + name: Aidan coat + description: Aidan coat. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/urs_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/urs_coat.rsi + - type: TemperatureProtection + coefficient: 0.9 + - type: Armor + modifiers: + coefficients: + Slash: 0.95 + Heat: 0.90 diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml index 0d160008814..6bee085b885 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml @@ -6,7 +6,6 @@ components: - type: InteractionPopup interactSuccessString: petting-success-ipc - #interactFailureString: petting-failure-cleanbot interactSuccessSound: path: /Audio/Ambience/Objects/periodic_beep.ogg - type: SuitSensor diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 3b40a6e546f..9c43871d0df 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -533,3 +533,13 @@ - type: Sprite sprite: ADT/Objects/Fun/toys.rsi state: plushie_riker + +- type: entity + parent: BasePlushie + id: ADTPlushieUrs + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_ursus diff --git a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Customization/Markings/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Customization/Markings/Ursus.yml index e69de29bb2d..f43528cd7b7 100644 --- a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Customization/Markings/Ursus.yml +++ b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Customization/Markings/Ursus.yml @@ -0,0 +1,399 @@ +#наложение +- type: marking + id: ADTUrsusfluffiness + bodyPart: LLeg + markingCategory: Overlay + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: fluffiness + +- type: marking + id: ADTUrsusfluffiness2 + bodyPart: LLeg + markingCategory: Overlay + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: fluffiness2 + +- type: marking + id: ADTUrsusfluffiness3 + bodyPart: LLeg + markingCategory: Overlay + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: fluffiness3 + +- type: marking + id: ADTUrsuspanda + bodyPart: LLeg + markingCategory: Overlay + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: panda + +- type: marking + id: ADTUrsusspace_bear + bodyPart: LLeg + markingCategory: Overlay + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: space_bear + +- type: marking + id: ADTUrsustattoo_leader + bodyPart: LLeg + markingCategory: Overlay + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: tattoo_leader + +# - type: marking +# id: DionaVineOverlay +# bodyPart: LLeg +# markingCategory: Overlay +# speciesRestriction: [Diona] +# coloring: +# default: +# type: +# !type:SimpleColoring +# color: "#5f7039" +# sprites: +# - sprite: Mobs/Customization/diona.rsi +# state: overlay + + +#грудь +- type: marking + id: ADTUrsusbig_heart + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: big_heart + +- type: marking + id: ADTUrsussoft_belly + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: soft_belly + +- type: marking + id: ADTUrsussoft_belly2 + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: soft_belly2 + +- type: marking + id: ADTUrsusgrizzly_necklace + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: grizzly_necklace + +- type: marking + id: ADTUrsusgrizzly_necklace2 + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: grizzly_necklace2 + +- type: marking + id: ADTUrsusgrizzly_necklace3 + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: grizzly_necklace3 + +#лицо + +- type: marking + id: ADTUrsusMuzzle + bodyPart: Head + markingCategory: Snout + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: Muzzle + +- type: marking + id: ADTUrsusMuzzle2 + bodyPart: Head + markingCategory: Snout + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: Muzzle2 + +- type: marking + id: ADTUrsusnose + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: nose + +- type: marking + id: ADTUrsusears + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: ears + +- type: marking + id: ADTUrsusears2 + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: ears2 + +- type: marking + id: ADTUrsusthird_eye + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: third_eye + +- type: marking + id: ADTUrsusarrow + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: arrow + +- type: marking + id: ADTUrsusembarrassment + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: embarrassment + +- type: marking + id: ADTUrsusspots + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: spots + +- type: marking + id: ADTUrsusspots_left + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: spots_left + +- type: marking + id: ADTUrsusspots_right + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: spots_right + +- type: marking + id: ADTUrsusrigth_eye + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: rigth_eye + +- type: marking + id: ADTUrsusleft_eye + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: left_eye + +- type: marking + id: ADTUrsusstar + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: star + +- type: marking + id: ADTUrsuskiss + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: kiss + +- type: marking + id: ADTUrsuseyeliner + bodyPart: Head + markingCategory: Head + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: eyeliner + +#Части тел. +- type: marking + id: ADTUrsushand_left + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: hand_left + +- type: marking + id: ADTUrsusgradienthand_left + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: gradienthand_left + +- type: marking + id: ADTUrsusgradienthand_left2 + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: gradienthand_left2 + +- type: marking + id: ADTUrsushand_right + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: hand_right + +- type: marking + id: ADTUrsusgradienthand_right + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: gradienthand_right + +- type: marking + id: ADTUrsusgradienthand_right2 + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: gradienthand_right2 + +- type: marking + id: ADTUrsusfoot_left + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: foot_left + +- type: marking + id: ADTUrsusgradientfoot_left + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: gradientfoot_left + +- type: marking + id: ADTUrsusgradientfoot_left2 + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: gradientfoot_left2 + +- type: marking + id: ADTUrsusfoot_right + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: foot_right + +- type: marking + id: ADTUrsusgradientfoot_right + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: gradientfoot_right + +- type: marking + id: ADTUrsusgradientfoot_right2 + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: gradientfoot_right2 + +#спина + +- type: marking + id: ADTUrsuscardigan + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: cardigan + +- type: marking + id: ADTUrsuscardigan2 + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [UrsusSpecies] + sprites: + - sprite: ADT/Mobs/Ursus/custom.rsi + state: cardigan2 diff --git a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml index d4fc45bdaa7..0a7acdd4a64 100644 --- a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml +++ b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml @@ -4,6 +4,19 @@ parent: BaseMobUrsus id: MobUrsus components: + - type: Inventory + speciesId: urs #для одежды на урсов + - type: Temperature + heatDamageThreshold: 320 + coldDamageThreshold: 250 + currentTemperature: 280 + specificHeat: 50 + coldDamage: + types: + Cold: 0.005 #per second, scales with temperature & other constants + heatDamage: + types: + Heat: 1.5 #per second, scales with temperature & other constants - type: CombatMode - type: InteractionPopup successChance: 1 diff --git a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml index e494aa60e12..74faf2b30ad 100644 --- a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml +++ b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml @@ -11,10 +11,12 @@ types: Cold: 0.05 Bloodloss: 0.05 + baseDecayRate: 0.0983 + - type: Thirst + #baseDecayRate: 0.0083 - type: Icon sprite: ADT/Mobs/Ursus/parts.rsi state: full - - type: Thirst - type: Butcherable butcheringType: Spike spawned: @@ -24,10 +26,16 @@ soundHit: collection: Punch animation: WeaponArcClaw + damage: + types: + Blunt: 6.5 + Slash: 3.5 + - type: DamageOnHighSpeedImpact damage: types: Blunt: 0.9 - Slash: 5 + soundHit: + path: /Audio/Effects/hit_kick.ogg - type: Damageable damageContainer: Biological damageModifierSet: Ursus diff --git a/Resources/Prototypes/ADT/Ursus/Species/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Species/Ursus.yml index d9a54624667..53a8dd5b089 100644 --- a/Resources/Prototypes/ADT/Ursus/Species/Ursus.yml +++ b/Resources/Prototypes/ADT/Ursus/Species/Ursus.yml @@ -1,7 +1,7 @@ - type: species id: UrsusSpecies name: species-name-Ursus - roundStart: false + roundStart: true prototype: MobUrsus sprites: MobUrsusSprites defaultSkinTone: "#964B00" @@ -13,6 +13,7 @@ maleLastNames: LastMaleUrs femaleLastNames: LastFemaleUrs naming: firstlast + sponsorOnly: true - type: speciesBaseSprites id: MobUrsusSprites @@ -38,25 +39,25 @@ onlyWhitelisted: true points: Head: - points: 1 + points: 5 required: false Hair: points: 1 required: false HeadTop: - points: 1 + points: 5 required: true HeadSide: - points: 1 + points: 5 required: true Chest: - points: 1 + points: 2 required: true Tail: - points: 1 + points: 2 required: false Snout: - points: 1 + points: 2 required: false Legs: points: 2 diff --git a/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin.yml index 4f3a40ef218..e11f5adfe98 100644 --- a/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin.yml +++ b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin.yml @@ -88,6 +88,15 @@ - sprite: Mobs/Customization/vulpkanin_tail.rsi state: tail2 +- type: marking + id: ADTVulpkanintailAll + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [VulpkaninSpecies] + sprites: + - sprite: Mobs/Customization/vulpkanin_tail.rsi + state: tail_m + #- type: marking # id: ADTVulpkanintail3 # bodyPart: Tail @@ -106,6 +115,15 @@ - sprite: Mobs/Customization/vulpkanin_head.rsi state: ear +- type: marking + id: ADTVulpkaninearBack + bodyPart: Head + markingCategory: Head + speciesRestriction: [VulpkaninSpecies] + sprites: + - sprite: Mobs/Customization/vulpkanin_head.rsi + state: ear_back + - type: marking id: ADTVulpkaninmuzzle bodyPart: Head diff --git a/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml index b78f2e9c0e0..6027f7f48da 100644 --- a/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml +++ b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml @@ -66,7 +66,7 @@ bodyPart: Hair markingCategory: Hair speciesRestriction: [VulpkaninSpecies] - sponsorOnly: true + #sponsorOnly: true sprites: - sprite: Mobs/Customization/vulpkanin_hair.rsi state: hair_sponsor @@ -85,7 +85,7 @@ bodyPart: Hair markingCategory: Hair speciesRestriction: [VulpkaninSpecies] - sponsorOnly: true + #sponsorOnly: true sprites: - sprite: Mobs/Customization/vulpkanin_hair.rsi state: jagged_sponsor_hair @@ -185,7 +185,7 @@ bodyPart: Hair markingCategory: Hair speciesRestriction: [VulpkaninSpecies] - sponsorOnly: true + #sponsorOnly: true sprites: - sprite: Mobs/Customization/vulpkanin_hair.rsi state: ykiteru_sponsor_hair diff --git a/Resources/Prototypes/ADT/Vulpkanin/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Species/Vulpkanin.yml index 7c87853b87d..140485d90a2 100644 --- a/Resources/Prototypes/ADT/Vulpkanin/Species/Vulpkanin.yml +++ b/Resources/Prototypes/ADT/Vulpkanin/Species/Vulpkanin.yml @@ -45,7 +45,7 @@ points: 1 required: false Head: - points: 3 + points: 4 required: false - type: humanoidBaseSprite id: MobVulpkaninEyes diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml index 35a5cafa224..ab605269222 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml @@ -21,6 +21,9 @@ - Command - External - IAA + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] - type: startingGear id: IAAGear diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 407ea1c7ba8..d66552d7ab6 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -81,7 +81,7 @@ sprites: - sprite: Mobs/Customization/gauze.rsi state: gauze_shoulder - + - type: marking id: GauzeStomach bodyPart: Chest @@ -179,7 +179,7 @@ sprites: - sprite: Mobs/Customization/gauze.rsi state: gauze_upperleg_r - + - type: marking id: GauzeLowerLegRight bodyPart: RFoot @@ -193,7 +193,7 @@ sprites: - sprite: Mobs/Customization/gauze.rsi state: gauze_lowerleg_r - + - type: marking id: GauzeBoxerWrapRight bodyPart: RHand @@ -207,7 +207,7 @@ sprites: - sprite: Mobs/Customization/gauze.rsi state: gauze_boxerwrap_r - + - type: marking id: GauzeBoxerWrapLeft bodyPart: LHand @@ -227,7 +227,7 @@ id: GauzeLizardLefteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] coloring: default: type: @@ -241,7 +241,7 @@ id: GauzeLizardRighteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] coloring: default: type: @@ -255,7 +255,7 @@ id: GauzeLizardFootRight bodyPart: RFoot markingCategory: Legs - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] coloring: default: type: @@ -269,7 +269,7 @@ id: GauzeLizardFootLeft bodyPart: LFoot markingCategory: Legs - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] coloring: default: type: @@ -283,7 +283,7 @@ id: GauzeLizardBlindfold bodyPart: Eyes markingCategory: Head - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kobalt.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kobalt.yml index 662f939ac9a..0677b44da0a 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kobalt.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kobalt.yml @@ -1,183 +1,184 @@ -- type: marking - id: LizardFrillsAquatic2 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: frills_aquatic - -- type: marking - id: LizardFrillsShort2 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: frills_short - -- type: marking - id: LizardFrillsSimple2 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: frills_simple - -- type: marking - id: LizardFrillsDivinity2 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: frills_divinity - -- type: marking - id: LizardFrillsBig2 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: frills_big - -- type: marking - id: LizardFrillsAxolotl2 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: frills_axolotl - -- type: marking - id: LizardFrillsHood2 - bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: frills_hood_primary - - sprite: Mobs/Customization/reptilian_parts.rsi - state: frills_hood_secondary - -- type: marking - id: LizardHornsAngler2 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: horns_angler - -- type: marking - id: LizardHornsCurled2 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: horns_curled - -- type: marking - id: LizardHornsRam2 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: horns_ram - -- type: marking - id: LizardHornsShort2 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: horns_short - -- type: marking - id: LizardHornsSimple2 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: horns_simple - -- type: marking - id: LizardHornsDouble2 - bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: horns_double - -- type: marking - id: LizardTailSmooth2 - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: tail_smooth - -- type: marking - id: LizardTailSpikes2 - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: tail_spikes - -- type: marking - id: LizardTailLTiger2 - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: tail_ltiger - -- type: marking - id: LizardTailDTiger2 - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: tail_dtiger - -- type: marking - id: LizardSnoutRound2 - bodyPart: Snout - markingCategory: Snout - forcedColoring: true - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: snout_round - -- type: marking - id: LizardSnoutSharp2 - bodyPart: Snout - markingCategory: Snout - forcedColoring: true - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: snout_sharp - -- type: marking - id: LizardChestTiger2 - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [KoboltSpecies] - sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi - state: body_tiger +# просто всё вписал к унатхам +# - type: marking +# id: LizardFrillsAquatic2 +# bodyPart: HeadSide +# markingCategory: HeadSide +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: frills_aquatic + +# - type: marking +# id: LizardFrillsShort2 +# bodyPart: HeadSide +# markingCategory: HeadSide +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: frills_short + +# - type: marking +# id: LizardFrillsSimple2 +# bodyPart: HeadSide +# markingCategory: HeadSide +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: frills_simple + +# - type: marking +# id: LizardFrillsDivinity2 +# bodyPart: HeadSide +# markingCategory: HeadSide +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: frills_divinity + +# - type: marking +# id: LizardFrillsBig2 +# bodyPart: HeadSide +# markingCategory: HeadSide +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: frills_big + +# - type: marking +# id: LizardFrillsAxolotl2 +# bodyPart: HeadSide +# markingCategory: HeadSide +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: frills_axolotl + +# - type: marking +# id: LizardFrillsHood2 +# bodyPart: HeadSide +# markingCategory: HeadSide +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: frills_hood_primary +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: frills_hood_secondary + +# - type: marking +# id: LizardHornsAngler2 +# bodyPart: HeadTop +# markingCategory: HeadTop +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: horns_angler + +# - type: marking +# id: LizardHornsCurled2 +# bodyPart: HeadTop +# markingCategory: HeadTop +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: horns_curled + +# - type: marking +# id: LizardHornsRam2 +# bodyPart: HeadTop +# markingCategory: HeadTop +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: horns_ram + +# - type: marking +# id: LizardHornsShort2 +# bodyPart: HeadTop +# markingCategory: HeadTop +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: horns_short + +# - type: marking +# id: LizardHornsSimple2 +# bodyPart: HeadTop +# markingCategory: HeadTop +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: horns_simple + +# - type: marking +# id: LizardHornsDouble2 +# bodyPart: HeadTop +# markingCategory: HeadTop +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: horns_double + +# - type: marking +# id: LizardTailSmooth2 +# bodyPart: Tail +# markingCategory: Tail +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: tail_smooth + +# - type: marking +# id: LizardTailSpikes2 +# bodyPart: Tail +# markingCategory: Tail +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: tail_spikes + +# - type: marking +# id: LizardTailLTiger2 +# bodyPart: Tail +# markingCategory: Tail +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: tail_ltiger + +# - type: marking +# id: LizardTailDTiger2 +# bodyPart: Tail +# markingCategory: Tail +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: tail_dtiger + +# - type: marking +# id: LizardSnoutRound2 +# bodyPart: Snout +# markingCategory: Snout +# forcedColoring: true +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: snout_round + +# - type: marking +# id: LizardSnoutSharp2 +# bodyPart: Snout +# markingCategory: Snout +# forcedColoring: true +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: snout_sharp + +# - type: marking +# id: LizardChestTiger2 +# bodyPart: Chest +# markingCategory: Chest +# speciesRestriction: [KoboltSpecies] +# sprites: +# - sprite: Mobs/Customization/reptilian_parts.rsi +# state: body_tiger diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 70bee00e4d9..5a5b0bbe813 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -2,7 +2,7 @@ id: LizardFrillsAquatic bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_aquatic @@ -11,7 +11,7 @@ id: LizardFrillsShort bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_short @@ -20,7 +20,7 @@ id: LizardFrillsSimple bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_simple @@ -29,7 +29,7 @@ id: LizardFrillsDivinity bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_divinity @@ -38,7 +38,7 @@ id: LizardFrillsBig bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_big @@ -47,7 +47,7 @@ id: LizardFrillsAxolotl bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_axolotl @@ -56,7 +56,7 @@ id: LizardFrillsHood bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_hood_primary @@ -67,7 +67,7 @@ id: LizardHornsAngler bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_angler @@ -76,7 +76,7 @@ id: LizardHornsCurled bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_curled @@ -85,7 +85,7 @@ id: LizardHornsRam bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_ram @@ -94,7 +94,7 @@ id: LizardHornsShort bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_short @@ -103,7 +103,7 @@ id: LizardHornsSimple bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_simple @@ -112,7 +112,7 @@ id: LizardHornsDouble bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_double @@ -121,7 +121,7 @@ id: LizardTailSmooth bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_smooth @@ -130,7 +130,7 @@ id: LizardTailLarge bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_large @@ -139,7 +139,7 @@ id: LizardTailSpikes bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_spikes @@ -148,7 +148,7 @@ id: LizardTailLTiger bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_ltiger @@ -157,7 +157,7 @@ id: LizardTailDTiger bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_dtiger @@ -167,7 +167,7 @@ bodyPart: Snout markingCategory: Snout forcedColoring: true - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: snout_round @@ -177,7 +177,7 @@ bodyPart: Snout markingCategory: Snout forcedColoring: true - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: snout_roundlight @@ -187,7 +187,7 @@ bodyPart: Snout markingCategory: Snout forcedColoring: true - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: snout_sharp @@ -197,7 +197,7 @@ bodyPart: Snout markingCategory: Snout forcedColoring: true - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: snout_sharplight @@ -206,7 +206,7 @@ id: LizardChestTiger bodyPart: Chest markingCategory: Chest - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: body_tiger @@ -215,7 +215,7 @@ id: LizardHeadTiger bodyPart: Head markingCategory: Head - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: head_tiger @@ -224,7 +224,7 @@ id: LizardLArmTiger bodyPart: LArm markingCategory: Arms - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: l_arm_tiger @@ -233,7 +233,7 @@ id: LizardLLegTiger bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: l_leg_tiger @@ -242,7 +242,7 @@ id: LizardRArmTiger bodyPart: RArm markingCategory: Arms - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: r_arm_tiger @@ -251,7 +251,7 @@ id: LizardRLegTiger bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: r_leg_tiger @@ -260,7 +260,7 @@ id: LizardHornsArgali bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_argali @@ -269,7 +269,7 @@ id: LizardHornsAyrshire bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_ayrshire @@ -278,7 +278,7 @@ id: LizardHornsMyrsore bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_myrsore @@ -287,7 +287,7 @@ id: LizardHornsBighorn bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_bighorn @@ -296,7 +296,7 @@ id: LizardHornsKoboldEars bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_kobold_ears @@ -305,7 +305,7 @@ id: LizardHornsFloppyKoboldEars bodyPart: HeadSide markingCategory: HeadSide - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_floppy_kobold_ears @@ -314,7 +314,7 @@ id: LizardChestUnderbelly bodyPart: Chest markingCategory: Chest - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: body_underbelly @@ -323,7 +323,7 @@ id: LizardChestBackspikes bodyPart: Chest markingCategory: Chest - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: body_backspikes diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/ears.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/ears.yml index e46a2178482..159c2c82156 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/ears.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/ears.yml @@ -13,7 +13,7 @@ id: EarsChemlight bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/ears.rsi state: chemlight_outer @@ -24,7 +24,7 @@ id: EarsDragonLong bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/ears.rsi state: dragonlong @@ -33,7 +33,7 @@ id: EarsEasternD bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/ears.rsi state: easternd_ears @@ -44,7 +44,7 @@ id: EarsMagus bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/ears.rsi state: magus_ears @@ -75,7 +75,7 @@ id: EarsSylveon bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Reptilian, SlimePerson] + speciesRestriction: [Reptilian, KoboltSpecies, SlimePerson] sprites: - sprite: SimpleStation14/Mobs/Customization/ears.rsi state: sylveon_primary diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/snouts.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/snouts.yml index 3f50989e65b..63b42430347 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/snouts.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/snouts.yml @@ -2,7 +2,7 @@ id: SnoutEasternDNW bodyPart: Snout markingCategory: Snout - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/snouts.rsi state: easterndnw_primary @@ -13,7 +13,7 @@ id: SnoutEasternDW bodyPart: Snout markingCategory: Snout - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/snouts.rsi state: easterndw_primary diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/tails.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/tails.yml index 8995b555db4..d428840c677 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/tails.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Customization/tails.yml @@ -2,7 +2,7 @@ id: TailAxolotl bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/tails32x32.rsi state: axolotl @@ -11,7 +11,7 @@ id: TailDatashark bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/tails32x32.rsi state: datashark_ears_inner @@ -28,7 +28,7 @@ id: TailEasternDragon bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/tails32x32.rsi state: easternd_primary @@ -39,7 +39,7 @@ id: TailFish bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/tails32x32.rsi state: fish_primary @@ -50,7 +50,7 @@ id: TailGecko bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/tails32x32.rsi state: gecko_primary @@ -63,7 +63,7 @@ id: TailMaw bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian, SlimePerson] + speciesRestriction: [Reptilian, KoboltSpecies, SlimePerson] sprites: - sprite: SimpleStation14/Mobs/Customization/tails32x32.rsi state: maw @@ -72,7 +72,7 @@ id: TailShark bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian] + speciesRestriction: [Reptilian, KoboltSpecies] sprites: - sprite: SimpleStation14/Mobs/Customization/tails32x32.rsi state: shark_fin @@ -83,7 +83,7 @@ id: TailSnake bodyPart: Tail markingCategory: Tail - speciesRestriction: [Reptilian, SlimePerson] + speciesRestriction: [Reptilian, KoboltSpecies, SlimePerson] sprites: - sprite: SimpleStation14/Mobs/Customization/tails32x32.rsi state: snake diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/urs_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/urs_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..3be75bc8d65bdadf5b1c0b785bc2a8f60c8d271f GIT binary patch literal 1413 zcmV;01$z34P)e;}KD<81l^ zUG*aZWHvSe*nlK4A+xM z=Dh4UmGL|eNs{2{>B+hk==iAx(yt7v0QxoMFAad_dD*oPBKtT6LIyd`7=!wrYXFM) z%K~7_Z!`-CA;3A$94BX!B-yJKDkmFpC}e)QTgd!j7$Qj$YyQdr2qCinp6Bg-SPp<( zRtQl`5LA94gti5$e5U+`0f?d~bC{yeIfoDejIpfA0eR;KgF#jsLI`StX5JR?Pp4Bv zQIvD8?7ii3iQ#Z)#9tVIp4Y`O`vCyZc@a21@<8LUYJhzG@yNsRi$Lmi0k4baB*m=M z)oT8!!~15Kj>YPkOG!5yVxy=2AMs_->I`XR{z6{Pe(lj;VH_8M4jVPN5Y+w`sc?wde zMs>;~xJ-RTkXM5;KSAY>q6o8@+1z8?OnbdvN~Dx=#c|xB6`TBQu~^i;A<`7T+1w@} zNs?R=RCKQ?)Xi@^2K4)Vc%Fwa46}^z_VyOT;c)N%VzF>C<~{h01E8+=slTn)Yj~cQ z-ERs_@f&r4@pzm|r^-@cUHL=NB!6W9#^Z4+_b(zV`UQ5iRaX$2=CAAmx~8S80a~h- zz2}1W=5NuWMT-_KTD17j!fM@KrO;?X7}2yHRtAqoql{R0ME=>5+yz%aD(ex{<9Ps> zOeXaQ;QahN7xf~ofUQKu20EFHs!JfuX0v)XMT-^}WWcqg7kCT&t`TIoz__M--_Nyx zP|@tjo0K+9&<1iB)Cn?V)TR+4(B>nsTYj$B>)a`=Dq}Hif~HWrpj_je^Gpyy*QNom zJ{O=hcaeO>MbBdcU5!)gb2*Z?3V?3+g(6P|xoUcI?p_cCST2_biKBF2j3J7my}|DC@^VkPLOaGLFb=?UI>qo~4?lhQ0Q~h0 z0MLCs27ga;}XW01vAbrhl4mi(4OzY_{9IdvCQDCx2Vl)OEI1!8!m$wApU8 zXYWl8g1T>Sgvji1fz=>5e|*B=$A7M6EkIqOC=eU74plSumY%ztiPOxbC`5uYTAuZrPx$!%0LzR9J=WltGTuFc?N(9xjVjfp zji-Ojrm@@%O~N2{d7C8iSAQ>YZ5SCD85zhegj)#znrSl~60+8YcXiG3TmtX~CTTIi zN8s_Cuj_j9$H`jshOD)rEK30Hs)|Qo34Bj7P4N=AU#$RGuh$Hb=nPnEL!Rf%=W_r= zeHcRmL0yidOCa(aPoRrzr;F7mXNuS?N4YQLHOa><7-~&H8zCdp=fS?83{1OOxxMOFX+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Ursus/custom.rsi/foot_right.png b/Resources/Textures/ADT/Mobs/Ursus/custom.rsi/foot_right.png new file mode 100644 index 0000000000000000000000000000000000000000..318a68fcb8c3006828b87ed37941557976db3c25 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP%z2U z#WAE}&f8n3c^ec2SOTt@z1eT_`oQYW>8|E=hpN+0`0OxR%Lr5m1U?Fz*sI^)epz%R zDmwkn-MG_NC+JJRoLvQxWnie&+skiJRjnN`Gya?HzbkDEtkQqg9^gAyFF$$C?Mf|> NGEY}Omvv4FO#r^!JAnWI literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Ursus/custom.rsi/hand_left.png b/Resources/Textures/ADT/Mobs/Ursus/custom.rsi/hand_left.png new file mode 100644 index 0000000000000000000000000000000000000000..902a8422dfff6cd8246ed5bf2ed2d34038d7a558 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP%zEY z#WAE}&f8m#Tnz?1EC;T!|GH6U5EmMtu_fT_nYGhnIrge91*&71;4LdFA^0{Z;PpPI zYm;+J9$a4{e?Ua=;=B9htvVnD3=9hEHNP_&fBTVN`@B5A{MXltUyOg6q?s5Pe#!3f VS5y79cJCgLGEY}Omvv4FO#q8aJ(>Uj literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Ursus/custom.rsi/hand_right.png b/Resources/Textures/ADT/Mobs/Ursus/custom.rsi/hand_right.png new file mode 100644 index 0000000000000000000000000000000000000000..dae728a8c9fe4399ace28ebce05bb460171e6a03 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP%zWe z#WAE}&f8nwTnz?1tPZakZFBU0#Aq-2p{X_Zrr8De6MB*$GZ=maeUqDf#kEi~__oFO zxo2&*^?t6sYyKc$(k{8x>whPwfz&WCELeN@cY|*JJsy>n{{OH4t=jXOEhgzdAH#wF YXE#=Ay{AdxB*=mCN%1V}y6o_K^l zV&9;*9($_9sZxQefLbI13WZI<$*wmL_h7B-kT`L|v5XWc-u>1yp8aMQp7D(T9l2qX zZ(gm209K*E=YzwcwY%$Uq3(15`10d;Xl)YtQRJIj8|Y4l-SxF_6#3@XM$g(TNL9MM zQVn-@UgNh~=pf+W;F#IzY0Osw+;_VurEndGm&;|WViAC&!xMxMoZg6$PNX`ZlwyDX zYbrUwR6dVw+xYD^XFu!cAmHfm1f^7lZ;vokVXaaQrIb__7yHPQFizOEjZz9JWu~tm zDFCwXrx7s@ISknXi2A_%Kl59Bzxs_;w6Ka6xm+$DGq7!&QmK@cd$fQgq?9z9O$t^a z{wWoWJq1%)imal=_R2D=tIPPU766wQS8PyWNQe40S*$)$?+{)#Ag)PdznH zAs;Egpe>_V=^)_!-dp^;yMc8|DZZW8GdCb)NI|Vq4k2o=nVA>yxDIqI%;a85NvTvC zOGIi9)GFmLnQJL!UyYdq@H`LOwh=;Po{CpU$Zbb2Skl{Uccz8HS?wy zj2l^980dhM65F=pXOsQCy>~q+(1At=I(kt)kKbk*W zTKBC}O7ZaUz^^~IlivlV0bR$z^SqwM(?QTj{y2)`A~l9RC*Z9Qfb0HiOy5^Do40*u zz>@_$P5{7VqXCUZ-(uHwaUBO>qBCHifYTe1t3sH3PFq}a-4J@+8fX6p3K&J2#2~lE l#aLI1mk1%2ih?Ezhb54HIA`0aflocEbOdJibe64U84s^1Xa z+INDYD8%DNC*X8Cb@nOCGOFKq*7Xx3{vG~o;{O3eL_|bHL_|bHMD&e`is?AtDyd78J>G2HpUa+|0s3U zmStHz*S+|*W{E^zFm)dJRI;mpG$^~_INnl)c=%HJ|y9_X9wOQNhsaft%&{5a0juWs-n*#KQ785fKp)5fKp)5&bCt03p&tj*^buvH$=8 M07*qoM6N<$f*evNi2wiq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..529fcc155813b1f23fe26bb9a07aa4aea8c877b1 GIT binary patch literal 636 zcmV-?0)zdDP)X? znx3}%`}1et_u;y(^*~HSQIrFxD_-5o=OsjUK)2h)e!u^B;Q1MddL#BqGJ^E6EnmmZ0aRKzbPo@Lp215S5=O?=TJc&+ogCSUEpeD%xwHt~%g zfh0-LZnurv-9j}9wu}>SI2^9FNs`2hHGqhSh=_=Y zh=_=Y{&V6Y=3=qX{`&6qdKde36-TS(@7->vwHb{@qS&Iw)9F;3yytlr`+puD@MMu# z6Tg7`_sh%0vF&!NwVO;PA735^^m5c-Fwp98kDCpi`h7{a#vV5tEuQCjSglspeTuHs za5&5XU_2h5kJb4ufQj;BF`LZ*0L$gFo;#pW*E;|<-a8g?0+dpPx##Ysd#R9J=WlRXN^X?vWw4$Wd~O48BKZ?>1!fXb5+8C*L$Cr^ zYl|@kIpxxDjFH@w<36b3zVGDWRQC#$*G>Kb0P_t9f*=Tg$rIqZT46z_ Rlal}d002ovPDHLkV1mf0Z*~9x literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/meta.json new file mode 100644 index 00000000000..df5abc057db --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by lunalita for ADT", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-urs", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/vulpkanin_head.rsi/ear_back.png b/Resources/Textures/Mobs/Customization/vulpkanin_head.rsi/ear_back.png new file mode 100644 index 0000000000000000000000000000000000000000..235de6cb5336f889e95be08c09d2857b041ad7a1 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zqdi?5Ln`LH zy=Cvk94K)7km zO{V{oc2~!B)?V|!+q8t2Ly;wc$wzyk^#ik(3oqTiM%_PS#87VkSMS|B_tWohJ$qNb zDt=#fZ0XzC`=Z4)wS}YV)RmAxcE0F#2F+Pt7XNMt@h)e&cXj@QBXygW)=k=;usQMX z%$akU#ScIHur_g>O4>HoIgG{$%k$=0F;}q0bsd^4@t9-A_1p#PBp%C1^d5ig{D9#G zTUqeuE0PCH3s`-Ud-x9+UpUTwvGKRWW6llyZy1lS^nAthKxhZ!CIP4X;{u8->|zHN z@3v=@KJeSCYxYfs19z+K+cc^*s)Ym*;O9y9FrUXSzs39(0fsq)r>mdKI;Vst04=An ASO5S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/vulpkanin_head.rsi/meta.json b/Resources/Textures/Mobs/Customization/vulpkanin_head.rsi/meta.json index a63e240d948..9097019bbac 100644 --- a/Resources/Textures/Mobs/Customization/vulpkanin_head.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vulpkanin_head.rsi/meta.json @@ -11,6 +11,10 @@ "name": "ear", "directions": 4 }, + { + "name": "ear_back", + "directions": 4 + }, { "name": "muzzle", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/vulpkanin_tail.rsi/meta.json b/Resources/Textures/Mobs/Customization/vulpkanin_tail.rsi/meta.json index 74b2c7adf61..09aeacdcfe7 100644 --- a/Resources/Textures/Mobs/Customization/vulpkanin_tail.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vulpkanin_tail.rsi/meta.json @@ -30,6 +30,16 @@ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + }, + { + "name": "tail_m", + "directions": 4, + "delays": [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] } ] } diff --git a/Resources/Textures/Mobs/Customization/vulpkanin_tail.rsi/tail_m.png b/Resources/Textures/Mobs/Customization/vulpkanin_tail.rsi/tail_m.png new file mode 100644 index 0000000000000000000000000000000000000000..0254becd1c26cbd0d0f82f3b583551df9aea34d6 GIT binary patch literal 4353 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 Date: Sun, 18 Feb 2024 01:50:35 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B6=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 24 +++++++++++------- .../Locale/ru-RU/ADT/Clothing/Head/hats.ftl | 17 ++++++++----- .../ADT/Entities/Clothing/Head/Hats/hats.yml | 6 ++--- .../Hats/urs_hat.rsi/equipped-HELMET-urs.png | Bin .../Head/Hats/urs_hat.rsi/equipped-HELMET.png | Bin .../Clothing/Head/Hats/urs_hat.rsi/icon.png | Bin .../Clothing/Head/Hats/urs_hat.rsi/meta.json | 0 7 files changed, 28 insertions(+), 19 deletions(-) rename Resources/Textures/{ => ADT}/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET-urs.png (100%) rename Resources/Textures/{ => ADT}/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET.png (100%) rename Resources/Textures/{ => ADT}/Clothing/Head/Hats/urs_hat.rsi/icon.png (100%) rename Resources/Textures/{ => ADT}/Clothing/Head/Hats/urs_hat.rsi/meta.json (100%) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 69128b48d9d..7540667e776 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1188,7 +1188,7 @@ Entries: - {message: Сильно урезал самозарядку пистолету Киборга Сб., type: Tweak} id: 55678 #костыль отображения в Обновлениях time: '2024-02-09T08:20:00.0000000+00:00' - + - author: Шрёдингер changes: - {message: "Дезерт Игл, пока для щитспавна.", type: Add} @@ -1216,13 +1216,19 @@ Entries: id: 55681 #костыль отображения в Обновлениях time: '2024-02-11T08:20:00.0000000+00:00' - -- author: Xelasto +- author: Шрёдингер changes: - - {message: "Добавлен язык Орлуум", type: Add} - - {message: "Добавлен язык Орлуум", type: Add} - - {message: "Добавлен язык Орлуум", type: Add} - - {message: "Добавлен язык Орлуум", type: Add} - id: 55681 #костыль отображения в Обновлениях - time: '2024-02-15T08:20:00.0000000+00:00' + - {message: "Костюм урса.", type: Add} + - {message: "Шапка урса.", type: Add} + - {message: "Плюшевый урс.", type: Add} + - {message: "Вульпам добавлена возможность красить уши с наружной стороны.", type: Add} + - {message: "Вульпам добавлена возможность полностью покрасить хвост.", type: Add} + - {message: "Кастомизация новой спонсорской расе урсы.", type: Add} + - {message: "Добавлен майндшилд для АВД.", type: Add} + - {message: "Кобольдам перенесены все кастомизации от унатхов.", type: Tweak} + - {message: "Открыты урсы.", type: Tweak} + - {message: "Поправлены индивидуальные характеристики урсов.", type: Tweak} + - {message: "Мелкий рефакторинг .yml файлов.", type: Fix} + id: 55682 #костыль отображения в Обновлениях + time: '2024-02-18T08:20:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl index f19e17b28c1..9d293813906 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl @@ -45,15 +45,15 @@ ent-ADTClothingHeadHatsBavarianHatGreenBorder = баварская шляпа с .suffix = { "Октоберфест" } ent-ADTClothingHeadHatsBavarianHatBlue = синяя егерская шляпа - .desc = Егерская шляпа синего цвета, с пером. + .desc = Егерская шляпа синего цвета, с пером. .suffix = { "Октоберфест" } ent-ADTClothingHeadHatsBavarianHatGreen = зеленая егерская шляпа - .desc = Егерская шляпа зеленого цвета, с пером. + .desc = Егерская шляпа зеленого цвета, с пером. .suffix = { "Октоберфест" } ent-ADTClothingHeadHatsBavarianHatRed = красная егерская шляпа - .desc = Егерская шляпа красного цвета, с пером. + .desc = Егерская шляпа красного цвета, с пером. .suffix = { "Октоберфест" } ent-ADTClothingHeadHairPin = золотая заколка @@ -86,7 +86,7 @@ ent-ADTClothingHeadHatsSyndieCap = синди колпак .suffix = { "День рождения сервера" } ent-ADTClothingHeadHatsCinnamonFlatCap = коричневая плоская кепка - .desc = Кепка с закругленной тульей и короткими полями. Сшита из плотной ткани, что делает её идеальной для прохладной погоды. Производство компании "Modeling Agency Dar-Vaxed" + .desc = Кепка с закругленной тульей и короткими полями. Сшита из плотной ткани, что делает её идеальной для прохладной погоды. Производство компании "Modeling Agency Dar-Vaxed" ent-ADTClothingHeadHatsGreyFlatCap = серая плоская кепка .desc = { ent-ADTClothingHeadHatsCinnamonFlatCap.desc } @@ -104,7 +104,7 @@ ent-ADTClothingHeadHatsBeretAtmos = берет атмосферного техн ent-ADTClothingHeadHatsBeretHOP = берет главы персонала .desc = Синий берет с вышитой командирской эмблемой. Холодная рассудительность и твердая рука - вот что главное. -ent-ADTClothingHeadHatsBeretSOO = берет офицера специальных операций +ent-ADTClothingHeadHatsBeretSOO = берет офицера специальных операций .desc = Серый берет с вышитой эмблемой ОБР. Покажи, кто здесь главный! ent-ADTClothingHeadHatsBeretSupply = берет отдела снабжения @@ -153,11 +153,14 @@ ent-ADTClothingHeadSecAuditorCap = фуражка аудитора СБ ent-ClothingHeadHelmetJanitorBombSuit = саперный шлем уборщика .desc = Защитный головной убор на случай, когда уборка становится по-настоящему взрывной. - .suffix = { "НЕ МАППЕРИТЬ" } + .suffix = { "НЕ МАППЕРИТЬ" } ent-ADTClothingHeadSportHat = зимняя шапка STEP "Cold" .desc = Тёмная тёплая шапка для занятий в холодную погоду. ent-ADTClothingHeadSportRoseCap = кепка STEP "Rose" .desc = Кепка с ярким козырьком из серии "Rose". ent-ADTClothingHeadSportHatStep = cпортивная шапка-пипо "STEP" - .desc = Футуристичная шапка-пипо серии "STEP" в полоску. \ No newline at end of file + .desc = Футуристичная шапка-пипо серии "STEP" в полоску. + +ent-ADTClothingHeadUrsHat = шапка урса + .desc = Тёплая шапка ушанка. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml index be2a9feef5d..641e1cbc629 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml @@ -566,7 +566,7 @@ description: A futuristic looking striped hat from "STEP" clothing series. components: - type: Sprite - sprite: Clothing/Head/Hats/urs_hat.rsi + sprite: ADT/Clothing/Head/Hats/urs_hat.rsi - type: Clothing - sprite: Clothing/Head/Hats/urs_hat.rsi -#Resources\Textures\Clothing\Head\Hats\urs_hat.rsi + sprite: ADT/Clothing/Head/Hats/urs_hat.rsi + diff --git a/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET-urs.png b/Resources/Textures/ADT/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET-urs.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET-urs.png rename to Resources/Textures/ADT/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET-urs.png diff --git a/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET.png rename to Resources/Textures/ADT/Clothing/Head/Hats/urs_hat.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/urs_hat.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Head/Hats/urs_hat.rsi/icon.png diff --git a/Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/urs_hat.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Head/Hats/urs_hat.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Head/Hats/urs_hat.rsi/meta.json From 87a20eb7a0e74f4c6ca5c3860c26c17ed26ad805 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sun, 18 Feb 2024 02:14:23 +0300 Subject: [PATCH 3/4] fix --- Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml | 3 +++ Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml index 0a7acdd4a64..252c6f48de0 100644 --- a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml +++ b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml @@ -4,6 +4,9 @@ parent: BaseMobUrsus id: MobUrsus components: + - type: MovementSpeedModifier + baseWalkSpeed : 0.9 + baseSprintSpeed : 0.9 - type: Inventory speciesId: urs #для одежды на урсов - type: Temperature diff --git a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml index 74faf2b30ad..6c9d259ad6b 100644 --- a/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml +++ b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml @@ -4,6 +4,9 @@ name: Urist McUrsus abstract: true components: + - type: MovementSpeedModifier + baseWalkSpeed : 2.7 + baseSprintSpeed : 4.6 - type: HumanoidAppearance species: UrsusSpecies - type: Hunger From e83e4035f4f3687417388092af8aab1d89310960 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sun, 18 Feb 2024 02:31:39 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=B0=D0=BC=D0=BE=D0=B3=D0=BE=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=B0=D0=BF=D0=BF=D0=B0=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Fun/moonshine_still.yml | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/moonshine_still.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/moonshine_still.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/moonshine_still.yml new file mode 100644 index 00000000000..da592f0bc30 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/moonshine_still.yml @@ -0,0 +1,67 @@ +- type: entity + name: sink + id: ADTMoonshine_still + parent: SinkStemless + suffix: Schrodinger + components: + - type: SolutionContainerManager + solutions: + drainBuffer: + maxVol: 100 + tank: + reagents: + - ReagentId: Moonshine + Quantity: 500 + - type: Clickable + - type: InteractionOutline + - type: Sprite + sprite: Structures/Furniture/sink.rsi + layers: + - state: sink_stem + - map: [ "enum.SolutionContainerLayers.Fill" ] + state: sink-fill-1 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: sink-fill- + solutionName: drainBuffer + - type: SolutionRegeneration + solution: tank + generated: + reagents: + - ReagentId: Moonshine + Quantity: 1 + - type: DrainableSolution + solution: tank + - type: ReagentTank + - type: Drain + autoDrain: false + - type: DumpableSolution + solution: drainBuffer + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 80 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - type: AmbientSound + enabled: false + volume: -8 + range: 8 + sound: + path: /Audio/Ambience/Objects/drain.ogg