diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-cargo.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-cargo.ftl new file mode 100644 index 0000000000..0a56ea0292 --- /dev/null +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-cargo.ftl @@ -0,0 +1,2 @@ +ent-CargoLuxuryHardsuit = { ent-CrateCargoLuxuryHardsuit } + .desc = { ent-CrateCargoLuxuryHardsuit.desc } diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/cargo-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/cargo-crates.ftl new file mode 100644 index 0000000000..1be6a6cf50 --- /dev/null +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/cargo-crates.ftl @@ -0,0 +1,2 @@ +ent-CrateCargoLuxuryHardsuit = luxury mining hardsuit crate + .desc = Finally, a hardsuit Quartermasters could call their own. Centcomm has heard you, now stop asking. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index 97df4bef18..f36aee12e4 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -6,4 +6,14 @@ product: CargoPallet cost: 250 category: Cargo - group: market \ No newline at end of file + group: market + +- type: cargoProduct + id: CargoLuxuryHardsuit + icon: + sprite: Clothing/Head/Hardsuits/luxury.rsi + state: icon + product: CrateCargoLuxuryHardsuit + cost: 15000 + category: Cargo + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml new file mode 100644 index 0000000000..a5dc8e53c6 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -0,0 +1,7 @@ +- type: entity + id: CrateCargoLuxuryHardsuit + parent: CratePirate + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitLuxury diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index ffea4b3217..7237cbeccc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -300,6 +300,25 @@ Piercing: 0.9 Heat: 0.9 +#Luxury Mining Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitLuxury #DO NOT MAP - https://github.com/space-wizards/space-station-14/pull/19738#issuecomment-1703486738 + noSpawn: true + name: luxury mining hardsuit helmet + description: A refurbished mining hardsuit helmet, fitted with satin cushioning and an extra (non-functioning) antenna, because you're that extra. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/luxury.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/luxury.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: PointLight + radius: 7 + energy: 3 + #ANTAG HARDSUITS #Blood-red Hardsuit - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 36dc31247e..77cd1554dd 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -390,6 +390,36 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed +#Luxury Mining Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitLuxury #DO NOT MAP - https://github.com/space-wizards/space-station-14/pull/19738#issuecomment-1703486738 + name: luxury mining hardsuit + description: A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.8 + Radiation: 0.5 + Caustic: 0.8 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.9 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitLuxury + #ANTAG HARDSUITS #Blood-red Hardsuit - type: entity diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png new file mode 100644 index 0000000000..865873709e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png new file mode 100644 index 0000000000..3b8c23b7b5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json new file mode 100644 index 0000000000..d431123de2 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..95ed264c5e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png new file mode 100644 index 0000000000..b26ae9a31f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png new file mode 100644 index 0000000000..fc0edd4a97 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..4377435a3b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png new file mode 100644 index 0000000000..3f5034da6c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png new file mode 100644 index 0000000000..45776a03b8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..9a49a516b5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png new file mode 100644 index 0000000000..128c637556 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png new file mode 100644 index 0000000000..6b99071d3d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png new file mode 100644 index 0000000000..b56335aef5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json new file mode 100644 index 0000000000..d977572f2a --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}