big batch of clothing ported from DeltaV

Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl

@@ -1,2 +1,5 @@
 fold-verb-clothing-cloak = Draw around yourself
-unfold-verb-clothing-cloak = Unbundle
+unfold-verb-clothing-cloak = Unbundle
+
+roll-verb-clothing-jacket = Roll up sleeves
+unroll-verb-clothing-jacket = Pull down sleeves

Resources/Locale/en-US/_Impstation/preferences/loadout-groups.ftl

@@ -34,6 +34,8 @@ loadout-group-chef-id = Chef ID
 
 loadout-group-librarian-neck = Librarian neck
 loadout-group-librarian-shoes = Librarian shoes
+
+loadout-group-lawyer-outerclothing = Lawyer outer clothing
 loadout-group-lawyer-shoes = Lawyer shoes
 
 loadout-group-chaplain-belt = Chaplain belt
@@ -137,3 +139,4 @@ loadout-group-paramedic-id = Paramedic ID
 
 loadout-group-psychologist-neck = Psychologist neck
 loadout-group-psychologist-shoes = Psychologist shoes
+loadout-group-psychologist-outerclothing = Psychologist outer clothing

Resources/Prototypes/Catalog/Fills/Items/briefcases.yml

@@ -30,7 +30,7 @@
 
 - type: entity
   id: BriefcaseSyndieLobbyingBundleFilled
-  parent: BriefcaseSyndie
+  parent: CybersunBriefcase # DeltaV
   suffix: Syndicate, Spesos
   components:
   - type: StorageFill
@@ -41,8 +41,12 @@
       - id: EncryptionKeySyndie
       - id: RubberStampTrader
       - id: PhoneInstrumentSyndicate
-      - id: ClothingUniformJumpsuitTacticool
-      - id: ClothingOuterCoatJensen
+      # begin DeltaV
+      #- id: ClothingUniformJumpsuitTacticool
+      #- id: ClothingOuterCoatJensen
+      - id: ClothingOuterCybersunOvercoat
+      - id: ClothingUniformCybersunAttorney
+      # end DeltaV
       - id: ClothingHandsGlovesCombat
       - id: ClothingMaskNeckGaiter
       - id: SyndieHandyFlag

Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml

@@ -97,7 +97,15 @@
       - id: ClothingEyesGlasses
       - id: ClothingOuterWinterRD
       - id: ClothingOuterCoatRD
+        orGroup: RdCoat
+        prob: 0.5
+      - id: ClothingOuterCoatRndMysta # DeltaV
+        orGroup: RdCoat
       - id: ClothingNeckCloakRd
+        orGroup: RdCloak
+        prob: 0.5
+      - id: ClothingNeckCloakMystagogue # DeltaV
+        orGroup: RdCloak
 
 - type: entity
   id: DresserWardenFilled

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -74,6 +74,13 @@
         prob: 0.3
       - id: ClothingHeadHelmetBasic
       - id: ClothingOuterArmorBasic
+        orGroup: OuterArmor
+        prob: 0.33
+      - id: ClothingOuterArmorDuraVest # DeltaV
+        orGroup: OuterArmor
+        prob: 0.33
+      - id: ClothingOuterArmorPlateCarrier # DeltaV
+        orGroup: OuterArmor
       - id: ClothingBeltSecurityFilled
       - id: Flash
         prob: 0.5

Resources/Prototypes/Catalog/Fills/Lockers/service.yml

@@ -5,7 +5,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterArmorBasicSlim
+      - id: ClothingOuterArmorDuraVest # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of stabproof vest
       - id: WeaponShotgunDoubleBarreledRubber
       - id: DrinkShaker
       - id: ClothingEyesHudBeer

Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml

@@ -161,6 +161,13 @@
        - id: ClothingEyesGlassesSunglasses
        - id: ClothingHeadHelmetBasic
        - id: ClothingOuterArmorBasic
+         orGroup: OuterArmor
+         prob: 0.33
+       - id: ClothingOuterArmorDuraVest # DeltaV
+         orGroup: OuterArmor
+         prob: 0.33
+       - id: ClothingOuterArmorPlateCarrier # DeltaV
+         orGroup: OuterArmor
        - id: ClothingUniformJumpskirtSec
 
  - type: entity
