Banker and commandant outfit + fix purchase bugs (#509)

* reaname QM to commandant, and merchant to banker

* Update game_presets.yml

* add bureaucracy crate

* fix buying

* bowler hats

* reorganize shirt folders

* cloak refactor, add commandant cloak

* Update battle_royale_temp.yml

* Update migration.yml

Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.UI.cs

@@ -64,7 +64,7 @@ public sealed partial class CP14CargoSystem
                 desc.Append(service.GetDescription(_proto, EntityManager));
             }
 
-            desc.Append("\n" + Loc.GetString("cp14-store-buy-hint", ("name", Loc.GetString(proto.Key.Name)), ("code", "#" + proto.Key.Code)));
+            desc.Append("\n" + Loc.GetString("cp14-store-buy-hint", ("name", Loc.GetString(proto.Key.Name)), ("code", "[color=yellow][bold]#" + proto.Key.Code + "[/bold][/color]")));
 
             prodBuy.Add(new CP14StoreUiProductEntry(proto.Key.ID, proto.Key.Icon, name, desc.ToString(), proto.Value));
         }

Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.cs

@@ -216,7 +216,14 @@ public sealed partial class CP14CargoSystem : CP14SharedCargoSystem
                 continue;
 
             station.Comp.Balance -= request.Value;
-            station.Comp.BuyedQueue.Enqueue(request);
+
+            if (!_proto.TryIndex<CP14StoreBuyPositionPrototype>(request.Key, out var indexedBuyed))
+                continue;
+
+            foreach (var service in indexedBuyed.Services)
+            {
+                service.Buy(EntityManager, station);
+            }
         }
     }
 
@@ -242,7 +249,7 @@ public sealed partial class CP14CargoSystem : CP14SharedCargoSystem
                 continue;
 
             var buyedThing = station.Comp.BuyedQueue.Dequeue();
-            Spawn(buyedThing.Key.ID, palletXform.Coordinates);
+            Spawn(buyedThing, palletXform.Coordinates);
         }
     }
 

Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs

@@ -51,5 +51,5 @@ public sealed partial class CP14StationTravelingStoreShipTargetComponent : Compo
     /// a queue of purchased items. The oldest purchases are taken out one by one to be unloaded onto the ship
     /// </summary>
     [DataField]
-    public Queue<KeyValuePair<CP14StoreBuyPositionPrototype, int>> BuyedQueue = new();
+    public Queue<EntProtoId> BuyedQueue = new();
 }

Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs

@@ -8,11 +8,14 @@ public sealed partial class CP14BuyItemsService : CP14StoreBuyService
     [DataField(required: true)]
     public Dictionary<EntProtoId, int> Product = new();
 
-    public override void Buy(EntityManager entManager, EntityUid station)
+    public override void Buy(EntityManager entManager, Entity<CP14StationTravelingStoreShipTargetComponent> station)
     {
-        foreach (var pai in Product)
+        foreach (var (protoId, count) in Product)
         {
-            Logger.Debug($"куплено: {pai.Key} x{pai.Value}");
+            for (var i = 0; i < count; i++)
+            {
+                station.Comp.BuyedQueue.Enqueue(protoId);
+            }
         }
     }
 
@@ -20,12 +23,12 @@ public sealed partial class CP14BuyItemsService : CP14StoreBuyService
     {
         var sb = new StringBuilder();
         sb.Append(Loc.GetString("cp14-store-service-buy-items") + " \n");
-        foreach (var pai in Product)
+        foreach (var (protoId, count) in Product)
         {
-            if (!prototype.TryIndex(pai.Key, out var indexedProto))
+            if (!prototype.TryIndex(protoId, out var indexedProto))
                 continue;
 
-            sb.Append($"{indexedProto.Name} x{pai.Value} \n");
+            sb.Append($"{indexedProto.Name} x{count} \n");
         }
         return sb.ToString();
     }

Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs

