diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index de15e95ea9ae..5d8f6f2f2c7a 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1362,6 +1362,7 @@ loadouts: - LoadoutSpeciesBreathTool - LoadoutClothingMaskAuralis # Harmony + - LoadoutClothingMaskVoxSpecial # Harmony - type: loadoutGroup id: GroupSpeciesBreathToolMedical @@ -1372,6 +1373,7 @@ loadouts: - LoadoutSpeciesBreathToolMedical - LoadoutClothingMaskAuralis # Harmony + - LoadoutClothingMaskVoxSpecial # Harmony - type: loadoutGroup id: GroupSpeciesBreathToolSecurity @@ -1382,3 +1384,5 @@ loadouts: - LoadoutSpeciesBreathToolSecurity - LoadoutClothingMaskAuralis # Harmony + - LoadoutClothingMaskVoxSpecial # Harmony + - LoadoutClothingMaskNTEnforcer # Harmony diff --git a/Resources/Prototypes/_Harmony/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_Harmony/Entities/Clothing/Masks/masks.yml index bd882feae25b..16d5a15ea271 100644 --- a/Resources/Prototypes/_Harmony/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_Harmony/Entities/Clothing/Masks/masks.yml @@ -14,3 +14,46 @@ - type: HideLayerClothing slots: - Snout + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskVoxSpecial + name: specialized vox gasmask + description: A Nanotrasen standard issue vox gasmask made to fit on a beak. + components: + - type: Sprite + sprite: _Harmony/Clothing/Mask/specvoxmask.rsi + - type: Clothing + sprite: _Harmony/Clothing/Mask/specvoxmask.rsi + - type: BreathMask + - type: IdentityBlocker + - type: Tag + - type: HideLayerClothing + slots: + - Snout + +- type: entity + parent: [ClothingMaskGas, BaseRestrictedContraband] + id: ClothingMaskNTEnforcer + name: nanotrasen enforcer gasmask + description: The mask of the dreaded Shoal Enforcers now in Nanotrasen blue + components: + - type: Item + size: Tiny + - type: Sprite + sprite: _Harmony/Clothing/Mask/NTenforcer.rsi + - type: Clothing + sprite: _Harmony/Clothing/Mask/NTenforcer.rsi + - type: BreathMask + - type: IdentityBlocker + - type: Tag + - type: HideLayerClothing + slots: + - Snout + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 diff --git a/Resources/Prototypes/_Harmony/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_Harmony/Loadouts/Miscellaneous/survival.yml index 9c48363c6eba..f2c0d9a5b069 100644 --- a/Resources/Prototypes/_Harmony/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_Harmony/Loadouts/Miscellaneous/survival.yml @@ -6,3 +6,21 @@ proto: EffectSpeciesVox equipment: mask: ClothingMaskAuralis + +# Breath Tool On Face +- type: loadout + id: LoadoutClothingMaskVoxSpecial + effects: + - !type:GroupLoadoutEffect + proto: EffectSpeciesVox + equipment: + mask: ClothingMaskVoxSpecial + +# Breath Tool On Face +- type: loadout + id: LoadoutClothingMaskNTEnforcer + effects: + - !type:GroupLoadoutEffect + proto: EffectSpeciesVox + equipment: + mask: ClothingMaskNTEnforcer \ No newline at end of file diff --git a/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/equipped-MASK-vox.png b/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..b21f79ace1d4 Binary files /dev/null and b/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/icon.png b/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/icon.png new file mode 100644 index 000000000000..35a6204c7157 Binary files /dev/null and b/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/icon.png differ diff --git a/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/meta.json b/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/meta.json new file mode 100644 index 000000000000..0cdc9897b9fc --- /dev/null +++ b/Resources/Textures/_Harmony/Clothing/Mask/NTenforcer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by jack-thedragon95 for use in Harmony", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/equipped-MASK-vox.png b/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..515ecbef0182 Binary files /dev/null and b/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/icon.png b/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/icon.png new file mode 100644 index 000000000000..3044eed26c46 Binary files /dev/null and b/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/icon.png differ diff --git a/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/meta.json b/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/meta.json new file mode 100644 index 000000000000..04f96798cb66 --- /dev/null +++ b/Resources/Textures/_Harmony/Clothing/Mask/specvoxmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit of the existing gasmask sprite (as of 12/14/2024)Made by jack-thedragon95 for use in Harmony", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +}