diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 56813307925cca..e6651b28762fb8 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -364,8 +364,8 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoshat - name: head of security cap - description: The robust standard-issue cap of the Head of Security. For showing the officers who's in charge. + name: head of security's hat + description: "There's a new sheriff in station." components: - type: Sprite sprite: Clothing/Head/Hats/hoshat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index bbf75002014c09..268d4f1b087675 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -13,7 +13,7 @@ parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic] id: ClothingOuterCoatDetective name: detective trenchcoat - description: An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business. + description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans. components: - type: Sprite sprite: Clothing/OuterClothing/Coats/detective.rsi @@ -37,7 +37,6 @@ - type: Clothing sprite: Clothing/OuterClothing/Coats/detective_grey.rsi - - type: entity parent: ClothingOuterCoatDetective id: ClothingOuterCoatDetectiveLoadout diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 88b2f2288f65af..97ab5cce32c5b7 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -228,20 +228,6 @@ sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpskirt/color.rsi - - state: overlay-inhand-left - sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - right: - - state: inhand-right - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpskirt/color.rsi - - state: overlay-inhand-right - sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - type: entity parent: ClothingUniformSkirtBase @@ -446,21 +432,6 @@ sprite: Clothing/Uniforms/Jumpskirt/security.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/security.rsi - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpskirt/color.rsi - - state: overlay-inhand-left - sprite: Clothing/Uniforms/Jumpsuit/security.rsi - right: - - state: inhand-right - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpskirt/color.rsi - - state: overlay-inhand-right - sprite: Clothing/Uniforms/Jumpsuit/security.rsi - - type: entity parent: ClothingUniformSkirtBase @@ -472,21 +443,6 @@ sprite: Clothing/Uniforms/Jumpskirt/warden.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/warden.rsi - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpskirt/color.rsi - - state: overlay-inhand-left - sprite: Clothing/Uniforms/Jumpsuit/warden.rsi - right: - - state: inhand-right - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpskirt/color.rsi - - state: overlay-inhand-right - sprite: Clothing/Uniforms/Jumpsuit/warden.rsi - - type: entity parent: ClothingUniformSkirtBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 65fec347219d83..f12893830650ac 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -406,18 +406,6 @@ sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpsuit/color.rsi - - state: overlay-inhand-left - right: - - state: inhand-right - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpsuit/color.rsi - - state: overlay-inhand-right - type: entity parent: ClothingUniformBase @@ -711,18 +699,6 @@ sprite: Clothing/Uniforms/Jumpsuit/security.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/security.rsi - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpsuit/color.rsi - - state: overlay-inhand-left - right: - - state: inhand-right - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpsuit/color.rsi - - state: overlay-inhand-right - type: entity parent: ClothingUniformBase @@ -756,18 +732,6 @@ sprite: Clothing/Uniforms/Jumpsuit/warden.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/warden.rsi - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpsuit/color.rsi - - state: overlay-inhand-left - right: - - state: inhand-right - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpsuit/color.rsi - - state: overlay-inhand-right - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/Starshine/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Starshine/Entities/Clothing/OuterClothing/coats.yml index 4f9023560f86aa..0369f8b50af6c4 100644 --- a/Resources/Prototypes/Starshine/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Starshine/Entities/Clothing/OuterClothing/coats.yml @@ -40,3 +40,14 @@ sprite: Starshine/Clothing/OuterClothing/Coats/hos_honorary_trenchcoat.rsi - type: Clothing sprite: Starshine/Clothing/OuterClothing/Coats/hos_honorary_trenchcoat.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatInspector + name: inspector's coat + description: A strict inspector's coat for being intimidating during inspections. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/insp_coat.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/insp_coat.rsi diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-dog.png deleted file mode 100644 index 12f712c69634bf..00000000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-dog.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json index b801c3d4534ba0..6154f16eddcf59 100644 --- a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json @@ -18,10 +18,6 @@ "name": "inhand-left", "directions": 4 }, - { - "name": "equipped-HELMET-dog", - "directions": 4 - }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET-dog.png deleted file mode 100644 index c01092bb7b2a23..00000000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET-dog.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json index 43ca88fabd62ca..cb460f5efa7130 100644 --- a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json @@ -18,10 +18,6 @@ "name": "inhand-left", "directions": 4 }, - { - "name": "equipped-HELMET-dog", - "directions": 4 - }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000000..8b7692f0ff3276 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png index b49cf3fc4bd974..f980e7b3ecc83b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png index 5c93734fe8a6fc..e441011bcf4b48 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png index 4900beca1d7621..d0213d0eab33d1 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png index 79e7e68ec6d06e..36d4c7032f20a1 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json index 3251086985e748..33f5fff0cae44f 100644 --- a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json @@ -22,6 +22,10 @@ "name": "equipped-HELMET-dog", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png index 1f6b8adcebab18..952b32f3a1a34d 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png index af6fbcd77e91b4..3264d3cde68e74 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png index 55eaa9ed576192..a2892255be8348 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png index cd3dc7f5575448..9640ec825fbbb5 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json index 292dc9c99396b1..abfed0635afd64 100644 --- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png index 47a6bfb145fc64..703d927ecfeac2 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png index fd0c4dd25d592d..4fd9f44ff218b7 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png index 2ddfc4379ffaa5..f8f7501afcdeae 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index ff0b6b723b7d5b..a8bbe3dfac7249 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png new file mode 100644 index 00000000000000..e1ed2d59ae4ae7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png new file mode 100644 index 00000000000000..634828f1b3e5a5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json index 20fb373db65966..a0653e5c65fbc6 100644 --- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -18,6 +18,14 @@ "name": "equipped-HELMET-vox", "directions": 4 }, + { + "name": "light-equipped-HELMET", + "directions": 4 + }, + { + "name": "lighton-equipped-HELMET", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png index e13fb420993a8b..1ed974c2062485 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png index 770a9c020d10a0..030107f05e3e15 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png index 27ce818b8e55d4..c334355ba851e9 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png index 9316e65d1c0fd6..423f3fe52e6145 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json index 20fb373db65966..f505b4e75e8ec4 100644 --- a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites & vox state by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png index 31bb5b7ada07d3..e228a8a33aa3e7 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png index 194c17066d29c1..6c958708c8d3a7 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png index 2932481da1ac08..e0ab815b503825 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json index 20fb373db65966..a0bf9545853d10 100644 --- a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy. Vox state taken from from Paradise at https://github.com/ParadiseSS13/Paradise/blob/b1658390731745adf5cc9fb039bb0f17ad3c11a7/icons/mob/clothing/species/vox/helmet.dmi ", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png index e89ec20485b1bc..31e6f31708ee89 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png index 1d911bfa1a2ab7..987679cecb9360 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png index d6f9dad5568755..20ac8b6d189461 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png index 0aca0dd5172933..aa0228cf311166 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png index b4012d09ead0e4..4d6c934790623a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json index afc5942298c6bf..fa20ea7d5966de 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise at commit bad1ec7aa2c86df5794dc6ba28be05ebd0228012", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000000..6790bf5e94e91c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png new file mode 100644 index 00000000000000..61ad9f95171cfd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png new file mode 100644 index 00000000000000..72db4712bb5a18 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png new file mode 100644 index 00000000000000..e50751b374b7c4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json new file mode 100644 index 00000000000000..e482264df5f8b7 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken 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 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png index 3b01d4176c4b3c..a56db4fd532819 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png index 2426c2aa251d5d..b62a0318da7d58 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png index 2a06209b628400..b226550a5d194a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png index 62d25c958bbf76..51b08d956811dd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png index 581ba4b95153a4..464ee509bc3043 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json index cb3e0ab4710a50..232bec9c0a223c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and modified by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png index 9e02aa280aafa3..50e6d79c20f046 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png index 73c0691b96b074..2e86e344383621 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png index 043e2709ddbe1b..e0de8c7ec98149 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png index 30dd5afe3f3712..457d2f0aa733cb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png index 26ec896bf6e001..46c4bf259c7089 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json index 175876d3d7216b..920eab55204dea 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000000..b3d41dd754cf88 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png index 54c35ef4551044..0eff0ab3faa977 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png index 50d752aa667dc7..31ba54e8af73ae 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png new file mode 100644 index 00000000000000..f3b0529e93ce73 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png new file mode 100644 index 00000000000000..d7cfdd2a252944 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index 2b78bcd698377d..bbcef071e2ea56 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000000..9acfc278c02231 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png index bede369f672c76..8781d46b5f813e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png index 619ad40626dafa..accf74dc8f6914 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png new file mode 100644 index 00000000000000..5fc87a93df4b9b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png new file mode 100644 index 00000000000000..1cb708b7adc46d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json index 2b78bcd698377d..45e0f9141cb3b6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.", + "copyright": "Original sec jumpsuit from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, jumpskirt sprite made by Flareguy for SS14. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000000..8b722ac058126a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png index d2380bdf73a3f1..56e7e3567a3cf0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png index d44522dcca7306..77db2ff0284989 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png new file mode 100644 index 00000000000000..2ed552361f3dc6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png new file mode 100644 index 00000000000000..dec63daa282220 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json index 2b78bcd698377d..bbcef071e2ea56 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000000..fa049e89a597f6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png index bf0b30d17aaf22..80984c51c1279b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png index b0e364c82595b6..94007963536373 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png new file mode 100644 index 00000000000000..f3b0529e93ce73 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png new file mode 100644 index 00000000000000..d7cfdd2a252944 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json index 8fe98eacbe4f61..3f72fb446001b9 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -15,11 +15,15 @@ "directions": 4 }, { - "name": "overlay-inhand-left", + "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, { - "name": "overlay-inhand-right", + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png deleted file mode 100644 index cedb1942e7cb31..00000000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png deleted file mode 100644 index 8a353cc390f8db..00000000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000000..f17cb0661b2953 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png index bd0af340983492..2fb771d84c3133 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png index be5b2406d20848..a3186ba4c1adc2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png new file mode 100644 index 00000000000000..5fc87a93df4b9b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png new file mode 100644 index 00000000000000..1cb708b7adc46d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json index 8fe98eacbe4f61..c11c48fe747182 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github).", "size": { "x": 32, "y": 32 @@ -15,11 +15,15 @@ "directions": 4 }, { - "name": "overlay-inhand-left", + "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, { - "name": "overlay-inhand-right", + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png deleted file mode 100644 index f6bb7be725d769..00000000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png deleted file mode 100644 index 139eaee057d17c..00000000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000000..562402ee893cac Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png index 67ba63f7cdbbfa..a912ead1775d26 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png index e7ae72ca07f89c..331203e531f8b0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png new file mode 100644 index 00000000000000..2ed552361f3dc6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png new file mode 100644 index 00000000000000..dec63daa282220 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json index 8fe98eacbe4f61..3f72fb446001b9 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -15,11 +15,15 @@ "directions": 4 }, { - "name": "overlay-inhand-left", + "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, { - "name": "overlay-inhand-right", + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png deleted file mode 100644 index d3a01e1a6cc33e..00000000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png deleted file mode 100644 index ffe5f93eba512d..00000000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png and /dev/null differ