@@ -46,7 +46,7 @@ public sealed partial class CP14StoreBuyPositionPrototype : IPrototype
 [MeansImplicitUse]
 public abstract partial class CP14StoreBuyService
 {
-    public abstract void Buy(EntityManager entManager, EntityUid station);
+    public abstract void Buy(EntityManager entManager, Entity<CP14StationTravelingStoreShipTargetComponent> station);
 
     public abstract string? GetDescription(IPrototypeManager prototype, IEntityManager entSys);
 }

Resources/Locale/en-US/_CP14/job/job.ftl

@@ -10,11 +10,11 @@ cp14-job-desc-guard-commander = The most dangerous person in the neighborhood. M
 
 # Bank
 
-cp14-job-name-quartermaster = Commandant
-cp14-job-desc-quartermaster = Control the economy of the settlement by trading with the Empire. Manage stocks and finances by directing resources to the laboring hands.
+cp14-job-name-commandant = Commandant
+cp14-job-desc-commandant = Control the economy of the settlement by trading with the Empire. Manage stocks and finances by directing resources to the laboring hands.
 
-cp14-job-name-merchant = Banker
-cp14-job-desc-merchant = Make deals, store entrusted valuables, issue interest-bearing deposits, and do any other economic work that will enrich your bank.
+cp14-job-name-banker = Banker
+cp14-job-desc-banker = Make deals, store entrusted valuables, issue interest-bearing deposits, and do any other economic work that will enrich your bank.
 
 # Mercenary
 

Resources/Locale/en-US/_CP14/job/supervisors.ftl

@@ -1,4 +1,4 @@
 cp14-job-supervisors-empire = Empire and its authority
 
 cp14-job-supervisors-command = all authority figures
-cp14-job-supervisors-quartermaster = quartermaster
+cp14-job-supervisors-commandant = commandant

Resources/Locale/en-US/_CP14/loadouts/loadout.ftl

@@ -24,4 +24,13 @@ cp14-loadout-captain-head = Captain's head
 
 # Guard commander
 
-cp14-loadout-guard-commander-cloak = Guard commander's cloak
+cp14-loadout-guard-commander-cloak = Guard commander's cloak
+
+# Bank
+
+cp14-loadout-bank-head = Bank employee hat
+cp14-loadout-commandant-head = Commandant's hat
+cp14-loadout-commandant-cloak = Commandant's cloak
+cp14-loadout-bank-shirt = Bank Employee shirt
+cp14-loadout-bank-pants = Bank Employee pants
+cp14-loadout-bank-shoes = Bank Employee shoes

Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl

@@ -4,4 +4,7 @@ cp14-store-buy-alchemy-normalizer-name = Solution normalizer
 cp14-store-buy-alchemy-normalizer-desc = Are your alchemists making poor quality potions? Fix it with a modern technological device made by Dwarf! “Alchemical Normalizer” - will remove any residue from your potions!
 
 cp14-store-buy-alchemy-vials-name = Alchemical vials
-cp14-store-buy-alchemy-vials-desc = Now the problem of shortage of potion vessels is no longer a problem! After all, for a rather modest price you can order batches of shiny vials directly from the glassblowing factory! Random alchemical devices as a gift.
+cp14-store-buy-alchemy-vials-desc = Now the problem of shortage of potion vessels is no longer a problem! After all, for a rather modest price you can order batches of shiny vials directly from the glassblowing factory! Random alchemical devices as a gift.
+
+cp14-store-buy-alchemy-bureaucracy-name = Bureaucratic reserve
+cp14-store-buy-alchemy-bureaucracy-desc = Feather pens, inkwells and a big stack of paper. In folders of different colors, or without folders at all: because we make sure that you can choose the option that is most comfortable for you.

Resources/Locale/ru-RU/_CP14/job/job.ftl

@@ -10,11 +10,11 @@ cp14-job-desc-guard-commander = Самая опасная личность в о
 
 # Bank
 
