diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/mercs.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/mercs.yml index 679dd58dd9d..b00e1b28db3 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/mercs.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/mercs.yml @@ -42,3 +42,16 @@ - Snout - HeadTop - HeadSide + +- type: entity + parent: ClothingHeadHelmetHardsuitMercenary + id: ClothingHeadHelmetHardsuitPrivateSecurity + name: private security hardsuit helmet + description: Lightly armored hardsuit helmet for private security needs. + components: + - type: Sprite + sprite: _Mono/Clothing/Head/Hardsuits/private_security.rsi + - type: Clothing + sprite: _Mono/Clothing/Head/Hardsuits/private_security.rsi + - type: PointLight + color: "#77e7e5" diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/mercs.yml b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/mercs.yml index 840c0c443f6..1697b9dba1f 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/mercs.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/mercs.yml @@ -38,4 +38,23 @@ id: ClothingOuterHardsuitTacsuit - type: StaminaDamageResistance coefficient: 0.6 + +- type: entity + parent: ClothingOuterHardsuitMercenary + id: ClothingOuterHardsuitPrivateSecurity # stats are of merc hardsuit + name: private security hardsuit + description: A special suit that protects from the danger of space, employed by private security forces. + components: + - type: Sprite + sprite: _Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi + - type: Clothing + sprite: _Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi + - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits + requiredSlot: outerclothing + blockUnequipWhenAttached: false + replaceCurrentClothing: true + clothingPrototypes: + head: ClothingHeadHelmetHardsuitPrivateSecurity + helmetcover: ClothingHeadHelmetCoverBlock + helmetattachment: ClothingHeadHelmetAttachmentBlock diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index dca3c1c6944..74108739e57 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -29,18 +29,8 @@ Piercing: 0.9 Heat: 0.9 -- type: entity - parent: ClothingHeadHelmetHardsuitMercenary - id: ClothingHeadHelmetHardsuitPrivateSecurity - name: private security hardsuit helmet - description: Lightly armored hardsuit helmet for private security needs. - components: - - type: Sprite - sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi - - type: Clothing - sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi - - type: PointLight - color: "#ffff00" + +# MONO - private security headgear moved to mercs.yml in _Mono #Pilot Hardsuit - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index c3084cd94de..2aa3beb7388 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -40,24 +40,7 @@ - type: StaminaDamageResistance # Mono - Stamres coefficient: 0.65 -- type: entity - parent: ClothingOuterHardsuitMercenary - id: ClothingOuterHardsuitPrivateSecurity # stats are of merc hardsuit - name: private security hardsuit - description: A special suit that protects from the danger of space, employed by private security forces. - components: - - type: Sprite - sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi - - type: Clothing - sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi - - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits - requiredSlot: outerclothing - blockUnequipWhenAttached: false - replaceCurrentClothing: true - clothingPrototypes: - head: ClothingHeadHelmetHardsuitPrivateSecurity - helmetcover: ClothingHeadHelmetCoverBlock - helmetattachment: ClothingHeadHelmetAttachmentBlock +# MONO - Private Security hardsuit moved to mercs.yml in _Mono after resprite. # Pilot Hardsuit - Spationaut stats - type: entity diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png new file mode 100644 index 00000000000..92e5379454a Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/icon.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/icon.png new file mode 100644 index 00000000000..04c67456b59 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/meta.json similarity index 64% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json rename to Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/meta.json index 01db878e895..97df10ce7d1 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json +++ b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1, modified and recolored by MagnusCrowe", + "copyright": "Sprited by UnicornOnLSD (GitHub)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..7617fa63372 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..46008d76aa8 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..6e35e3c081d Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png new file mode 100644 index 00000000000..86fd6c00923 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png new file mode 100644 index 00000000000..8faa7561722 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png new file mode 100644 index 00000000000..17aeae15148 Binary files /dev/null and b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json similarity index 52% rename from Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json rename to Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json index 6fdc7d3c4e2..d5d307e71a4 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json +++ b/Resources/Textures/_Mono/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7, modified and recolored by MagnusCrowe | equipped-OUTERCLOTHING-resomi by f0x-n3rd (github)", + "copyright": "Sprited by UnicornOnLSD (GitHub)", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png deleted file mode 100644 index a47ce1f6e67..00000000000 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon.png deleted file mode 100644 index 6c0475392ca..00000000000 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png deleted file mode 100644 index 1d1d7023ad4..00000000000 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png deleted file mode 100644 index 7a463a1cc08..00000000000 Binary files a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index e32bfe73478..00000000000 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 6acbf4f6a1d..00000000000 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png deleted file mode 100644 index 41f93b1f08b..00000000000 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png deleted file mode 100644 index b81c4c22265..00000000000 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png deleted file mode 100644 index aace4cdcd92..00000000000 Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png and /dev/null differ