Lawyer fashion (#11249)

* Update lawyer black suit sprites * Update lawyer blue suit sprites * Update lawyer red suit sprites * Update lawyer purple suit sprites * Add lawyer jumpskirt analogs * Add laceup shoes * Add laceup shoes to lawyer, librarian and musician * Add skirt to lawyer starting gear * Add new clothes to lawdrobe * Add criminal lawyer suit * Move good suit & rename jumpsuits to just suits * Fix good suit ids in lawdrobe
2022-09-14 07:47:08 +03:00
parent b3581d11c6
commit d6f37244f6
62 changed files with 279 additions and 14 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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