-cp14-job-name-quartermaster = Комендант
-cp14-job-desc-quartermaster = Контролируйте экономику поселения, торгуя с Империей. Заведуйте запасами и финансами, направляя ресурсы рабочим рукам.
+cp14-job-name-commandant = Комендант
+cp14-job-desc-commandant = Контролируйте экономику поселения, торгуя с Империей. Заведуйте запасами и финансами, направляя ресурсы рабочим рукам.
 
-cp14-job-name-merchant = Банкир
-cp14-job-desc-merchant = Заключайте сделки, храните доверенные ценности, выдавайте вклады под проценты и занимайтесь любой другой экономической работой, которая обогатит ваш банк.
+cp14-job-name-banker = Банкир
+cp14-job-desc-banker = Заключайте сделки, храните доверенные ценности, выдавайте вклады под проценты и занимайтесь любой другой экономической работой, которая обогатит ваш банк.
 
 # Mercenary
 

Resources/Locale/ru-RU/_CP14/job/supervisors.ftl

@@ -1,4 +1,4 @@
 cp14-job-supervisors-empire = Империи и ее представителям власти
 
 cp14-job-supervisors-command = всем представителям власти
-cp14-job-supervisors-quartermaster = квартирмейстеру
+cp14-job-supervisors-commandant = коменданту

Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl

@@ -24,4 +24,13 @@ cp14-loadout-captain-head = Капитанская шляпа
 
 # Guard commander
 
-cp14-loadout-guard-commander-cloak = Накидка командира стражи
+cp14-loadout-guard-commander-cloak = Накидка командира стражи
+
+# Bank
+
+cp14-loadout-bank-head = Шляпа работника банка
+cp14-loadout-commandant-head = Шляпа коменданта
+cp14-loadout-commandant-cloak = Накидка коменданта
+cp14-loadout-bank-shirt = Рубашка работника банка
+cp14-loadout-bank-pants = Штаны работника банка
+cp14-loadout-bank-shoes = Ботинки работника банка

Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl

@@ -4,4 +4,7 @@ cp14-store-buy-alchemy-normalizer-name = Нормализатор раствор
 cp14-store-buy-alchemy-normalizer-desc = Ваши алхимики делают некачественные зелья? Исправьте это при помощи современного технологического устройства дворфского производства! "Алхимический нормализатор" - удалит из ваших зелий любой осадок!
 
 cp14-store-buy-alchemy-vials-name = Алхимические пузырьки
-cp14-store-buy-alchemy-vials-desc = Теперь проблема дефицита емкостей для зелий больше не проблема! Ведь по довольно скромной цене вы можете заказывать партии блестящих склянок прямо с стеклодульного завода! Случайные алхимические приборы в подарок.
+cp14-store-buy-alchemy-vials-desc = Теперь проблема дефицита емкостей для зелий больше не проблема! Ведь по довольно скромной цене вы можете заказывать партии блестящих склянок прямо с стеклодульного завода! Случайные алхимические приборы в подарок.
+
+cp14-store-buy-alchemy-bureaucracy-name = Бюрократический запас
+cp14-store-buy-alchemy-bureaucracy-desc = Ручки, чернильницы и большая пачка бумаги. В папках разных цветов, и вовсе без папок: ведь мы заботимся о том, чтобы вы могли выбирать тот вариант, который вам комфортнее.

Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml

@@ -21,4 +21,24 @@
       - id: CP14VialTiny
         prob: 0.2
       - id: ShardGlass #Lol. Something broken
+        prob: 0.2
+
+- type: entity
+  parent: CP14BrassChest
+  id: CP14BrassChestFilledBureaucracy
+  suffix: Bureaucracy
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14PaperFolderBlue
+        amount: 5
+      - id: CP14PaperFolderRed
+        amount: 5
+      - id: CP14Paper
+        amount: 5
+      - id: CP14PenFeather
+        amount: 3
+        #Gift
+      - id: CP14Inkwell 
+        amount: 1
         prob: 0.2

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml

