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 00000000000..6a803d7431f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/equipped-SOCKS.png differ 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 00000000000..469f0f2ee2b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Underwear/Socks/bee.rsi/icon.png differ 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 00000000000..4bb67f166d5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/equipped-SOCKS.png differ 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 00000000000..ada609941ea Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Underwear/Socks/coder.rsi/icon.png differ 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 00000000000..a84c75f0e1c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/equipped-SOCKS.png differ diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/icon.png b/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/icon.png new file mode 100644 index 00000000000..ecd0c25daf5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/meta.json b/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.rsi/meta.json new file mode 100644 index 00000000000..5d11bd01683 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Underwear/Socks/socksbee.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, modified by filokini", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/meta.json new file mode 100644 index 00000000000..6b5d1d11c40 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by chaotic, modified by discord:hixi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "milky_tail", + "directions": 4, + "delays": [ + [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2], + [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2], + [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2], + [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2] + ] + }, + { + "name": "milky_tail_secondary", + "directions": 4, + "delays": [ + [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2], + [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2], + [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2], + [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2] + ] + }, + { + "name": "milky_horns", + "directions": 4 + }, + { + "name": "milky_ears", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_ears.png b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_ears.png new file mode 100644 index 00000000000..998cca9bb68 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_ears.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_horns.png b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_horns.png new file mode 100644 index 00000000000..a180cd0c4eb Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_horns.png differ 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 00000000000..19bfeb547e1 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail_secondary.png b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail_secondary.png new file mode 100644 index 00000000000..357bb348310 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_tail_secondary.png differ 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 81d4db70a71..bdafcec2b99 100644 Binary files a/Resources/Textures/ADT/Mobs/Species/Shadekin/displacement.rsi/jumpsuit.png and b/Resources/Textures/ADT/Mobs/Species/Shadekin/displacement.rsi/jumpsuit.png differ