@@ -191,8 +198,19 @@
          amount: 2
        - id: ClothingUniformJumpsuitSalvageSpecialist
          amount: 2
+         orGroup: SalvJumpsuit
+         prob: 0.5
+       - id: ClothingUniformJumpsuitSalvageSpecialistDV
+         amount: 2
+         orGroup: SalvJumpsuit
        - id: ClothingUniformJumpskirtSalvageSpecialist #imp
          amount: 2
+         orGroup: SalvJumpskirt
+         prob: 0.5
+       - id: ClothingUniformJumpskirtSalvageSpecialistDV
+         amount: 2
+         orGroup: SalvJumpskirt
+
 
  - type: entity
    id: WardrobeAtmosphericsFilled

Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml

@@ -14,11 +14,11 @@
     ClothingUniformNightclubSuitSkirt: 2 #imp
     ClothingUniformJumpsuitBartenderPurple: 2
     ClothingShoesColorBlack: 2
-    ClothingOuterArmorBasicSlim: 2
+    ClothingOuterArmorDuraVest: 2 # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of stabproof vest
     ClothingOuterVest: 2
     ClothingBeltBandolier: 2
     ClothingEyesGlassesSunglasses: 2
-    ClothingNeckScarfStripedBlack: 2
-  contrabandInventory:
+    ClothingNeckScarfStripedBlack: 2 # imp
+  contrabandInventory: # imp
     ClothingMaskClownService: 1
     ClothingOuterApronClown: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -16,6 +16,7 @@
     ClothingHeadBandSkull: 2
     ClothingHeadHatGreyFlatcap: 3
     ClothingHeadHatBrownFlatcap: 3
+    ClothingOuterCoatHyenhSweater: 2 # DeltaV
     ClothingUniformJumpsuitColorGrey: 8
     ClothingUniformJumpskirtColorGrey: 8
     ClothingUniformJumpsuitColorWhite: 3
@@ -66,6 +67,11 @@
     ClothingShoesColorOrange: 2
     ClothingShoesColorRed: 2
     ClothingShoesColorPurple: 2
+    ClothingShoesHeelsRed: 4 # imp
+    ClothingShoesHeelsBlack: 4 # imp
+    ClothingShoesHeelsBlue: 3 # imp
+    ClothingShoesHeelsGreen: 2 # imp
+    ClothingShoesHeelsBrown: 2 # imp
     ClothingHeadHatGreysoft: 8
     ClothingHeadHatMimesoft: 3
     ClothingHeadHatBluesoft: 2
@@ -93,12 +99,7 @@
     ClothingHandsGlovesColorPurple: 2
     ClothingEyesGlassesCheapSunglasses: 3
     # DO NOT ADD MORE, USE UNIFORM DYING
-    ClothingShoesHeelsRed: 4
-    ClothingShoesHeelsBlack: 4
-    ClothingShoesHeelsBlue: 3
-    ClothingShoesHeelsGreen: 2
-    ClothingShoesHeelsBrown: 2
-    #Space Cadet Jumpsuits
+    # imp -Space Cadet Jumpsuits
     ClothingSpaceCadetJumpsuitColorWhite: 3
     ClothingSpaceCadetJumpsuitColorBlack: 3
     ClothingSpaceCadetJumpsuitColorGray: 3
@@ -116,7 +117,7 @@
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1
     ClothingUniformJumpskirtTacticool: 1
-    ClothingShoesSwat: 2
-    ClothingMaskGas: 1
+    ClothingShoesSwat: 2 # imp
+    ClothingMaskGas: 1 # imp
 
   # DO NOT ADD MORE, USE UNIFORM DYING

Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml

@@ -19,3 +19,4 @@
     ClothingShoesBootsWinterEngi: 2
   contrabandInventory:
     ClothingMaskClownEngineer: 1 # imp
+    ClothingUniformCybersunHazard: 1 # DeltaV

Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml

@@ -23,6 +23,9 @@
   contrabandInventory:
     ClothingOuterRobesJudge: 1
     ClothingHeadHatPwig: 1