@@ -1,21 +1,15 @@
 - type: entity
   parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakAlchemistBase
-  abstract: true
-  components:
-  - type: Armor
-    modifiers:
-      coefficients:
-        Heat: 0.9
-        Caustic: 0.75
-
-- type: entity
-  parent: CP14ClothingCloakAlchemistBase
   id: CP14ClothingCloakAlchemist
   name: alchemist's cloak
   description: An expensive fabric that can withstand acid splashes - the standard for alchemist experts.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Cloak/alchemist_cloak.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/alchemist_cloak.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Heat: 0.9
+        Caustic: 0.75

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml

@@ -0,0 +1,12 @@
+- type: entity
+  parent: 
+  - CP14ClothingCloakBase
+  - ClothingSlotBase
+  id: CP14ClothingCloakCommandantJacket
+  name: commandant's jacket
+  description: the colors white and gold tell you that you're looking at a higher power.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml

@@ -0,0 +1,12 @@
+- type: entity
+  parent: 
+  - CP14ClothingCloakBase
+  - ClothingSlotBase
+  id: CP14ClothingCloakCaptainJacket
+  name: captain's jacket
+  description: the colors white and gold tell you that you're looking at a higher power.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml

@@ -0,0 +1,54 @@
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakFurcapeBlack
+  name: furcape
+  description: Brutal woolen wool cape.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/furcape2.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/furcape2.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakFurcapeBlue
+  name: furcape
+  description: Brutal woolen wool cape.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/furcape.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/furcape.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakSimpleWhite
+  name: white cloak
+  description: Long coat with a high collar.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakSimpleDarkBlue
+  name: dark cloak
+  description: Long coat with a high collar.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/dark_blue.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/dark_blue.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakRitualAttireLeather
+  name: ritual attire with leather
+  description: The traditional attire of Southern mages who have undergone the ritual.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/base.yml

@@ -0,0 +1,13 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CP14ClothingCloakBase
+  categories: [ ForkFiltered ]
+  components:
+  - type: Clothing
+    equipDelay: 1
+    unequipDelay: 1
+    slots:
+    - cloak
+  - type: Sprite
+    state: icon

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml

@@ -1,17 +1,3 @@
-- type: entity
-  abstract: true
-  parent: Clothing
-  id: CP14ClothingCloakBase
-  categories: [ ForkFiltered ]
-  components:
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    slots:
-    - cloak
-  - type: Sprite
-    state: icon
-
 - type: entity
   parent: CP14ClothingCloakBase
   id: CP14ClothingCloakArmoredRed
@@ -19,9 +5,9 @@
   description: Huge metal shoulder pads give extra protection from getting your head chopped off.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Cloak/redguardarmor.rsi
+    sprite: _CP14/Clothing/Cloak/Armor/redguardarmor.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/redguardarmor.rsi
+    sprite: _CP14/Clothing/Cloak/Armor/redguardarmor.rsi
   - type: Armor #same as regular sec armor
     modifiers:
       coefficients:
@@ -39,9 +25,9 @@
   description: Loose leather strips, still actually being clothing. 
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi
 
 - type: entity
   parent: 
@@ -52,77 +38,9 @@
   description: Cleanliness, orderliness and obedience are the main traits of a good maid.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Cloak/maid_apron.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/General/maid_apron.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/maid_apron.rsi
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakFurcapeBlack
-  name: furcape
-  description: Brutal woolen wool cape.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/furcape2.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/furcape2.rsi
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakFurcapeBlue
-  name: furcape
-  description: Brutal woolen wool cape.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/furcape.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/furcape.rsi
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakSimpleWhite
-  name: white cloak
-  description: Long coat with a high collar.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Simple/white.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Simple/white.rsi
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakSimpleDarkBlue
-  name: dark cloak
-  description: Long coat with a high collar.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi
-
-- type: entity
-  parent: 
-  - CP14ClothingCloakBase
-  - ClothingSlotBase
-  id: CP14ClothingCloakCaptainJacket
-  name: captain's jacket
-  description: the colors white and gold tell you that you're looking at a higher power.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/captain_jacket.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/captain_jacket.rsi
-
-- type: entity
-  parent: CP14ClothingCloakBase
-  id: CP14ClothingCloakRitualAttireLeather
-  name: ritual attire with leather
-  description: The traditional attire of Southern mages who have undergone the ritual.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/cheetah_skin.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/cheetah_skin.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/General/maid_apron.rsi
 
 - type: entity
   parent: CP14ClothingCloakBase

Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/bank.yml

