diff --git a/Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl b/Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl index df87e4efd9b..af5262ad2ea 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl @@ -518,35 +518,47 @@ ent-ADTPosterTayarHalloween = хеллоуинская таярочка .suffix = Хеллоуин .desc = Плакат к Хеллоуину, изображающий таяранку в довольно откровенном наряде. А это точно одобрено комиссией NT по медиа и пропаганде? -ent-ADTPayDayBox = Набор весёлых масок "4 костюма в один набор!" +ent-ADTPayDayBox = набор весёлых масок "4 костюма в один набор!" .suffix = Хеллоуин .desc = Набор из четырёх абсолютно непримечательных масок, которые помогут вам в быстрых выплатах от банка. -ent-ADTPayDayChainsMask = Маска клоуна грабителя +ent-ADTPayDayChainsMask = маска клоуна грабителя .suffix = Хеллоуин .desc = А ведь люди говорили, что клоуны только в цирке. Оказывается еще и в денежных хранилищах. -ent-ADTPayDayDallasMask = Маска клоуна Патриот +ent-ADTPayDayDallasMask = маска клоуна Патриот .suffix = Хеллоуин .desc = Надев эту маску, вы начинаете чувствовать себя настоящим патриотом! Но не в рамках закона. -ent-ADTPayDayHoustonMask = Маска умного клоуна +ent-ADTPayDayHoustonMask = маска умного клоуна .suffix = Хеллоуин .desc = С этими розовыми деталями на лбу люди точно поймут, что вы умный, в отличии от других! -ent-ADTPayDayWolfMask = Маска клоуна Волка с Уолл-стрит +ent-ADTPayDayWolfMask = маска клоуна Волка с Уолл-стрит .suffix = Хеллоуин .desc = Одевая эту маску, вы почему то начинаете чувствовать разделение надвое и желание переворачивать маску совсем пропадает.. -ent-ADTChainSawManBox = Набор Человека-бензопила +ent-ADTChainSawManBox = набор Человека-бензопила .suffix = Хеллоуин .desc = Набор вещей для костюма человек, полного амбиций и желаний, а именно: вкусно поесть, поспать на кровать, а также полапать женскую грудь! -ent-ADTClothingHeadHatChainSaw = Голова демона-бензопилы +ent-ADTClothingHeadHatChainSaw = голова демона-бензопилы .suffix = Хеллоуин .desc = Весь ад содрогается от его рева, даже демоны помнят его после перерождения! -ent-ADTJumpsuitHunterDemon = Костюм охотника на демонов +ent-ADTJumpsuitHunterDemon = костюм охотника на демонов .suffix = Хеллоуин .desc = Служебный костюм "Охотники на Демонов Общественной Безопасности" или же "Охотник на Демонов". Выглядит потрепанно. + +ent-ADTMichaelMyersMask = маска Майкла Майерса + .suffix = Хеллоуин + .desc = Резиновая маска главного героя "Хеллоуина". + +ent-ADTHalloweenMichaelMyersSuit = костюм Майкла Майерса + .suffix = Хеллоуин + .desc = Комбинезон героя фильма "Хеллоуин". + +ent-ADTMichaelMyersBox = набор Майкла Майерса + .suffix = Хеллоуин + .desc = Коробка с костюмом главного героя старого, даже архаичного фильма "Хеллоуин". diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml index 3e70f93fb77..948891ee958 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml @@ -548,24 +548,22 @@ - type: entity - id: ADTChainSawManBox + id: ADTMichaelMyersBox parent: ADTBoxNightmareClown - name: police-superstar box - description: police-superstar box + name: michael myers box + description: michael myers box suffix: Halloweeen components: - type: Sprite sprite: ADT/Objects/Storage/halloween_box.rsi - state: chainsaw + state: michael #layers: #- state: base #- state: harry - type: StorageFill contents: - - id: ADTClothingHeadHatChainSaw - amount: 1 - - id: ADTJumpsuitHunterDemon + - id: ADTMichaelMyersMask amount: 1 - - id: ClothingShoesColorRed + - id: ADTHalloweenMichaelMyersSuit amount: 1 diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/halloweenomat.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/halloweenomat.yml index 03420358ce5..93319231d95 100644 --- a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/halloweenomat.yml +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/halloweenomat.yml @@ -32,3 +32,4 @@ ADTBunnyDancerBox: 3 ADTPayDayBox: 3 ADTChainSawManBox: 3 + ADTMichaelMyersBox: 2 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml index 66bbb666869..ece42350219 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml @@ -118,6 +118,22 @@ Piercing: 0.95 Heat: 0.95 +- type: entity + parent: ClothingMaskBase + id: ADTMichaelMyersMask + name: Michael Myers mask + description: Michael Myers mask + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Mask/michael_myersmask.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/michael_myersmask.rsi + clothingVisuals: + mask: + - state: equipped-MASK + - type: BreathMask + # PayDay2 mask - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/halloween.yml index 3a7eec3403a..72311e77825 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/halloween.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/halloween.yml @@ -167,3 +167,15 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/xenomorph_suit.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/xenomorph_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHalloweenMichaelMyersSuit + name: Michael Myers suit + description: Michael Myers suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml index 5ac17baacb1..fd6ce161589 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml @@ -26,13 +26,13 @@ animation: WeaponArcClaw damage: types: - Slash: 12 - - type: Damageable - damageContainer: Biological - damageModifierSet: distorted + Slash: 9 + #- type: Damageable + # damageContainer: Biological + # damageModifierSet: distorted - type: MovementSpeedModifier - baseWalkSpeed: 2.5 - baseSprintSpeed: 4.5 + baseWalkSpeed: 2.7 + baseSprintSpeed: 4.7 - type: MobThresholds thresholds: 0: Alive @@ -66,13 +66,13 @@ animation: WeaponArcClaw damage: types: - Slash: 10 - - type: Damageable - damageContainer: Biological - damageModifierSet: echo + Slash: 8 + #- type: Damageable + # damageContainer: Biological + # damageModifierSet: echo - type: MovementSpeedModifier baseWalkSpeed: 3.0 - baseSprintSpeed: 5.6 + baseSprintSpeed: 5.2 - type: MobThresholds thresholds: 0: Alive @@ -106,11 +106,11 @@ animation: WeaponArcClaw damage: types: - Slash: 20 - Poison: 10 - - type: Damageable - damageContainer: Biological - damageModifierSet: grant + Slash: 15 + Poison: 5 + #- type: Damageable + # damageContainer: Biological + # damageModifierSet: grant - type: MovementSpeedModifier baseWalkSpeed: 2.2 baseSprintSpeed: 4.0 @@ -147,13 +147,13 @@ animation: WeaponArcClaw damage: types: - Slash: 30 - - type: Damageable - damageContainer: Biological - damageModifierSet: hunter + Slash: 20 + #- type: Damageable + # damageContainer: Biological + # damageModifierSet: hunter - type: MovementSpeedModifier - baseWalkSpeed: 3.0 - baseSprintSpeed: 5.5 + baseWalkSpeed: 3.2 + baseSprintSpeed: 5.2 - type: MobThresholds thresholds: 0: Alive @@ -188,12 +188,12 @@ damage: types: Slash: 8 - - type: Damageable - damageContainer: Biological - damageModifierSet: soldier + #- type: Damageable + # damageContainer: Biological + # damageModifierSet: soldier - type: MovementSpeedModifier - baseWalkSpeed: 2.5 - baseSprintSpeed: 4.5 + baseWalkSpeed: 2.7 + baseSprintSpeed: 4.7 - type: MobThresholds thresholds: 0: Alive @@ -227,80 +227,80 @@ animation: WeaponArcClaw damage: types: - Slash: 30 - - type: Damageable - damageContainer: Biological - damageModifierSet: wrecker + Slash: 25 + #- type: Damageable + # damageContainer: Biological + # damageModifierSet: wrecker - type: MovementSpeedModifier baseWalkSpeed: 2.2 baseSprintSpeed: 4.0 - type: MobThresholds thresholds: 0: Alive - 800: Dead + 850: Dead -- type: damageModifierSet - id: distorted - coefficients: - Blunt: 1 - Piercing: 1 - Slash: 1.0 - Cold: 0.5 - Heat: 0.5 - Poison: 0.5 - Bloodloss: 1 +#- type: damageModifierSet +# id: distorted +# coefficients: +# Blunt: 1 +# Piercing: 1 +# Slash: 1.0 +# Cold: 0.5 +# Heat: 0.5 +# Poison: 0.5 +# Bloodloss: 1 -- type: damageModifierSet - id: echo - coefficients: - Blunt: 1 - Piercing: 1 - Slash: 0.4 - Cold: 0.6 - Heat: 0.6 - Poison: 1.0 - Bloodloss: 1 +#- type: damageModifierSet +# id: echo +# coefficients: +# Blunt: 1 +# Piercing: 1 +# Slash: 0.4 +# Cold: 0.6 +# Heat: 0.6 +# Poison: 1.0 +# Bloodloss: 1 -- type: damageModifierSet - id: grant - coefficients: - Blunt: 0.5 - Piercing: 0.7 - Slash: 0.5 - Cold: 0.7 - Heat: 0.7 - Poison: 0.7 - Bloodloss: 1 +#- type: damageModifierSet +# id: grant +# coefficients: +# Blunt: 0.5 +# Piercing: 0.7 +# Slash: 0.5 +# Cold: 0.7 +# Heat: 0.7 +# Poison: 0.7 +# Bloodloss: 1 -- type: damageModifierSet - id: hunter - coefficients: - Blunt: 0.45 - Piercing: 0.6 - Slash: 0.45 - Cold: 0.6 - Heat: 0.45 - Poison: 0.6 - Bloodloss: 1 +#- type: damageModifierSet +# id: hunter +# coefficients: +# Blunt: 0.45 +# Piercing: 0.6 +# Slash: 0.45 +# Cold: 0.6 +# Heat: 0.45 +# Poison: 0.6 +# Bloodloss: 1 -- type: damageModifierSet - id: soldier - coefficients: - Blunt: 0.8 - Piercing: 0.8 - Slash: 0.8 - Cold: 0.8 - Heat: 0.8 - Poison: 0.8 - Bloodloss: 1 +#- type: damageModifierSet +# id: soldier +# coefficients: +# Blunt: 0.8 +# Piercing: 0.8 +# Slash: 0.8 +# Cold: 0.8 +# Heat: 0.8 +# Poison: 0.8 +# Bloodloss: 1 -- type: damageModifierSet - id: wrecker - coefficients: - Blunt: 0.4 - Piercing: 0.55 - Slash: 0.4 - Cold: 0.55 - Heat: 0.65 - Poison: 0.55 - Bloodloss: 1 +#- type: damageModifierSet +# id: wrecker +# coefficients: +# Blunt: 0.4 +# Piercing: 0.55 +# Slash: 0.4 +# Cold: 0.55 +# Heat: 0.65 +# Poison: 0.55 +# Bloodloss: 1 diff --git a/Resources/Prototypes/ADT/Entities/Structures/Specific/anomalies.yml b/Resources/Prototypes/ADT/Entities/Structures/Specific/anomalies.yml index a9940fb9857..f3456386bed 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Specific/anomalies.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Specific/anomalies.yml @@ -21,7 +21,7 @@ color: "#cb5b7e" castShadows: false - type: TileSpawnAnomaly - floorTileId: FloorFlesh + floorTileId: FloorChromite - type: EntitySpawnAnomaly superCriticalSpawns: - ADTMobWrecker diff --git a/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..788b7876b85 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/icon.png new file mode 100644 index 00000000000..2d5cefea139 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/meta.json new file mode 100644 index 00000000000..00614f1f89e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..5111c7a26af Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/icon.png new file mode 100644 index 00000000000..0e0c91ba714 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/meta.json new file mode 100644 index 00000000000..440ab189f0b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/meta.json b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/meta.json index 16b3373fc5f..40ea927b594 100644 --- a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/meta.json @@ -63,6 +63,9 @@ }, { "name": "payday" + }, + { + "name": "michael" } ] } diff --git a/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/michael.png b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/michael.png new file mode 100644 index 00000000000..c3dbe6c1ecf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/halloween_box.rsi/michael.png differ