diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index 0465164d6f..a957119b62 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -81,6 +81,9 @@ - id: ClothingOuterHardsuitAtmos - id: ClothingMaskBreath - id: OxygenTankFilled + - id: ClothingOuterSuitAtmosFire + - id: ClothingHeadHelmetAtmosFire + - id: GasAnalyzer - type: entity id: LockerEngineerFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index d832b66e31..ce6edef19e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -51,8 +51,6 @@ prob: 1 - id: TaserGun prob: 1 - - id: ClothingShoesColorBlack - prob: 0.7 - id: ClothingHeadHelmetHardsuitCap prob: 1 - id: CommsComputerCircuitboard @@ -67,6 +65,9 @@ prob: 0.25 - id: ClothingBeltSheathFilled - id: DoorRemoteCommand + - id: ClothingNeckCloakCapFormal + - id: ClothingUniformJumpsuitCapFormal + - id: ClothingUniformJumpskirtCapFormalDress - type: entity id: LockerHeadOfPersonnelFilled @@ -212,3 +213,5 @@ - id: CigarGoldCase prob: 0.50 - id: DoorRemoteSecurity + - id: ClothingUniformJumpskirtHosFormal + - id: ClothingUniformJumpsuitHosFormal diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index bd6b2be6d5..c79cefe9fe 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -173,4 +173,18 @@ cellSlot: startingItem: PowerCellSmallHigh - type: TemperatureProtection - coefficient: 0.01 \ No newline at end of file + coefficient: 0.01 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase # hardsuitlight base for light and protection + id: ClothingHeadHelmetAtmosFire + name: atmos fire helmet + description: An atmos fire helmet, able to keep the user cool in any situation. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi + - type: IngestionBlocker + - type: TemperatureProtection + coefficient: 0.005 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 3e8a2613ba..494d831746 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -96,4 +96,37 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/nanotrasen.rsi - type: Clothing - sprite: Clothing/Neck/Cloaks/nanotrasen.rsi \ No newline at end of file + sprite: Clothing/Neck/Cloaks/nanotrasen.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakCapFormal + name: captain's formal cloak + description: A lavish and decorated cloak for special occasions. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/capcloakformal.rsi + - type: Clothing + sprite: Clothing/Neck/Cloaks/capcloakformal.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakAdmin + name: Admin Cloak + description: Weh! + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/admin.rsi + - type: Clothing + sprite: Clothing/Neck/Cloaks/admin.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakMiner + name: Miner's Cloak + description: Worn by the most skilled miners, for one who has moved mountains and filled valleys. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/miner.rsi + - type: Clothing + sprite: Clothing/Neck/Cloaks/miner.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 382915b0be..d333b03037 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -9,15 +9,18 @@ - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi - type: PressureProtection - highPressureMultiplier: 0.5 + highPressureMultiplier: 0.45 lowPressureMultiplier: 100 + - type: ClothingSpeedModifier + walkModifier: 0.65 + sprintModifier: 0.65 #less armor than engineering but slightly higher move speed so they can get to breaches a bit faster - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 + Blunt: 0.95 #less physical protection but significantly more atmospheric protections than engi + Slash: 0.95 Piercing: 0.95 - Heat: 0.8 #All default but having a little better heat prot makes sense based on the description + Heat: 0.35 Radiation: 0.25 - type: entity @@ -83,14 +86,17 @@ - type: PressureProtection highPressureMultiplier: 0.65 lowPressureMultiplier: 100 + - type: ClothingSpeedModifier + walkModifier: 0.65 + sprintModifier: 0.55 #slightly slower than magboot walking - type: Armor modifiers: coefficients: - Blunt: 0.90 - Slash: 0.90 - Piercing: 0.95 - Heat: 0.90 - Radiation: 0.05 #all default, rad armor is higher + Blunt: 0.9 #higher physical protections than atmo but less enviro + Slash: 0.85 + Piercing: 0.9 + Heat: 0.85 + Radiation: 0.35 - type: entity parent: ClothingOuterHardsuitBase @@ -105,13 +111,16 @@ - type: PressureProtection highPressureMultiplier: 0.45 lowPressureMultiplier: 100 + - type: ClothingSpeedModifier + walkModifier: 0.65 + sprintModifier: 0.75 #It's the advanced hardsuit it should be a little faster than engineering imo - type: Armor modifiers: coefficients: Blunt: 0.9 - Slash: 0.9 - Piercing: 0.95 - Heat: 0.8 + Slash: 0.85 + Piercing: 0.9 + Heat: 0.55 Radiation: 0.05 #combines the engi and atmos bonuses #The voidsuit and eva suit are not techically 'hardsuits' but this seems to be the place for all EVA-capable outer clothing. This may be worth reevaluating when we have a lot more items. @@ -126,8 +135,9 @@ - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/ihsvoid.rsi - type: PressureProtection - highPressureMultiplier: 1 - lowPressureMultiplier: 100 + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 - type: entity parent: ClothingOuterHardsuitBase @@ -194,6 +204,9 @@ lowPressureMultiplier: 100 - type: DiseaseProtection protection: 0.2 + - type: ClothingSpeedModifier + walkModifier: 0.7 #higher speed to reflect description but not as high as cap/eva + sprintModifier: 0.7 - type: entity parent: ClothingOuterHardsuitBase @@ -214,8 +227,11 @@ Blunt: 0.6 #increased blunt as per description, for bomb survival Slash: 0.9 Piercing: 0.95 - Heat: 0.9 + Heat: 0.65 #increased enviro due to science getting increasingly involved with artifact testing Radiation: 0.25 + - type: ClothingSpeedModifier + walkModifier: 0.65 #heavier armor but still a bit faster than engineering + sprintModifier: 0.6 - type: entity parent: ClothingOuterHardsuitBase @@ -230,6 +246,17 @@ - type: PressureProtection highPressureMultiplier: 0.75 lowPressureMultiplier: 100 + - type: ClothingSpeedModifier + walkModifier: 0.65 #higher move speed because ive seen salvage teams straight up stealing eva to go about salvaging faster + sprintModifier: 0.55 + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 #closer stats to what the mining suit had in 13 + Slash: 0.85 + Piercing: 0.9 + Heat: 0.9 + Radiation: 0.5 - type: entity parent: ClothingOuterHardsuitBase @@ -266,7 +293,18 @@ - type: PressureProtection highPressureMultiplier: 0.75 lowPressureMultiplier: 100 - + - type: ClothingSpeedModifier + walkModifier: 0.7 #faster than sec hardsuit because HoS hardsuit should be better imo, sec hardsuit retains default hardsuit movespeed to discourage continual wear + sprintModifier: 0.55 + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 #slightly higher than sec hardsuit + Slash: 0.75 + Piercing: 0.7 + Heat: 0.8 + Radiation: 0.25 + - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitSyndie @@ -287,7 +325,7 @@ modifiers: coefficients: Blunt: 0.6 - Slash: 0.6 + Slash: 0.55 Piercing: 0.4 Heat: 0.4 #all the combat numbers are pumped up here Radiation: 0.20 @@ -314,5 +352,5 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.4 - Heat: 0.4 #same as the nukie suit + Heat: 0.25 #higher heat resist due to spell casting Radiation: 0.20 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 61bec73c34..48a46bc9c9 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -49,7 +49,7 @@ highPressureMultiplier: 0.85 lowPressureMultiplier: 25 - type: TemperatureProtection - coefficient: 0.01 + coefficient: 0.03 - type: Clothing sprite: Clothing/OuterClothing/Suits/fire.rsi - type: Armor @@ -124,3 +124,24 @@ sprite: Clothing/OuterClothing/Suits/monkey.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/monkey.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSuitAtmosFire + name: atmos fire suit + description: An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.65 + lowPressureMultiplier: 25 + - type: TemperatureProtection + coefficient: 0.01 + - type: Clothing + sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi + - type: Armor + modifiers: + coefficients: + Slash: 0.9 + Heat: 0.5 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index b55b877127..ab3f9d2024 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -486,3 +486,37 @@ sprite: Clothing/Uniforms/Jumpskirt/performer.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/performer.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtCapFormalDress + name: captain's formal dress + description: A dress for special occasions. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/capformaldress.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/capformaldress.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtCentcomFormalDress + name: central command formal dress + description: A dress for special occasions + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtHosFormal + name: hos's formal dress + description: A dress for special occasions. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi + diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index f781ef4af0..2a5ce951dd 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -712,3 +712,37 @@ sprite: Clothing/Uniforms/Jumpsuit/nanotrasen.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/nanotrasen.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCapFormal + name: captain's formal suit + description: A suit for special occasions. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/capformal.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/capformal.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCentcomFormal + name: central command formal suit + description: A suit for special occasions. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitHosFormal + name: hos's formal suit + description: A suit for special occasions. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi + diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png new file mode 100644 index 0000000000..36f945fe2a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png new file mode 100644 index 0000000000..b86a968e89 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json new file mode 100644 index 0000000000..26d3341e24 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/head.dmi", + "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/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..10d94a0bfc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-inhand-left.png new file mode 100644 index 0000000000..d160d53dcb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-inhand-right.png new file mode 100644 index 0000000000..d129ff0d60 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..4d944c9c79 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-inhand-left.png new file mode 100644 index 0000000000..e4f821ebae Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-inhand-right.png new file mode 100644 index 0000000000..2d41a12379 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/equipped-NECK.png new file mode 100644 index 0000000000..b2557076dc Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/icon.png new file mode 100644 index 0000000000..1510252ae4 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/meta.json new file mode 100644 index 0000000000..78bff2e5bf --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/admin.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by emisse and inspired by weh plushie", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png new file mode 100644 index 0000000000..2514495069 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png new file mode 100644 index 0000000000..7cc31543e4 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json new file mode 100644 index 0000000000..3b2bbfcb8d --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/pull/62603 which was taken from bee station. Bee station does not have a history on the cloaks on their github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/equipped-NECK.png new file mode 100644 index 0000000000..7028db8860 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/icon.png new file mode 100644 index 0000000000..76092daabd Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/meta.json new file mode 100644 index 0000000000..81f0b4c545 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/obj/clothing/cloaks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..767e302b93 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png new file mode 100644 index 0000000000..53b29f4d2d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-left.png new file mode 100644 index 0000000000..2cfb3c17dd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-right.png new file mode 100644 index 0000000000..51c28fe103 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json new file mode 100644 index 0000000000..d0d17fbfba --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi", + "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/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..ccb4d6ce9f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png new file mode 100644 index 0000000000..50641b757b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png new file mode 100644 index 0000000000..46bc66d25f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png new file mode 100644 index 0000000000..db345a7434 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json new file mode 100644 index 0000000000..d20d9b8909 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..68926b1492 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/icon.png new file mode 100644 index 0000000000..07f2117286 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-left.png new file mode 100644 index 0000000000..66d8a01385 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-right.png new file mode 100644 index 0000000000..3041ef14f7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json new file mode 100644 index 0000000000..d20d9b8909 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..81961aeaff Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/icon.png new file mode 100644 index 0000000000..7fce6b20c5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-left.png new file mode 100644 index 0000000000..9d04c2b5e9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-right.png new file mode 100644 index 0000000000..79424b4fea Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json new file mode 100644 index 0000000000..d20d9b8909 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..2b721dd0ee Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png new file mode 100644 index 0000000000..b6ecfcb58c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png new file mode 100644 index 0000000000..c591079d53 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png new file mode 100644 index 0000000000..e8d24fd267 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json new file mode 100644 index 0000000000..d20d9b8909 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..ccb4d6ce9f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/icon.png new file mode 100644 index 0000000000..50641b757b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/inhand-left.png new file mode 100644 index 0000000000..46bc66d25f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/inhand-right.png new file mode 100644 index 0000000000..db345a7434 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/meta.json new file mode 100644 index 0000000000..abf31088e8 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..f4b8803b93 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/icon.png new file mode 100644 index 0000000000..2c05e0f6c4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-left.png new file mode 100644 index 0000000000..8d3b010a94 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-right.png new file mode 100644 index 0000000000..6664a7a58e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json new file mode 100644 index 0000000000..d20d9b8909 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..7ccf7c4838 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/icon.png new file mode 100644 index 0000000000..6235db0a08 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-left.png new file mode 100644 index 0000000000..b3d694d2e3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-right.png new file mode 100644 index 0000000000..add9dfcbb2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json new file mode 100644 index 0000000000..d20d9b8909 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}