@@ -0,0 +1,21 @@
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadBowler
+  name: bowler hat
+  description: It has an aristocratic air about it...
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi
+
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadBowlerGolden
+  name: golden bowler hat
+  description: What an exquisite hat. It's clearly a hat that only sophisticated people prefer to wear.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtBanker
+  name: banker's shirt
+  description: A white shirt with bronze inserts. Standard bank employee costume.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/Bank/banker.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/Bank/banker.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml

@@ -0,0 +1,81 @@
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonBlue
+  name: cotton blue shirt
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/blue.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/blue.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonBlack
+  name: cotton black shirt
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/black.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/black.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonPurple
+  name: cotton purple shirt
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/purple.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/purple.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonRed
+  name: cotton red shirt
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/red.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/red.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonWhite
+  name: cotton white shirt
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtCottonYellow
+  name: cotton yellow shirt
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/yellow.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/yellow.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtMercenary
+  name: mercenary shirt
+  description: A mercenary's colourful shirt.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/mercenary.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/mercenary.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtYellowWizard
+  name: yellow wizard shirt
+  description: A loose magician's shirt, comfortable and nice looking.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Shirt/base.yml

@@ -0,0 +1,14 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CP14ClothingShirtBase
+  description: Pleasant to the touch material, in a comfortable loose shirt shape.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Clothing
+    equipDelay: 1
+    unequipDelay: 1
+    slots:
+    - shirt
+  - type: Sprite
+    state: icon

Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml

@@ -1,107 +0,0 @@
-- type: entity
-  abstract: true
-  parent: Clothing
-  id: CP14ClothingShirtBase
-  description: Pleasant to the touch material, in a comfortable loose shirt shape.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    slots:
-    - shirt
-  - type: Sprite
-    state: icon
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtCottonBlue
-  name: cotton blue shirt
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtCottonBlack
-  name: cotton black shirt
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Cotton/black.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Cotton/black.rsi
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtCottonPurple
-  name: cotton purple shirt
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtCottonRed
-  name: cotton red shirt
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Cotton/red.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Cotton/red.rsi
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtCottonWhite
-  name: cotton white shirt
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Cotton/white.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Cotton/white.rsi
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtCottonYellow
-  name: cotton yellow shirt
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtSteampunk
-  name: brass reinforced shirt
-  description: A white shirt with brass inserts
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/steampunk.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/steampunk.rsi
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtMercenary
-  name: mercenary shirt
-  description: A mercenary's colourful shirt.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/mercenary.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/mercenary.rsi
-
-- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtYellowWizard
-  name: yellow wizard shirt
-  description: A loose magician's shirt, comfortable and nice looking.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/yellow_wizard.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/yellow_wizard.rsi

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml

@@ -51,7 +51,7 @@
   - type: Sprite
     layers:
       - state: red
-      - sprite: _CP14/Clothing/Cloak/redguardarmor.rsi
+      - sprite: _CP14/Clothing/Cloak/Armor/redguardarmor.rsi
         state: icon
   - type: RandomSpawner
     prototypes:

Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml

@@ -43,32 +43,32 @@
 # Bank
 
 - type: entity
-  id: CP14SpawnPointQuartermaster
+  id: CP14SpawnPointCommandant
   parent: CP14SpawnPointJobBase
