diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml index 764f4638781..f900bfe3b56 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml @@ -4,6 +4,10 @@ items: - type: loadout id: LoadoutClothingBackpackBlueshield + - type: loadout + id: LoadoutClothingSatchelBlueshield + - type: loadout + id: LoadoutClothingDuffelBlueshield - type: characterItemGroup id: LoadoutBlueshieldOfficerVests @@ -13,6 +17,16 @@ id: LoadoutClothingBlueshieldArmoredJacket - type: loadout id: LoadoutClothingBlueshieldArmoredCowboyJacket + - type: loadout + id: LoadoutClothingBlueshieldArmorVest + - type: loadout + id: LoadoutClothingBlueshieldArmoredMarine + - type: loadout + id: LoadoutClothingBlueshieldArmoredVest + - type: loadout + id: LoadoutClothingBlueshieldArmoredKimono + - type: loadout + id: LoadoutClothingBlueshieldArmoredCoat - type: characterItemGroup id: LoadoutBlueshieldOfficerUniforms @@ -22,4 +36,14 @@ id: LoadoutClothingUniformJumpskirtBlueshieldOfficer - type: loadout id: LoadoutClothingUniformJumpsuitBlueshieldOfficer - \ No newline at end of file + +- type: characterItemGroup + id: LoadoutBlueshieldOfficerHats + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingBlueshieldBeretNavy + - type: loadout + id: LoadoutClothingBlueshieldBeretOfficer + - type: loadout + id: LoadoutClothingBlueshieldCowboyHat diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml index 47dd7507c76..337f9701bbe 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml @@ -14,6 +14,34 @@ items: - ClothingBackpackBlueshield +- type: loadout + id: LoadoutClothingSatchelBlueshield + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerBackpacks + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingBackpackSatchelBlueshield + +- type: loadout + id: LoadoutClothingDuffelBlueshield + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerBackpacks + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingBackpackDuffelBlueshield + # Belt # Ears @@ -25,6 +53,47 @@ # Gloves # Head +- type: loadout + id: LoadoutClothingBlueshieldBeretNavy + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerHats + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingHeadHatBeretNavy + +- type: loadout + id: LoadoutClothingBlueshieldBeretOfficer + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerHats + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingHeadHatBeretOfficer + +- type: loadout + id: LoadoutClothingBlueshieldCowboyHat + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerHats + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingHeadHatCowboyBlueshield # Id @@ -61,6 +130,76 @@ items: - ClothingBlueshieldArmoredCowboyJacket +- type: loadout + id: LoadoutClothingBlueshieldArmorVest + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerVests + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingBlueshieldArmourVest + +- type: loadout + id: LoadoutClothingBlueshieldArmoredMarine + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerVests + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingBlueshieldArmoredMarine + +- type: loadout + id: LoadoutClothingBlueshieldArmoredVest + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerVests + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingBlueshieldArmoredVest + +- type: loadout + id: LoadoutClothingBlueshieldArmoredKimono + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerVests + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingBlueshieldArmoredKimono + +- type: loadout + id: LoadoutClothingBlueshieldArmoredCoat + category: JobsCommandBlueshieldOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBlueshieldOfficerVests + - !type:CharacterJobRequirement + jobs: + - BlueshieldOfficer + items: + - ClothingBlueshieldArmoredCoat + # Shoes # Uniforms @@ -90,4 +229,4 @@ jobs: - BlueshieldOfficer items: - - ClothingUniformJumpsuitBlueshieldOfficer \ No newline at end of file + - ClothingUniformJumpsuitBlueshieldOfficer diff --git a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml index 8be2864619f..1bfd180f912 100644 --- a/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml @@ -29,6 +29,8 @@ - id: WeaponLeverChester - id: WeaponEnergyRevolver - id: BlueshieldAmmunitionBoxFilled + - id: ClothingOuterHardsuitBlueshield + - id: ClothingBlueshieldArmoredCoat - type: entity id: LockerMagistrateFilled diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml new file mode 100644 index 00000000000..50c93e1ce41 --- /dev/null +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml @@ -0,0 +1,23 @@ +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitBlueshield + name: blueshield's hardsuit helmet + description: Blueshield hardsuit with a top of the line gunlink. Belongs to the Blueshield. + components: + - type: BreathMask + - type: Sprite + sprite: _Goobstation/Clothing/Head/Hardsuits/blueshield.rsi + - type: Clothing + sprite: _Goobstation/Clothing/Head/Hardsuits/blueshield.rsi + - type: PointLight + color: "#57b9ff" + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml index fa40bdbe5af..02867bb4db0 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml @@ -44,3 +44,70 @@ sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_cowboy_jacket.rsi - type: Item size: Normal + +- type: entity + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, ClothingOuterStorageFoldableBase] + id: ClothingBlueshieldArmoredCoat + name: blueshield's armored coat + description: A coat for cold winter seasons with sewn in plates. + components: + - type: Sprite + sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi + - type: Clothing + sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi + - type: Item + size: Normal + - type: Armor + modifiers: + coefficients: + Blunt: 0.60 + Slash: 0.60 + Piercing: 0.65 + Heat: 0.70 + - type: TemperatureProtection + coefficient: 0.1 + +- type: entity + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingBlueshieldArmoredCoat] + id: ClothingBlueshieldArmoredCoatOpen + name: blueshield's armored coat + suffix: Opened + +- type: entity + parent: ClothingBlueshieldArmourVest + id: ClothingBlueshieldArmoredMarine + name: blueshield's armored marine vest + description: A vest from the blueshield's time in the marines. + components: + - type: Sprite + sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi + - type: Clothing + sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi + - type: Item + size: Normal + +- type: entity + parent: ClothingBlueshieldArmourVest + id: ClothingBlueshieldArmoredVest + name: blueshield's armored vest + description: A vest with sewn-in reinforcement layers. + components: + - type: Sprite + sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi + - type: Clothing + sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi + - type: Item + size: Normal + +- type: entity + parent: ClothingBlueshieldArmourVest + id: ClothingBlueshieldArmoredKimono + name: blueshield's armored kimono + description: As times evolve, so must the Blueshield. + components: + - type: Sprite + sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi + - type: Clothing + sprite: _Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi + - type: Item + size: Normal diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml new file mode 100644 index 00000000000..23812c039b9 --- /dev/null +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml @@ -0,0 +1,31 @@ +- type: entity + parent: ClothingOuterHardsuitSecurity + id: ClothingOuterHardsuitBlueshield + name: blueshield's hardsuit + description: A special hardsuit made for the Blueshield, contains extra armor. + components: + - type: Sprite + sprite: _Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi + - type: Clothing + sprite: _Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.5 + Piercing: 0.5 + Radiation: 0.5 + Caustic: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitBlueshield + - type: StaminaDamageResistance + coefficient: 0.5 # 50% diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/icon-flash.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/icon-flash.png new file mode 100644 index 00000000000..f80aeccc2f9 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/icon-flash.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/icon.png new file mode 100644 index 00000000000..2a29e4a2664 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/meta.json new file mode 100644 index 00000000000..526f5322607 --- /dev/null +++ b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bubberstation", + "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/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..ee6df48cdff Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-inhand-left.png new file mode 100644 index 00000000000..cfc750e51a2 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-inhand-right.png new file mode 100644 index 00000000000..60a12ae71e5 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..8c5be62a40a Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-inhand-left.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-inhand-left.png new file mode 100644 index 00000000000..651589caa78 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-inhand-right.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-inhand-right.png new file mode 100644 index 00000000000..45ca99a312b Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/blueshield.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..1ab40232cb9 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/icon-open.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/icon-open.png new file mode 100644 index 00000000000..dc8dbab657c Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/icon-open.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/icon.png new file mode 100644 index 00000000000..5f188d99cb1 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/icon.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/inhand-left.png new file mode 100644 index 00000000000..9ff8595a98c Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/inhand-right.png new file mode 100644 index 00000000000..d675270c3a4 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/meta.json new file mode 100644 index 00000000000..c41e6cd75f4 --- /dev/null +++ b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bubberstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..69cbebb00b4 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-inhand-left.png new file mode 100644 index 00000000000..c24b257e1e2 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-inhand-right.png new file mode 100644 index 00000000000..2c753357e15 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_coat.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..880d206b66c Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/icon.png new file mode 100644 index 00000000000..84b80fb21fc Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/icon.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/inhand-left.png new file mode 100644 index 00000000000..73f11740c3c Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/inhand-right.png new file mode 100644 index 00000000000..ffdb00debd0 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/meta.json new file mode 100644 index 00000000000..99a2199f85b --- /dev/null +++ b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_kimono.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bubberstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..21e8bedf633 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/icon.png new file mode 100644 index 00000000000..21bf1ae6a2e Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/icon.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/inhand-left.png new file mode 100644 index 00000000000..e8ac60197e5 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/inhand-right.png new file mode 100644 index 00000000000..a60f09d0e7c Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/meta.json new file mode 100644 index 00000000000..99a2199f85b --- /dev/null +++ b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_marine.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bubberstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4724aadc54a Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/icon.png new file mode 100644 index 00000000000..0c081ed8e5b Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/icon.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/inhand-left.png new file mode 100644 index 00000000000..8aaa00e537f Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/inhand-right.png new file mode 100644 index 00000000000..cfaec0df79d Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/meta.json new file mode 100644 index 00000000000..99a2199f85b --- /dev/null +++ b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_vest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bubberstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..daad3eb3e4e Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/icon.png new file mode 100644 index 00000000000..712e052bbe8 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..bec4a860625 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..08d9710b8ba Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/meta.json new file mode 100644 index 00000000000..169985e05ee --- /dev/null +++ b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work of the inhand sprites by TJohnson. Resprite of the inhand sprites by ShirouAjisai. Icon & OUTERCLOTHING from Bubberstation.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "segment" + } + ] +} diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/segment.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/segment.png new file mode 100644 index 00000000000..4b973de1539 Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/Combat/blueshield.rsi/segment.png differ