diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index fe0789f7656..03da34885d4 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -397,3 +397,11 @@ Entries: - {message: Добавлены дамские сумочки от SHIZZY, type: Add} id: 55590 #костыль отображения в Обновлениях time: '2023-10-24T04:20:00.0000000+00:00' + +- author: Петр Игнатьевич + changes: + - {message: Респрайт некоторого декора, type: Fix} + - {message: Нерф защитных параметрво хеллоуинской брони и фикс кувалды, type: Tweak} + - {message: Добавлены два плаката и один светильник к Хеллоуину. Автор спрайтов - prazat911, type: Add} + id: 55585 #костыль отображения в Обновлениях + time: '2023-10-25T22:20:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl b/Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl index f555bf5a459..b1d8404073b 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl @@ -92,11 +92,11 @@ ent-ADTClothingBeltKilla = РПС "Тритон" ent-ADTClothingHeadKillaHelmet = бронешлем ТШ-6 "Килла" .suffix = Хеллоуин - .desc = Это просто ТШ-6, но с тремя белыми полосками... В принципе, всё равно выглядит очень круто и стильно. + .desc = Это просто реплика ТШ-6, но с тремя белыми полосками... В принципе, всё равно выглядит очень круто и стильно. ent-ADTKillaArmor = бронежилет СОБ-12 "Килла" .suffix = Хеллоуин - .desc = Внешне измененный советский общевойсковой бронежилет "СОБ-12" под костюм "Киллы". Очень сильно похож по внешнему виду на 6Б13, хотя он им не является. + .desc = Реплика бронежилета "СОБ-12" под костюм "Киллы". Очень сильно похож по внешнему виду на 6Б13, хотя он им не является. ent-ADTBoxKilla = набор костюма Киллы .suffix = Хеллоуин @@ -160,7 +160,7 @@ ent-ADTTagillaSuit = потрепанные тактические брюки ent-ADTClothingHeadHatTagilla = сварочная маска "УБЕЙ" .suffix = Хеллоуин - .desc = Сварочная маска из бронестали, выполненная в спецраскраске "УБЕЙ". + .desc = Реплика сварочнай маски из бронестали, выполненная в спецраскраске "УБЕЙ". От реального прототипа унаследовала в основном только защиту от сварки. ent-ADTRedMartialArtsGloves = красные перчатки для смешанных единоборств .suffix = Хеллоуин @@ -168,15 +168,15 @@ ent-ADTRedMartialArtsGloves = красные перчатки для смеша ent-ADTTagillaArmor = разгрузочный жилет с бронепластинами .suffix = Хеллоуин - .desc = Бывалый плитник на основе модульной системы AVS. Установлена фронтальная панель на три подсумка. Да и, собственно, все. Ничего лишнего. + .desc = Реплика бывалого плитника на основе модульной системы AVS. Установлена фронтальная панель на три подсумка. Да и, собственно, все. Ничего лишнего. -ent-ADTTagillaSledgehammerReal = кувалда "Deadblow" - .suffix = Хеллоуин - .desc = Молот покрыт уретаном, что обеспечивает "глухой удар" с использованием стальных шариков для амортизации удара и уменьшения вибрации отдачи в рукоять. +ent-ADTTagillaSledgehammerReal = кувалда Тагиллы + .suffix = Хеллоуин. Настоящая + .desc = Реплика той самой кувалды, наводившей страх на посетителей Завода. Она тяжелее, чем должна быть игрушка. -ent-ADTTagillaSledgehammerToy = кувалда "Deadblow" - .suffix = Хеллоуин - .desc = Молот покрыт уретаном, что обеспечивает "глухой удар" с использованием стальных шариков для амортизации удара и уменьшения вибрации отдачи в рукоять. +ent-ADTTagillaSledgehammerToy = кувалда Тагиллы + .suffix = Хеллоуин. Игрушечная + .desc = Реплика той самой кувалды, наводившей страх на посетителей Завода. ent-ADTBoxTagilla = набор одежды дикого начальника Завода .suffix = Хеллоуин @@ -267,6 +267,10 @@ ent-ADTHalloweenPumpkinLight4 = тыквенный светильник .suffix = Хеллоуин .desc = Фонарь, сделанный из тыквы. +ent-ADTHalloweenPumpkinLight5 = тыквенный светильник + .suffix = Хеллоуин + .desc = Фонарь, сделанный из тыквы. + ent-ADTHalloweenPottedPlant1 = черепоцветочек .suffix = Хеллоуин .desc = Вам не кажется, что от него издается скрежет зубов. @@ -505,3 +509,11 @@ ent-ADTCrateHalloweenFood = ящик сладостей для Хеллоуин ent-ADTCrateHalloweenCloth = ящик костюмов для Хеллоуина .suffix = Хеллоуин .desc = Ящик со множеством наборов тематических костюмов к Хеллоуину. + +ent-ADTPosterHappyHalloween = Счастливого Хеллоуина! + .suffix = Хеллоуин + .desc = Плакат, поздравляющий персонал станции с праздником. + +ent-ADTPosterTayarHalloween = хеллоуинская таярочка + .suffix = Хеллоуин + .desc = Плакат к Хеллоуину, изображающий таяранку в довольно откровенном наряде. А это точно одобрено комиссией NT по медиа и пропаганде? diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml index 0d5bf3ac579..a9bf0e95e93 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml @@ -7,9 +7,9 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - state: base - layers: - - state: pennywise + state: pennywise + #layers: + #- state: pennywise - type: Item size: 100 - type: Storage @@ -46,10 +46,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: сrueltysquad + state: сrueltysquad + #layers: + #- state: base + #- state: сrueltysquad - type: StorageFill contents: - id: ADTCSIJArmor @@ -60,7 +60,7 @@ amount: 1 - id: ADTBioMercUniform amount: 1 - - id: ClothingShoesBootsJack + - id: ClothingShoesBootsCombat amount: 1 - type: entity @@ -72,10 +72,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: jasonvoorhees + state: jasonvoorhees + #layers: + #- state: base + #- state: jasonvoorhees - type: StorageFill contents: - id: ADTJasonBomber @@ -86,7 +86,7 @@ amount: 1 - id: ADTJasonCostume amount: 1 - - id: ClothingShoesBootsJack + - id: ClothingShoesBootsCombat amount: 1 - id: ClothingHandsGlovesColorBlack amount: 1 @@ -100,10 +100,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: freddy + state: freddy + #layers: + #- state: base + #- state: freddy - type: StorageFill contents: - id: ADTVyasovCostume @@ -122,10 +122,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: jecket + state: jecket + #layers: + #- state: base + #- state: jecket - type: Item size: 125 - type: Storage @@ -152,10 +152,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: killa + state: killa + #layers: + #- state: base + #- state: killa - type: StorageFill contents: - id: ADTClothingBeltKilla @@ -164,7 +164,7 @@ amount: 1 - id: ADTKillaArmor amount: 1 - - id: ClothingShoesBootsJack + - id: ClothingShoesBootsCombat amount: 1 - id: ADTClothingUniformAbibasBlackSuit amount: 1 @@ -178,10 +178,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: minion + state: minion + #layers: + #- state: base + #- state: minion - type: StorageFill contents: - id: ADTServantOfEvilUniform @@ -190,7 +190,7 @@ amount: 1 - id: ClothingHandsGlovesColorBlack amount: 1 - - id: ClothingShoesBootsJack + - id: ClothingShoesBootsCombat amount: 1 - type: entity @@ -202,10 +202,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: postal2 + state: postal2 + #layers: + #- state: base + #- state: postal2 - type: Item size: 125 - type: Storage @@ -214,7 +214,7 @@ contents: - id: ADTDudeShirt amount: 1 - - id: ClothingShoesBootsJack + - id: ClothingShoesBootsCombat amount: 1 - id: ClothingOuterCoatJensen amount: 1 @@ -234,9 +234,9 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base + state: base + #layers: + #- state: base - type: StorageFill contents: - id: ADTSquidGamePlayerSuit @@ -253,9 +253,9 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base + state: base + #layers: + #- state: base - type: StorageFill contents: - id: ADTSquidGameOrganizerSuit @@ -282,10 +282,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: tagilla + state: tagilla + #layers: + #- state: base + #- state: tagilla - type: StorageFill contents: - id: ADTTagillaSuit @@ -299,9 +299,9 @@ - id: ADTTagillaSledgehammerToy orGroup: ToyOrRealSledge - id: ADTTagillaSledgehammerReal - prob: 0.25 + prob: 0.1 orGroup: ToyOrRealSledge - - id: ClothingShoesBootsJack + - id: ClothingShoesBootsCombat amount: 1 - type: entity @@ -313,10 +313,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: tricky + state: tricky + #layers: + #- state: base + #- state: tricky - type: StorageFill contents: - id: ADTDJClownSuit @@ -335,10 +335,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: vampire + state: vampire + #layers: + #- state: base + #- state: vampire - type: StorageFill contents: - id: ADTVampireSuit @@ -359,10 +359,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: vergil + state: vergil + #layers: + #- state: base + #- state: vergil - type: StorageFill contents: - id: ADTVergileSuit @@ -383,10 +383,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: xeno + state: xeno + #layers: + #- state: base + #- state: xeno - type: StorageFill contents: - id: ADTXenomorphSuit @@ -403,10 +403,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: harry + state: harry + #layers: + #- state: base + #- state: harry - type: StorageFill contents: - id: ClothingUniformJumpsuitSuperstarCop @@ -427,10 +427,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: kim + state: kim + #layers: + #- state: base + #- state: kim - type: StorageFill contents: - id: ClothingEyesBinoclardLenses @@ -455,10 +455,10 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base - - state: rabbit + state: rabbit + #layers: + #- state: base + #- state: rabbit - type: StorageFill contents: - id: ADTClothingUniformRabbitDress @@ -477,9 +477,9 @@ components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - #state: base - layers: - - state: base + state: base + #layers: + #- state: base - type: StorageFill contents: - id: ADTFoodSnackBlackCandies diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml index e9ebcab63df..80c7e730146 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml @@ -70,7 +70,7 @@ fiberMaterial: fibers-synthetic - type: entity - parent: ClothingHandsGlovesCombat + parent: ClothingHandsBase id: ADTClothingHandsFingerlessCombat name: fingerless combat gloves description: These tactical gloves are fireproof and shockproof, and have become much cooler. @@ -82,9 +82,6 @@ - type: Fiber fiberMaterial: fibers-insulative fiberColor: fibers-black - - type: Insulated - - type: GloveHeatResistance - heatResistance: 1400 - type: entity parent: ClothingHandsBase @@ -102,7 +99,7 @@ - type: MeleeWeapon damage: types: - Slash: 12 + Slash: 8 soundHit: path: /Audio/Weapons/bladeslice.ogg animation: WeaponArcFist diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/halloween.yml index 342c31eed5a..5dfd8c5cd1f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/halloween.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/halloween.yml @@ -27,6 +27,13 @@ sprite: ADT/Clothing/Head/Hats/Halloween/killahelmet.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/Halloween/killahelmet.rsi + - type: Armor + modifiers: + coefficients: + Piercing: 0.95 + Heat: 0.95 + - type: ExplosionResistance + damageCoefficient: 0.95 - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml index 62a67242cb9..e00dc4d626c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml @@ -95,10 +95,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskBase @@ -117,7 +115,5 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 + Piercing: 0.95 + Heat: 0.95 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/halloween.yml index f81bb6a67a1..37dd6bbc78c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/halloween.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/halloween.yml @@ -12,12 +12,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.7 - Heat: 0.8 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 - type: ExplosionResistance - damageCoefficient: 0.80 + damageCoefficient: 0.9 - type: entity parent: ClothingOuterStorageBase @@ -57,15 +57,15 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.3 - Heat: 0.8 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 - type: ExplosionResistance - damageCoefficient: 0.80 + damageCoefficient: 0.9 - type: ClothingSpeedModifier - walkModifier: 0.95 - sprintModifier: 0.95 + walkModifier: 0.90 + sprintModifier: 0.90 - type: entity parent: ClothingOuterArmorBasic @@ -81,12 +81,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.3 - Heat: 0.7 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 - type: ExplosionResistance - damageCoefficient: 0.80 + damageCoefficient: 0.90 #- type: Storage # capacity: 12 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml index 498693ae15f..5ba640fe198 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml @@ -82,4 +82,4 @@ sprite: ADT/Clothing/Under/broom.rsi - type: ClothingSpeedModifier walkModifier: 0.9 - sprintModifier: 1.5 + sprintModifier: 1.2 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml index 645d9d499b3..55cf8d92b57 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml @@ -35,7 +35,7 @@ angle: 75 damage: types: - Blunt: 3 + Blunt: 0.5 soundHit: collection: BoxingHit - type: StaminaDamageOnHit @@ -45,7 +45,7 @@ - type: IncreaseDamageOnWield damage: types: - Blunt: 2 + Blunt: 1 - type: Item size: 15 - type: DisarmMalus @@ -65,7 +65,7 @@ angle: 75 damage: types: - Blunt: 1 + Blunt: 0.5 soundHit: collection: BoxingHit - type: StaminaDamageOnHit @@ -82,7 +82,7 @@ sprite: ADT/Objects/Weapons/Melee/tagilla_sledge.rsi state: icon - type: MeleeWeapon - attackRate: 0.6 + attackRate: 0.4 angle: 75 damage: types: @@ -112,22 +112,26 @@ description: The hammer is coated with urethane, which provides a "thud" using steel balls to dampen the impact and reduce the vibration of the recoil in the handle. suffix: Halloween components: - - type: StaminaDamageOnHit - damage: 8 - - type: Appearance - - type: DisarmMalus - malus: 0 - - type: MeleeWeapon - soundHit: - collection: RubberHammer - params: - variation: 0.03 - volume: 3 - soundNoDamage: - collection: RubberHammer - params: - variation: 0.03 - volume: 3 - damage: - types: - Blunt: 0 + - type: StaminaDamageOnHit + damage: 5 + - type: Appearance + - type: DisarmMalus + malus: 0 + - type: MeleeWeapon + soundHit: + collection: RubberHammer + params: + variation: 0.03 + volume: 3 + soundNoDamage: + collection: RubberHammer + params: + variation: 0.03 + volume: 3 + damage: + types: + Blunt: 0.01 + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 0.1 diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/halloween.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/halloween.yml index 0f2f9352304..ef591456359 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/halloween.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/halloween.yml @@ -56,11 +56,21 @@ suffix: Halloween components: - type: Sprite - state: pumpkin_light3 + state: pumpkin_light4 #- type: Construction # graph: pumpkin_light4 # node: pumpkinlight4 +- type: entity + id: ADTHalloweenPumpkinLight5 + parent: ADTHalloweenPumpkinLight1 + name: pumpkin light + description: pumpkin light + suffix: Halloween + components: + - type: Sprite + state: pumpkin_light5 + - type: entity id: ADTHalloweenPottedPlant1 parent: PottedPlantBase @@ -101,6 +111,7 @@ - ADTHalloweenPumpkinLight2 - ADTHalloweenPumpkinLight3 - ADTHalloweenPumpkinLight4 + - ADTHalloweenPumpkinLight5 - ADTHalloweenPottedPlant1 - ADTHalloweenPottedPlant2 chance: 1 diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index c7f84182c95..c5e2a4953b2 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -144,6 +144,28 @@ sprite: ADT/Objects/Decoration/poster_helloween.rsi state: spiderweb2 +- type: entity + parent: PosterBase + id: ADTPosterHappyHalloween + name: happy halloween + description: happy halloween + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_helloween.rsi + state: happyhalloween + +- type: entity + parent: PosterBase + id: ADTPosterTayarHalloween + name: happy halloween + description: happy halloween + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_helloween.rsi + state: tayarhalloween + - type: entity parent: MarkerBase id: ADTHalloweenPosterRandom @@ -164,6 +186,8 @@ - ADTPosterHalloweenSpider - ADTPosterHalloweenSpiderWeb1 - ADTPosterHalloweenSpiderWeb2 + - ADTPosterHappyHalloween + - ADTPosterTayarHalloween chance: 1 #флажки к хеллоуину diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/Halloween/zombie_head.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/Halloween/zombie_head.rsi/equipped-HELMET.png index 27b52aa2c56..ead1145f035 100644 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/Halloween/zombie_head.rsi/equipped-HELMET.png and b/Resources/Textures/ADT/Clothing/Head/Hats/Halloween/zombie_head.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Under/broom.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/Clothing/Under/broom.rsi/equipped-SOCKS.png index 37c591e21e3..1e89b8c878f 100644 Binary files a/Resources/Textures/ADT/Clothing/Under/broom.rsi/equipped-SOCKS.png and b/Resources/Textures/ADT/Clothing/Under/broom.rsi/equipped-SOCKS.png differ diff --git a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign1.png b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign1.png index 76927b2f6de..622d2f8297c 100644 Binary files a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign1.png and b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign1.png differ diff --git a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign2.png b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign2.png index f37b9fc44af..aea26c4f354 100644 Binary files a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign2.png and b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign2.png differ diff --git a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign3.png b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign3.png index efc428de5f2..e4c3ea9ca38 100644 Binary files a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign3.png and b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign3.png differ diff --git a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign4.png b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign4.png index 365063cab3b..fede5ed5311 100644 Binary files a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign4.png and b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign4.png differ diff --git a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign5.png b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign5.png index c1c253e2f5e..d753b43ebad 100644 Binary files a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign5.png and b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign5.png differ diff --git a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign6.png b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign6.png index cc5366acac7..2aa8efea382 100644 Binary files a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign6.png and b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign6.png differ diff --git a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign7.png b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign7.png index 25f54ca0aaf..bf0ec133291 100644 Binary files a/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign7.png and b/Resources/Textures/ADT/Decals/halloween_ss14sign.rsi/ss14sign7.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/happyhalloween.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/happyhalloween.png new file mode 100644 index 00000000000..6f804371748 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/happyhalloween.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/meta.json b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/meta.json index f7c48e049a2..f0295974c89 100644 --- a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:m1and1b для Время Приключений MRP", + "copyright": "Created by discord:m1and1b и prazat911 для Время Приключений MRP", "size": { "x": 32, "y": 32 @@ -21,6 +21,12 @@ }, { "name": "spiderweb2" + }, + { + "name": "happyhalloween" + }, + { + "name": "tayarhalloween" } ] } diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/tayarhalloween.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/tayarhalloween.png new file mode 100644 index 00000000000..b6faecfed02 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/tayarhalloween.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/Lights/golden_candlestick.rsi/lamp-on.png b/Resources/Textures/ADT/Objects/Misc/Lights/golden_candlestick.rsi/lamp-on.png index 610e7a0aade..4665078f31e 100644 Binary files a/Resources/Textures/ADT/Objects/Misc/Lights/golden_candlestick.rsi/lamp-on.png and b/Resources/Textures/ADT/Objects/Misc/Lights/golden_candlestick.rsi/lamp-on.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json index 1bd04d40db1..028264413a1 100644 --- a/Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by wiki.ss220.space and discord: not_so_big_chungus для Время Приключений MRP", + "copyright": "Created by wiki.ss220.space and discord: not_so_big_chungus и prazat911 для Время Приключений MRP", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png index 6afd039845a..f2fb653b90c 100644 Binary files a/Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png and b/Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/freddy.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/freddy.png index 4a3ab550813..04318099fea 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/freddy.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/freddy.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/harry.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/harry.png index d564cfa0c91..58a01d97b0d 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/harry.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/harry.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/jasonvoorhees.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/jasonvoorhees.png index cf97159d1ae..048286e9d79 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/jasonvoorhees.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/jasonvoorhees.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/jecket.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/jecket.png index bdf3a11da18..01d4535fb5a 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/jecket.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/jecket.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/killa.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/killa.png index e5f47442061..e7a3df69d60 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/killa.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/killa.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/kim.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/kim.png index a4a025e909f..e8baacc99fb 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/kim.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/kim.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/minion.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/minion.png index e8ec392fcf3..d8a9db628e4 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/minion.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/minion.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/pennywise.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/pennywise.png index bde6950b591..132a89728ef 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/pennywise.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/pennywise.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/postal2.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/postal2.png index d77a652db23..26b7b40d555 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/postal2.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/postal2.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/rabbit.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/rabbit.png index dd14cb41515..a4540a83ee2 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/rabbit.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/rabbit.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/tagilla.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/tagilla.png index d0c200fd3b8..21ee02c8487 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/tagilla.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/tagilla.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/tricky.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/tricky.png index 779947fc695..cb79350dfb3 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/tricky.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/tricky.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/vampire.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/vampire.png index 1e1ed6fd589..1d65a364179 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/vampire.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/vampire.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/vergil.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/vergil.png index c62aea4e1c2..dce97b34325 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/vergil.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/vergil.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/xeno.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/xeno.png index 9eaeaf4468f..88b8dd3b6e3 100644 Binary files a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/xeno.png and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/xeno.png differ diff --git "a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/\321\201rueltysquad.png" "b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/\321\201rueltysquad.png" index e2cfde1f460..7332b1a3040 100644 Binary files "a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/\321\201rueltysquad.png" and "b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/\321\201rueltysquad.png" differ diff --git a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/meta.json b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/meta.json index 4f4bd5d2cd7..8fd5b1d4326 100644 --- a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/meta.json +++ b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/meta.json @@ -18,6 +18,9 @@ }, { "name": "pumpkin_light4" + }, + { + "name": "pumpkin_light5" } ] } diff --git a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light5.png b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light5.png new file mode 100644 index 00000000000..0e35ec56229 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light5.png differ