diff --git a/Content.Server/Corvax/ChatFilter/ChatSystem.cs b/Content.Server/Corvax/ChatFilter/ChatSystem.cs index 9c780e00e46..8a049d3a676 100644 --- a/Content.Server/Corvax/ChatFilter/ChatSystem.cs +++ b/Content.Server/Corvax/ChatFilter/ChatSystem.cs @@ -95,7 +95,7 @@ public sealed partial class ChatSystem { "пруф", "доказательство" }, { "пруфани", "докажи" }, { "пруфанул", "доказал" }, - { "имба", "нечестно" }, + { "имба", "круто" }, { "разлокать", "разблокировать" }, { "юзать", "использовать" }, { "юзай", "используй" }, diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/masks/mask.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/masks/mask.ftl index 235c16067c8..02d9e722c06 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/masks/mask.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/masks/mask.ftl @@ -1,2 +1,2 @@ -ent-ADTClothingMaskGasDarkRavenFriskis = raven gas mask - .desc = raven gas mask +ent-ADTClothingMaskGasDarkRavenFriskis = Маска ворона + .desc = Вещи сотрудников бывают странные, да ? diff --git a/Resources/Prototypes/ADT/Entities/Clothing/FriskisSet/raven.yml b/Resources/Prototypes/ADT/Entities/Clothing/FriskisSet/raven.yml new file mode 100644 index 00000000000..fc30d3e81d5 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/FriskisSet/raven.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingMaskGasSecurity + id: ADTClothingMaskGasDarkRavenFriskis + name: raven gas mask + description: raven gas mask + components: + - type: Sprite + sprite: ADT/Clothing/Mask/raven.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/raven.rsi + clothingVisuals: + mask: + - state: equipped-MASK + - state: equipped-MASK-unshaded + shader: unshaded + - type: BreathMask diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml index ece42350219..57e389e3b4e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml @@ -1,23 +1,3 @@ -- type: entity - parent: ClothingMaskGas - id: ADTClothingMaskGasDarkRavenFriskis - name: raven gas mask - description: raven gas mask - components: - - type: Sprite - sprite: ADT/Clothing/Mask/raven.rsi - - type: Clothing - sprite: ADT/Clothing/Mask/raven.rsi - clothingVisuals: - mask: - - state: equipped-MASK - - state: equipped-MASK-unshaded - shader: unshaded - - type: Armor - modifiers: - coefficients: - Heat: 0.80 - - type: entity parent: ClothingMaskBase id: ADTJasonHockeyMask diff --git a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml index 7ed1e756831..8fff98b08a6 100644 --- a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml @@ -199,7 +199,7 @@ - type: marking id: NovakidFace1 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -208,7 +208,7 @@ - type: marking id: NovakidFace2 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -217,7 +217,7 @@ - type: marking id: NovakidFace3 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -226,7 +226,7 @@ - type: marking id: NovakidFace4 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -235,7 +235,7 @@ - type: marking id: NovakidFace5 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -244,7 +244,7 @@ - type: marking id: NovakidFace6 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -253,7 +253,7 @@ - type: marking id: NovakidFace7 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -262,7 +262,7 @@ - type: marking id: NovakidFace8 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -271,7 +271,7 @@ - type: marking id: NovakidFace9 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -280,7 +280,7 @@ - type: marking id: NovakidFace10 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -289,7 +289,7 @@ - type: marking id: NovakidFace11 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -298,7 +298,7 @@ - type: marking id: NovakidFace12 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -307,7 +307,7 @@ - type: marking id: NovakidFace13 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -316,7 +316,7 @@ - type: marking id: NovakidFace14 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -325,7 +325,7 @@ - type: marking id: NovakidFace15 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -334,7 +334,7 @@ - type: marking id: NovakidFace16 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -343,7 +343,7 @@ - type: marking id: NovakidFace17 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -352,7 +352,7 @@ - type: marking id: NovakidFace18 - bodyPart: HeadSide + bodyPart: Head markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: diff --git a/Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml b/Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml index c66f91ccbf1..52626848af6 100644 --- a/Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml @@ -8,8 +8,13 @@ - type: HumanoidAppearance species: NovakidSpecies - type: Hunger + - type: Bloodstream + bloodReagent: Plasma - type: ZombieImmune - type: Thirst + - type: PointLight + color: "#ffffff" + energy: 0.4 - type: Icon sprite: ADT/Mobs/Novakid/parts.rsi state: full_m @@ -160,4 +165,4 @@ - /Audio/ADT/Novakid/novakid_scream01.ogg - /Audio/ADT/Novakid/novakid_scream02.ogg - /Audio/ADT/Novakid/novakid_scream03.ogg - - /Audio/ADT/Novakid/novakid_scream04.ogg \ No newline at end of file + - /Audio/ADT/Novakid/novakid_scream04.ogg diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index fda28df47d1..bde418d81f3 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -97,13 +97,13 @@ ignoreResistances: true damage: types: - Blunt: -0.005 - Slash: -0.005 - Piercing: -0.005 - Brute: -0.005 - Burn: -0.005 - Heat: -0.005 - Poison: -0.002 + Blunt: -0.015 + Slash: -0.015 + Piercing: -0.015 + Brute: -0.015 + Burn: -0.015 + Heat: -0.015 + Poison: -0.012 - !type:GenericStatusEffect conditions: - !type:OrganType diff --git a/Resources/Textures/ADT/Clothing/Mask/raven.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/raven.rsi/meta.json index fe7657a2142..0c369b1b793 100644 --- a/Resources/Textures/ADT/Clothing/Mask/raven.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Mask/raven.rsi/meta.json @@ -17,6 +17,10 @@ { "name": "equipped-MASK-unshaded", "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Clothing/Mask/raven.rsi/up-equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/raven.rsi/up-equipped-MASK.png new file mode 100644 index 00000000000..fb11a38527c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/raven.rsi/up-equipped-MASK.png differ