-  name: quartermaster
+  name: commandant
   categories:
   - Spawner
   components:
   - type: SpawnPoint
-    job_id: CP14Quartermaster
+    job_id: CP14Commandant
   - type: Sprite
     layers:
       - state: green
-      - state: workman #TODO Replace
+      - state: commandant
 
 - type: entity
-  id: CP14SpawnPointMerchant
+  id: CP14SpawnPointBanker
   parent: CP14SpawnPointJobBase
   name: merchant
   categories:
   - Spawner
   components:
   - type: SpawnPoint
-    job_id: CP14Merchant
+    job_id: CP14Banker
   - type: Sprite
     layers:
       - state: green
-      - state: workman #TODO Replace
+      - state: banker
 
 # Mercenary
 

Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml

@@ -0,0 +1,67 @@
+
+# Head
+
+- type: loadoutGroup
+  id: CP14BankHead
+  name: cp14-loadout-bank-head
+  minLimit: 0
+  loadouts:
+  - CP14ClothingHeadBowler
+
+- type: loadout
+  id: CP14ClothingHeadBowler
+  equipment:
+    head: CP14ClothingHeadBowler
+
+- type: loadoutGroup
+  id: CP14CommandantHead
+  name: cp14-loadout-commandant-head
+  loadouts:
+  - CP14ClothingHeadBowlerGolden
+
+- type: loadout
+  id: CP14ClothingHeadBowlerGolden
+  equipment:
+    head: CP14ClothingHeadBowlerGolden
+
+# Cloak
+
+- type: loadoutGroup
+  id: CP14CommandantCloak
+  name: cp14-loadout-commandant-cloak
+  loadouts:
+  - CP14ClothingCloakCommandantJacket
+
+- type: loadout
+  id: CP14ClothingCloakCommandantJacket
+  equipment:
+    cloak: CP14ClothingCloakCommandantJacket
+
+# Shirt
+
+- type: loadoutGroup
+  id: CP14BankShirt
+  name: cp14-loadout-bank-shirt
+  loadouts:
+  - CP14ClothingShirtBanker
+
+- type: loadout
+  id: CP14ClothingShirtBanker
+  equipment:
+    shirt: CP14ClothingShirtBanker
+
+# Pants
+
+- type: loadoutGroup
+  id: CP14BankPants
+  name: cp14-loadout-bank-pants
+  loadouts:
+  - CP14ClothingPantsAristocratic
+
+# Shoes
+
+- type: loadoutGroup
+  id: CP14BankShoes
+  name: cp14-loadout-bank-shoes
+  loadouts:
+  - CP14ShoesAristocraticBlack

Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml

@@ -11,6 +11,7 @@
   - CP14ClothingCloakFurcapeBlack
   - CP14ClothingCloakFurcapeBlue
   - CP14ClothingCloakMaidArpon
+  - CP14ClothingCloakRitualAttireLeather
 
 - type: loadout
   id: CP14ClothingCloakSimpleWhite
@@ -42,6 +43,11 @@
   equipment:
     cloak: CP14ClothingCloakMaidArpon
 
+- type: loadout
+  id: CP14ClothingCloakRitualAttireLeather
+  equipment:
+    cloak: CP14ClothingCloakRitualAttireLeather
+
 # Eyes
 
 - type: loadoutGroup

Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml

@@ -69,29 +69,24 @@
   - CP14GeneralTrinkets
 
 - type: roleLoadout
-  id: JobCP14Quartermaster
+  id: JobCP14Commandant
   groups:
-  - CP14GeneralHead
+  - CP14CommandantHead
   - CP14GeneralEyes
-  - CP14GeneralMask
-  - CP14CaptainCloak #
-  - CP14GeneralGloves
-  - CP14GeneralShirt
-  - CP14GeneralPants
-  - CP14GeneralShoes
+  - CP14CommandantCloak
+  - CP14BankShirt
+  - CP14BankPants
+  - CP14BankShoes
   - CP14GeneralBack
   - CP14GeneralTrinkets
 
 - type: roleLoadout
