diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 3cb383e9cb..c28a6be535 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -2,9 +2,15 @@ id: LawDrobeInventory startingInventory: ClothingUniformJumpsuitLawyerBlue: 1 + ClothingUniformJumpskirtLawyerBlue: 1 ClothingUniformJumpsuitLawyerPurple: 1 + ClothingUniformJumpskirtLawyerPurple: 1 ClothingUniformJumpsuitLawyerRed: 1 + ClothingUniformJumpskirtLawyerRed: 1 ClothingUniformJumpsuitLawyerBlack: 1 - ClothingShoesColorBlack: 2 + ClothingUniformJumpskirtLawyerBlack: 1 + ClothingUniformJumpsuitLawyerGood: 1 + ClothingUniformJumpskirtLawyerGood: 1 + ClothingShoesBootsLaceup: 2 ClothingHeadsetService: 2 ClothingNeckLawyerbadge: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 55cee71fcf..757dd14c39 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -52,3 +52,14 @@ sprite: Clothing/Shoes/Boots/jackboots.rsi - type: Clothing sprite: Clothing/Shoes/Boots/jackboots.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesBootsLaceup + name: laceup shoes + description: The height of fashion, and they're pre-polished! + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/laceups.rsi + - type: Clothing + sprite: Clothing/Shoes/Boots/laceups.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 35c65ac28c..1010890f8c 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -552,3 +552,58 @@ sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtLawyerRed + name: red lawyer suitskirt + description: A flashy red suitskirt worn by lawyers and show-offs. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/lawyerred.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/lawyerred.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtLawyerBlue + name: blue lawyer suitskirt + description: A flashy blue suitskirt worn by lawyers and show-offs. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/lawyerblue.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/lawyerblue.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtLawyerBlack + name: black lawyer suitskirt + description: A subtle black suitskirt worn by lawyers and gangsters. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/lawyerblack.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/lawyerblack.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtLawyerPurple + name: purple lawyer suitskirt + description: A stylish purple piece worn by lawyers and show people. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtLawyerGood + name: good lawyer's suitskirt + description: A tacky suitskirt perfect for a CRIMINAL lawyer! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 696976dfc3..0d3f3f173f 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -207,7 +207,7 @@ sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi - + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHoP @@ -639,7 +639,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitLawyerRed - name: red lawyer jumpsuit + name: red lawyer suit description: A flashy red suit worn by lawyers and show-offs. components: - type: Sprite @@ -650,7 +650,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitLawyerBlue - name: blue lawyer jumpsuit + name: blue lawyer suit description: A flashy blue suit worn by lawyers and show-offs. components: - type: Sprite @@ -661,7 +661,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitLawyerBlack - name: black lawyer jumpsuit + name: black lawyer suit description: A subtle black suit worn by lawyers and gangsters. components: - type: Sprite @@ -672,7 +672,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitLawyerPurple - name: purple lawyer jumpsuit + name: purple lawyer suit description: A stylish purple piece worn by lawyers and show people. components: - type: Sprite @@ -680,6 +680,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitLawyerGood + name: good lawyer's suit + description: A tacky suit perfect for a CRIMINAL lawyer! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/lawyergood.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/lawyergood.rsi + - type: entity parent: UnsensoredClothingUniformBase id: ClothingUniformJumpsuitPyjamaSyndicateBlack diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 20f74a946f..c5c3719339 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -15,8 +15,8 @@ equipment: jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants back: ClothingBackpackBriefcaseFilled - shoes: ClothingShoesColorBlack + shoes: ClothingShoesBootsLaceup id: LawyerPDA ears: ClothingHeadsetSecurity # TODO add copy of space law - + innerclothingskirt: ClothingUniformJumpskirtLawyerBlack diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 2863d92f06..41e8eb6058 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -14,7 +14,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitLibrarian back: ClothingBackpackBriefcaseFilled - shoes: ClothingShoesColorBlack + shoes: ClothingShoesBootsLaceup id: LibrarianPDA ears: ClothingHeadsetService pocket1: d10Dice diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index b0d1db3078..4446632b12 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -19,7 +19,7 @@ jumpsuit: ClothingUniformJumpsuitMusician back: ClothingBackpackMusicianFilled eyes: ClothingEyesGlassesSunglasses - shoes: ClothingShoesColorBlack + shoes: ClothingShoesBootsLaceup id: MusicianPDA ears: ClothingHeadsetService satchel: ClothingBackpackSatchelMusicianFilled diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET.png new file mode 100644 index 0000000000..7153094024 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/icon.png new file mode 100644 index 0000000000..29c0fb48ef Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/inhand-left.png new file mode 100644 index 0000000000..03bdacf9fb Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/inhand-right.png new file mode 100644 index 0000000000..f00d861ca5 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json new file mode 100644 index 0000000000..c9cd5639c1 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/laceups.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/d672aade35db25affc6ed5e1c7aa0b640f118d4c", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..41246ba8c1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/icon.png new file mode 100644 index 0000000000..fa26af5db8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/inhand-left.png new file mode 100644 index 0000000000..79925e4ca4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/inhand-right.png new file mode 100644 index 0000000000..7f9c5471c8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.rsi/meta.json new file mode 100644 index 0000000000..03c2ba394f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblack.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/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "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/lawyerblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..33cb851b30 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/icon.png new file mode 100644 index 0000000000..5658efea3e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/inhand-left.png new file mode 100644 index 0000000000..2483eb44f4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/inhand-right.png new file mode 100644 index 0000000000..613ba76213 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.rsi/meta.json new file mode 100644 index 0000000000..03c2ba394f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerblue.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/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "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/lawyergood.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..8a97bf4210 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/icon.png new file mode 100644 index 0000000000..bf4bf371f1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/inhand-left.png new file mode 100644 index 0000000000..fcfb8ba82a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/inhand-right.png new file mode 100644 index 0000000000..a20cfd8251 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.rsi/meta.json new file mode 100644 index 0000000000..926c8b54f9 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyergood.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/305131e20cfe53eb41de61db79a99aa12c2925b0", + "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/lawyerpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..4ee67801d7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/icon.png new file mode 100644 index 0000000000..884476e58b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/inhand-left.png new file mode 100644 index 0000000000..8cd7613c95 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/inhand-right.png new file mode 100644 index 0000000000..83105c5df1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.rsi/meta.json new file mode 100644 index 0000000000..bc0ecbc73e --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerpurple.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/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, inhands by github:Morb0", + "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/lawyerred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..73ecf91679 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/icon.png new file mode 100644 index 0000000000..ccbaf16989 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/inhand-left.png new file mode 100644 index 0000000000..89e237e688 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/inhand-right.png new file mode 100644 index 0000000000..268bae4aeb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.rsi/meta.json new file mode 100644 index 0000000000..03c2ba394f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/lawyerred.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/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "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/lawyerblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING.png index c26c32e6e1..e81317b7e2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/icon.png index 9223ed7802..7e052988ff 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/inhand-left.png index 45adaeb737..79925e4ca4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/inhand-right.png index 6b3662cd96..7f9c5471c8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json index ad7b874f87..03c2ba394f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/4daf5d1a1b45fc3fcc4fd9703222159e6c1f38c8, inhands and icon by peptide", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING.png index 96e7a38b6d..484aeba84b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/icon.png index 874028ddb0..a13b6ba003 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/inhand-left.png index 92ffa8ca68..2483eb44f4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/inhand-right.png index 86f2579fbf..613ba76213 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json index ad7b874f87..03c2ba394f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/4daf5d1a1b45fc3fcc4fd9703222159e6c1f38c8, inhands and icon by peptide", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..71a9d19cb1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/icon.png new file mode 100644 index 0000000000..a0e574e5f8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/inhand-left.png new file mode 100644 index 0000000000..fcfb8ba82a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/inhand-right.png new file mode 100644 index 0000000000..a20cfd8251 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json new file mode 100644 index 0000000000..926c8b54f9 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.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/305131e20cfe53eb41de61db79a99aa12c2925b0", + "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/lawyerpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING.png index 78eb075c13..d935927c51 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/icon.png index 65cf63b7c5..e961e78c77 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/inhand-left.png index e9d1eba312..8cd7613c95 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/inhand-right.png index c13277bdc4..83105c5df1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json index ad7b874f87..bc0ecbc73e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/4daf5d1a1b45fc3fcc4fd9703222159e6c1f38c8, inhands and icon by peptide", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, inhands by github:Morb0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING.png index ec7beffe16..53a5c7393c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/icon.png index 6bc68c0de3..49c81c636e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/inhand-left.png index e6be6dd18d..89e237e688 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/inhand-right.png index 37cb5dc630..268bae4aeb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json index ad7b874f87..03c2ba394f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/4daf5d1a1b45fc3fcc4fd9703222159e6c1f38c8, inhands and icon by peptide", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", "size": { "x": 32, "y": 32