+    ClothingUniformCybersunAttorney: 1
+    CybersunBriefcase: 1
+    ClothingOuterCybersunOvercoat: 1
     # "Legally" obtained currency
     SpaceCash100: 2
   emaggedInventory:

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml

@@ -26,5 +26,8 @@
     ClothingNeckScarfStripedLightBlue: 2 # imp
     ClothingShoesBootsWinterMed: 2
   contrabandInventory:
-    ClothingUniformJumpskirtOfLife: 1
+    ClothingHeadHatSurgcapCybersun: 1 # DeltaV
+    ClothingOuterCoatCybersunWindbreaker: 1 # DeltaV
+    ClothingUniformJumpskirtOfLife: 1 # DeltaV
     ClothingMaskClownMedical: 1 # imp
+    UniformScrubsColorCybersun: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml

@@ -18,3 +18,4 @@
     ClothingShoesBootsWinterSci: 2
   contrabandInventory:
     ClothingMaskClownScience: 1 # imp
+    ClothingUniformCybersunRND: 1 # DeltaV

Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml

@@ -1,25 +1,30 @@
 - type: vendingMachineInventory
   id: SecTechInventory
   startingInventory:
-    SecurityWhistle: 5
-    Handcuffs: 8
-    GrenadeFlashBang: 4
-    TearGasGrenade: 4
-    ClusterBangFull: 2
-    GrenadeStinger: 4
-    Flash: 5
-    Tourniquet: 5
-    FlashlightSeclite: 5
+    ClothingBeltSecurityWebbing: 5
+    ClothingEyesEyepatchHudSecurity: 2
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesHudSecurity: 2
-    ClothingEyesEyepatchHudSecurity: 2
-    ClothingBeltSecurityWebbing: 5
+    ClothingOuterArmorBasic: 1 # imp 2>1
+    ClothingOuterArmorBasicCompact: 1 # imp
+    ClothingOuterArmorBasicSlim: 1 # imp
+    ClothingOuterArmorDuraVest: 1 # DeltaV
+    ClothingOuterArmorPlateCarrier: 1 # DeltaV - moved body armour from SecDrobe to SecTech
+    ClusterBangFull: 2
     CombatKnife: 3
-    Zipties: 12
-    RiotShield: 2
-    RiotLaserShield: 2
-    RiotBulletShield: 2
+    Flash: 5
+    FlashlightSeclite: 5
+    GrenadeFlashBang: 4
+    GrenadeStinger: 4
+    Handcuffs: 8
     RadioHandheldSecurity: 5
+    RiotBulletShield: 2
+    RiotLaserShield: 2
+    RiotShield: 2
+    SecurityWhistle: 5
+    TearGasGrenade: 4
+    Tourniquet: 5
+    Zipties: 12
   # security officers need to follow a diet regimen!
   contrabandInventory:
     FoodDonutHomer: 12

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -9,7 +9,7 @@
     ClothingHeadHatBeretSecurity: 3
     ClothingHeadHatSecsoft: 3
     ClothingHeadHatSecurityTrooper: 3 # imp
-    ClothingHeadHelmetJustice: 10 # imp 1<10
+    ClothingHeadHelmetJustice: 10 # imp 1>10
     ClothingHeadBandRed: 3
     ClothingMaskNeckGaiterRed: 3
     ClothingHandsGlovesColorBlack: 3
@@ -20,12 +20,11 @@
     ClothingUniformJumpsuitSecBlue: 3
     ClothingUniformSecurityTrooper: 3 # imp
     ClothingHeadsetSecurity: 3
+    ClothingOuterStasecSweater: 2 # DeltaV
+    ClothingNeckCWPSec: 2 # DeltaV - add cold weather ponchos
     ClothingOuterWinterSec: 2
     ClothingNeckScarfStripedRed: 3
     ClothingOuterCoatBomberSecurity: 1 # imp
-    ClothingOuterArmorBasic: 1 # imp 2>1
-    ClothingOuterArmorBasicSlim: 1 # imp
-    ClothingOuterArmorBasicCompact: 1 # imp
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2