-  id: JobCP14Merchant
+  id: JobCP14Banker
   groups:
-  - CP14GeneralHead
+  - CP14BankHead
   - CP14GeneralEyes
-  - CP14GeneralMask
-  - CP14GeneralCloak 
-  - CP14GeneralGloves
-  - CP14GeneralShirt
-  - CP14GeneralPants
-  - CP14GeneralShoes
+  - CP14BankShirt
+  - CP14BankPants
+  - CP14BankShoes
   - CP14GeneralBack
   - CP14GeneralTrinkets

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -77,8 +77,8 @@
             CP14Alchemist: [ 2, 3 ]
             CP14Innkeeper: [ 3, 4 ]
             CP14Captain: [1, 1]
-            CP14Quartermaster: [1, 1]
-            CP14Merchant: [3, 4]
+            CP14Commandant: [1, 1]
+            CP14Banker: [3, 4]
             #CP14GuardCommander: [1, 1]
         - type: CP14StationZLevels
           defaultMapLevel: 0

Resources/Prototypes/_CP14/Roles/Jobs/Bank/banker.yml

@@ -0,0 +1,13 @@
+- type: job
+  id: CP14Banker
+  name: cp14-job-name-banker
+  description: cp14-job-desc-banker
+  playTimeTracker: CP14JobBanker
+  startingGear: CP14BankerGear
+  icon: "CP14JobIconBanker"
+  supervisors: cp14-job-supervisors-commandant
+
+- type: startingGear
+  id: CP14BankerGear
+  equipment:
+    belt1: CP14KeyRingInnkeeper

Resources/Prototypes/_CP14/Roles/Jobs/Bank/commandant.yml

@@ -0,0 +1,17 @@
+- type: job
+  id: CP14Commandant
+  name: cp14-job-name-commandant
+  description: cp14-job-desc-commandant
+  playTimeTracker: CP14JobCommandant
+  startingGear: CP14CommandantGear
+  icon: "CP14JobIconCommandant"
+  requireAdminNotify: true
+  joinNotifyCrew: true
+  canBeAntag: false
+  supervisors: cp14-job-supervisors-command
+  weight: 2
+
+- type: startingGear
+  id: CP14CommandantGear
+  equipment:
+    belt1: CP14KeyRingInnkeeper

Resources/Prototypes/_CP14/Roles/Jobs/Bank/merchant.yml

@@ -1,16 +0,0 @@
-- type: job
-  id: CP14Merchant
-  name: cp14-job-name-merchant
-  description: cp14-job-desc-merchant
-  playTimeTracker: CP14JobMerchant
-  startingGear: CP14MerchantGear
-  icon: "CP14JobIconMerchant"
-  requireAdminNotify: true
-  joinNotifyCrew: true
-  canBeAntag: true
-  supervisors: cp14-job-supervisors-quartermaster
-
-- type: startingGear
-  id: CP14MerchantGear
-  equipment:
-    belt1: CP14KeyRingInnkeeper

Resources/Prototypes/_CP14/Roles/Jobs/Bank/quartermaster.yml

@@ -1,17 +0,0 @@
-- type: job
-  id: CP14Quartermaster
-  name: cp14-job-name-quartermaster
-  description: cp14-job-desc-quartermaster
-  playTimeTracker: CP14JobQuartermaster
-  startingGear: CP14QuartermasterGear
-  icon: "CP14JobIconQuartermaster"
-  requireAdminNotify: true
-  joinNotifyCrew: true
-  canBeAntag: false
-  supervisors: cp14-job-supervisors-command
-  weight: 2
-
-- type: startingGear
-  id: CP14QuartermasterGear
-  equipment:
-    belt1: CP14KeyRingInnkeeper

Resources/Prototypes/_CP14/Roles/Jobs/departments.yml

@@ -7,7 +7,7 @@
   color: "#3ec8fa"
   roles:
   - CP14Captain
-  - CP14Quartermaster
+  - CP14Commandant
   - CP14GuardCommander
 
 - type: department
@@ -17,8 +17,8 @@
   weight: 9
   color: "#fadb3e"
   roles:
-  - CP14Quartermaster
-  - CP14Merchant
+  - CP14Commandant
+  - CP14Banker
 
 - type: department
   id: CP14Mercenary

Resources/Prototypes/_CP14/Roles/play_time_tracker.yml

@@ -16,7 +16,7 @@
   id: CP14JobGuardCommander
 
 - type: playTimeTracker
-  id: CP14JobQuartermaster
+  id: CP14JobCommandant
 
 - type: playTimeTracker
-  id: CP14JobMerchant
+  id: CP14JobBanker

Resources/Prototypes/_CP14/StatusIcon/job.yml

@@ -47,16 +47,16 @@
 
 - type: jobIcon
   parent: CP14JobIcon
-  id: CP14JobIconQuartermaster
+  id: CP14JobIconCommandant
   icon:
     sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
-    state: Quartermaster
-  jobName: cp14-job-name-quartermaster
+    state: Commandant
+  jobName: cp14-job-name-commandant
 
 - type: jobIcon
   parent: CP14JobIcon
-  id: CP14JobIconMerchant
+  id: CP14JobIconBanker
   icon:
     sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
-    state: Merchant
-  jobName: cp14-job-name-merchant
+    state: Banker
+  jobName: cp14-job-name-banker

Resources/Prototypes/_CP14/Store/buy.yml

@@ -2,13 +2,13 @@
   id: CP14AlchemyNormalizer
   name: cp14-store-buy-alchemy-normalizer-name
   desc: cp14-store-buy-alchemy-normalizer-desc
-  code: ALH-NRML
+  code: NORMALIZER
   icon: 
     sprite: _CP14/Structures/Specific/Alchemy/normalizer.rsi
     state: base
   price: 
     min: 400
-    max: 500
+    max: 800
   services:
   - !type:CP14BuyItemsService
     product:
@@ -18,7 +18,7 @@
   id: CP14AlchemyVials
   name: cp14-store-buy-alchemy-vials-name
   desc: cp14-store-buy-alchemy-vials-desc
-  code: ALH-VIAL
+  code: VIALS
   icon: 
     sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
     state: vial
@@ -28,4 +28,20 @@
   services:
   - !type:CP14BuyItemsService
     product:
-      CP14BrassChestFilledAlchemy: 1
+      CP14BrassChestFilledAlchemy: 1
+
+- type: storePositionBuy
+  id: CP14Bureaucracy
+  name: cp14-store-buy-alchemy-bureaucracy-name
+  desc: cp14-store-buy-alchemy-bureaucracy-desc
+  code: PAPER
+  icon: 
+    sprite: _CP14/Objects/Bureaucracy/paper.rsi
+    state: folder_red
+  price: 
+    min: 200
+    max: 300
+  services:
+  - !type:CP14BuyItemsService
+    product:
+      CP14BrassChestFilledBureaucracy: 1

Resources/Prototypes/_CP14/game_presets.yml

@@ -30,5 +30,4 @@
   cP14Allowed: true
   rules:
     - Sandbox
-    - CP14BanditsRule
     - CP14RoundObjectivesRule

Resources/Prototypes/_CP14/secret_weights.yml

@@ -1,5 +1,5 @@
 - type: weightedRandom
   id: Secret
   weights:
-    CP14Sandbox: 0.5
-    CP14Greenshift: 0.5
+    CP14Sandbox: 1
+    CP14Greenshift: 0

Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CLA",
+    "copyright": "CrystallPunk14, by TheShuEd",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-CLOAK",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CLA",
+    "copyright": "CrystallPunk14, by TheShuEd",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CLA",
+    "copyright": "CrystallPunk14, by TheShuEd",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}