Prototypes for Guard (#616)

* Prototypes for Guard * imperial laws * merge * yml clean up * flags + change in imperial laws * map update * guard clothing resprite * cool guard helmet * guards grip and halberd * fill cabinets, add guard commander stamp * key and keyring fix * Update arenas.yml * Update migration.yml * tapestry fix * guidebook spacing * Update meta.json * add bold tags * Update flags_wallmount.yml --------- Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-12-04 19:11:33 +04:00
parent 0e88b6dc6f
commit e6a6900719
86 changed files with 7443 additions and 5973 deletions
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -106,11 +106,52 @@
  parent: CP14WoodenCloset
  id: CP14WoodenClosetBlacksmithFilled
  suffix: Blacksmith, Filled
-  #components:
-  #- type: StorageFill
-  #  contents:
-  #    - id: CP14KeyRingCommandant
-  #    - id: HandLabeler #TODO custom cp14 labeler
-  #    - id: CP14StampDenied
-  #    - id: CP14StampApproved
-  #    - id: CP14StampCommandant
+  components:
+  - type: StorageFill
+    contents:
+      - id: HandLabeler #TODO custom cp14 labeler
+      - id: CP14WoodenPlanks10
+      - id: CP14Nail10
+      - id: CP14CopperBar10
+      - id: CP14IronBar5
+
+- type: entity
+  parent: CP14WoodenCloset
+  id: CP14WoodenClosetGuardFilled
+  suffix: Guard, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14Rope
+      - id: CP14Rope
+      - id: CP14ModularGuardHalberd
+      - id: CP14BaseShield
+      - id: CP14ModularGripIronLongGuard
+      - id: CP14ModularGripIronLongGuard
+      - id: CP14BaseLightCrossbow
+      - id: CP14Crossbolt
+      - id: CP14Crossbolt
+      - id: CP14Crossbolt
+      - id: CP14Crossbolt
+      - id: CP14Crossbolt
+      - id: CP14EnergyCrystalSmall
+      - id: CP14CrystalLampBlueEmpty
+      - id: CP14BookImperialLawsHandBook
+
+- type: entity
+  parent: CP14WoodenCloset
+  id: CP14WoodenClosetGuardCommanderFilled
+  suffix: Guard Commander, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14Rope
+      - id: CP14Rope
+      - id: CP14ModularGuardHalberd
+      - id: CP14BaseShield
+      - id: CP14ModularGripIronLongGuard
+      - id: CP14ModularGripIronLongGuard
+      - id: CP14EnergyCrystalSmall
+      - id: CP14CrystalLampBlueEmpty
+      - id: CP14StampGuardCommander
+      - id: CP14BookImperialLawsHandBook
--- a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml
@@ -58,18 +58,40 @@
  parent: CP14WoodenCabinet
  id: CP14WoodenCabinetBlacksmith
  suffix: Blacksmith, Filled
-  #components:
-  #- type: StorageFill
-  #  contents:
-  #    - id: CP14ClothingCloakCommandantJacket
-  #      prob: 1
-  #    - id: CP14ClothingHeadBowlerGolden
-  #      prob: 0.5
-  #    - id: CP14ClothingPantsAristocratic
-  #      prob: 0.5
-  #    - id: CP14ClothingShirtBanker
-  #      prob: 0.5
-  #    - id: CP14ClothingEyesMonocle
-  #      prob: 0.2
-  #    - id: CP14ClothingEyesGlasses
-  #      prob: 0.3
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14ClothingCloakBlacksmithArpon
+        prob: 1
+
+- type: entity
+  parent: CP14WoodenCabinet
+  id: CP14WoodenCabinetGuard
+  suffix: Guard, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14ClothingHeadGuardHelmet
+        prob: 0.7
+      - id: CP14ClothingPantsGuardsChainmailSkirt
+        prob: 0.7
+      - id: CP14ClothingShirtGuardsChainmailShirtB
+        prob: 0.7
+      - id: CP14ClothingCloakGuardBlue
+        prob: 0.5
+
+- type: entity
+  parent: CP14WoodenCabinet
+  id: CP14WoodenCabinetGuardCommander
+  suffix: Guard Commander, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14ClothingHeadGuardHelmet
+        prob: 0.7
+      - id: CP14ClothingPantsGuardsChainmailSkirt
+        prob: 0.7
+      - id: CP14ClothingShirtGuardsChainmailShirtB
+        prob: 0.7
+      - id: CP14ClothingCloakGuardCommander
+        prob: 1
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guard.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guard.yml
@@ -5,15 +5,6 @@
  name: "guard's cloak"
  description: Shoulder cape in the standard Imperial Guard colors

- type: entity
-  parent: CP14ClothingCloakGuardBase
-  id: CP14ClothingCloakGuardWhite
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Roles/Guard/white.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/Guard/white.rsi
-
 - type: entity
  parent: CP14ClothingCloakGuardBase
  id: CP14ClothingCloakGuardBlue
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/mercenary.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/mercenary.yml
@@ -29,4 +29,13 @@
  - type: Sprite
    sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakWhite
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guard.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guard.yml
@@ -0,0 +1,28 @@
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadGuardBase
+  abstract: true
+  components:
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.90
+        Heat: 0.95
+
+- type: entity
+  parent: CP14ClothingHeadGuardBase
+  id: CP14ClothingHeadGuardHelmet
+  name: "guard's helmet"
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/Roles/Guard/helmet.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/Roles/Guard/helmet.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - Snout
+    - HeadTop
+    - HeadSide
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/guard.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/guard.yml
@@ -5,6 +5,6 @@
  description: Skirt with stitched clutch padding, in standard Imperial Guard uniform colors.
  components:
  - type: Sprite
-    sprite: _CP14/Clothing/Pants/Roles/Guard/wb_chainmail.rsi
+    sprite: _CP14/Clothing/Pants/Roles/Guard/b_chainmail.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Pants/Roles/Guard/wb_chainmail.rsi
+    sprite: _CP14/Clothing/Pants/Roles/Guard/b_chainmail.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guard.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guard.yml
@@ -13,15 +13,6 @@
        Piercing: 0.85
        Heat: 0.90
  
- type: entity
-  parent: CP14ClothingShirtGuardBase
-  id: CP14ClothingShirtGuardsChainmailShirtWB
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Roles/Guard/wb_chainmail.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Roles/Guard/wb_chainmail.rsi
-  
 - type: entity
  parent: CP14ClothingShirtGuardBase
  id: CP14ClothingShirtGuardsChainmailShirtB
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml
@@ -56,4 +56,17 @@
    stampedColor: "#e8c348"
    stampState: "bank_on_paper"
  - type: Sprite
-    state: bank
+    state: bank
+
+- type: entity
+  id: CP14StampGuardCommander
+  parent: CP14StampBase
+  name: guard commander stamp
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: cp14-stamp-guard-commander
+    stampedColor: "#436a92"
+    stampState: "guard_on_paper"
+  - type: Sprite
+    state: guard
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/alchemist.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/alchemist.yml
@@ -9,7 +9,7 @@
 - type: entity
  parent: CP14BaseKey
  id: CP14KeyAlchemy1
-  suffix: Alchemy1
+  suffix: Alchemy 1
  components:
  - type: CP14Key
    autoGenerateShape: Alchemy1
@@ -17,7 +17,7 @@
 - type: entity
  parent: CP14BaseKey
  id: CP14KeyAlchemy2
-  suffix: Alchemy2
+  suffix: Alchemy 2
  components:
  - type: CP14Key
    autoGenerateShape: Alchemy2
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/blacksmith.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/blacksmith.yml
@@ -9,7 +9,7 @@
 - type: entity
  parent: CP14BaseKey
  id: CP14KeyBlacksmith
-  suffix: Blacksmith1
+  suffix: Blacksmith 1
  components:
  - type: CP14Key
    autoGenerateShape: Blacksmith1
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/guard.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/guard.yml
@@ -0,0 +1,31 @@
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyGuardEntrance
+  suffix: Guard Entrance
+  components:
+  - type: CP14Key
+    autoGenerateShape: GuardEntrance
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyGuard
+  suffix: Guard
+  components:
+  - type: CP14Key
+    autoGenerateShape: Guard
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyGuardCommander
+  suffix: Guard Commander
+  components:
+  - type: CP14Key
+    autoGenerateShape: GuardCommander
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyGuardWeaponStorage
+  suffix: Guard Weapon Storage
+  components:
+  - type: CP14Key
+    autoGenerateShape: GuardWeaponStorage
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
@@ -101,4 +101,26 @@
    - id: CP14KeyBankVault
    - id: CP14KeyBankEntrance
    - id: CP14KeyBankStaff
-    - id: CP14KeyBankSafe
+    - id: CP14KeyBankSafe
+
+- type: entity
+  parent: CP14BaseKeyRing
+  id: CP14KeyRingGuard
+  suffix: Guardian
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14KeyGuardEntrance
+    - id: CP14KeyGuard
+
+- type: entity
+  parent: CP14BaseKeyRing
+  id: CP14KeyRingGuardCommander
+  suffix: Guard Commander
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14KeyGuardEntrance
+    - id: CP14KeyGuard
+    - id: CP14KeyGuardCommander
+    #- id: CP14KeyGuardWeaponStorage
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml
@@ -221,6 +221,16 @@
      - !type:DoActsBehavior
        acts: ["Destruction"]

+- type: entity
+  parent: CP14ModularGripIronLong
+  id: CP14ModularGripIronLongGuard
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long_guard.rsi
+    state: icon
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripIronLongGuard
+
 - type: entity
  parent: CP14ModularGripLong
  id: CP14ModularGripGoldLong
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
@@ -11,4 +11,22 @@
      state: icon
  - type: CP14ModularCraftAutoAssemble
    details:
-    - BladeIronSword
+    - BladeIronSword
+
+- type: entity
+  id: CP14ModularGuardHalberd
+  parent: CP14ModularGripIronLongGuard
+  name: "guard's halberd"
+  description: The standard issue armament of the imperial guard. A long iron halberd adorned with blue feathers and brass
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/iron_sword.rsi
+      state: icon
+    - sprite: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeIronSword
+    - GardeSharpIron
--- a/Resources/Prototypes/_CP14/Entities/Objects/guidebooks.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/guidebooks.yml
@@ -0,0 +1,19 @@
+- type: entity
+  id: CP14BookImperialLawsHandBook
+  parent: BaseGuidebook
+  name: imperial laws
+  description: A book about Imperial Laws.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#871619"
+    - state: decor_wingette
+      color: "#a3181d"
+    - state: icon_law
+  - type: GuideHelp
+    guides:
+    - CP14_RU_Imperial_Laws
+    - CP14_EN_Imperial_Laws
--- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/flags_wallmount.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/flags_wallmount.yml
@@ -1,12 +1,12 @@
 - type: entity
  id: CP14WallmountFlagBase
  abstract: true
-  parent: 
+  parent:
  - CP14BaseWallmount
  - CP14BaseFlammableSpreadingStrong
  categories: [ ForkFiltered ]
  name: tapestry
-  description: A piece of cloth pinned to the wall. 
+  description: A piece of cloth pinned to the wall.
  components:
  - type: Sprite
    sprite: _CP14/Structures/Decoration/flags_wallmount.rsi
@@ -55,11 +55,12 @@
  parent: CP14WallmountFlagBase
  id: CP14WallmountFlagTavern
  name: tavern tapestry
-  description: A tapestry with a ?? symbol, indicating that blacksmiths dwell here.
+  description: A tapestry with a beer symbol, indicating that tavern is here.
  components:
  - type: Sprite
    layers:
-    - state: fill_mercenary #TODO: Icon
+    - state: fill_mercenary
+    - state: icon_tavern

 # Bank

@@ -72,7 +73,8 @@
  - type: Sprite
    layers:
    - state: fill_bank
-    - state: icon_coins
+    - state: icon_coin
+      color: "#ad633b"

 - type: entity
  parent: CP14WallmountFlagBase
@@ -83,7 +85,20 @@
  - type: Sprite
    layers:
    - state: fill_bank
-    - state: icon_vault
+    - state: icon_safe
+      color: "#ad633b"
+
+- type: entity
+  parent: CP14WallmountFlagBase
+  id: CP14WallmountFlagBankCrates
+  name: bank crates tapestry
+  description: A tapestry with a crates symbol indicating that this is where the bank vaults reside.
+  components:
+  - type: Sprite
+    layers:
+    - state: fill_bank
+    - state: icon_crates
+      color: "#ad633b"

 - type: entity
  parent: CP14WallmountFlagBase
@@ -95,13 +110,51 @@
    layers:
    - state: fill_bank
    - state: icon_ship
+      color: "#ad633b"

 - type: entity
  parent: CP14WallmountFlagBase
  id: CP14WallmountFlagBankCommandant
  name: commandant tapestry
-  description: A tapestry with a ?? symbol indicating that the Commandant lives here.
+  description: A tapestry with a star symbol indicating that the commandant lives here.
  components:
  - type: Sprite
    layers:
-    - state: fill_bank #TODO: Icon
+    - state: fill_bank
+    - state: icon_star
+      color: "#ad633b"
+
+# Guard
+
+- type: entity
+  parent: CP14WallmountFlagBase
+  id: CP14WallmountFlagGuardSwords
+  name: guard tapestry
+  description: A tapestry with a swords symbol denoting that the guards are here.
+  components:
+  - type: Sprite
+    layers:
+    - state: fill_guard
+    - state: icon_swords
+
+- type: entity
+  parent: CP14WallmountFlagBase
+  id: CP14WallmountFlagGuardShield
+  name: guard tapestry
+  description: A tapestry with a shield symbol denoting that the guards are here.
+  components:
+  - type: Sprite
+    layers:
+    - state: fill_guard
+    - state: icon_shield
+
+- type: entity
+  parent: CP14WallmountFlagBase
+  id: CP14WallmountFlagGuardCommander
+  name: guard commander tapestry
+  description: A tapestry with a star symbol indicating that the Guard Commandant lives here.
+  components:
+  - type: Sprite
+    layers:
+    - state: fill_guard
+    - state: icon_star
--- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/guard.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/guard.yml
@@ -0,0 +1,63 @@
+
+# Iron
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorGuard
+  suffix: Guard
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Guard
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorGuardCommandantRoom
+  suffix: Guard Commander
+  components:
+  - type: CP14Lock
+    autoGenerateShape: GuardCommander
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorGuardWeaponStorage
+  suffix: Guard, Weapon Storage
+  components:
+  - type: CP14Lock
+    autoGenerateShape: GuardWeaponStorage
+  - type: Lock
+    locked: true
+
+# Iron windowed
+
+- type: entity
+  parent: CP14IronDoorWindowed
+  id: CP14IronDoorWindowedGuardEntrance
+  suffix: Guard, Entrance
+  components:
+  - type: CP14Lock
+    autoGenerateShape: GuardEntrance
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent:
+  - CP14IronDoorWindowedGuardEntrance
+  - CP14IronDoorWindowedMirrored
+  id: CP14IronDoorWindowedMirroredGuardEntrance
+  suffix: Guard, Entrance, Mirrored
+
+# Grill Gate
+
+- type: entity
+  parent: CP14FenceIronGrilleGate
+  id: CP14FenceIronGrilleGateGuard
+  suffix: Guard
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Guard
+  - type: Lock
+    locked: true
--- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/personalHouse.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/personalHouse.yml
@@ -95,6 +95,56 @@
  id: CP14WoodenDoorPersonalHouse10
  suffix: PersonalHouse10
  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse11
+  suffix: PersonalHouse11
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse12
+  suffix: PersonalHouse12
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse13
+  suffix: PersonalHouse13
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse14
+  suffix: PersonalHouse14
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse15
+  suffix: PersonalHouse15
+  components:
  - type: CP14Lock
    autoGenerateShape: PersonalHouse10
  - type: Lock
--- a/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml
@@ -27,4 +27,11 @@
  id: CP14_EN_Demiplanes
  name: Demiplanes exploration
  text: "/ServerInfo/_CP14/Guidebook_EN/Demiplanes.xml"
-  filterEnabled: True
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_Imperial_Laws
+  name: Imperial laws
+  text: "/ServerInfo/_CP14/Guidebook_EN/ImperialLaws.xml"
+  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml
@@ -27,4 +27,11 @@
  id: CP14_RU_Demiplanes
  name: Исследование демипланов
  text: "/ServerInfo/_CP14/Guidebook_RU/Demiplanes.xml"
-  filterEnabled: True
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_Imperial_Laws
+  name: Имперские законы
+  text: "/ServerInfo/_CP14/Guidebook_RU/ImperialLaws.xml"
+  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/entry.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/entry.yml
@@ -7,6 +7,7 @@
  children:
  - CP14_EN_Alchemy
  - CP14_EN_Demiplanes
+  - CP14_EN_Imperial_Laws

 - type: guideEntry
  crystallPunkAllowed: true
@@ -17,3 +18,4 @@
  children:
  - CP14_RU_Alchemy
  - CP14_RU_Demiplanes
+  - CP14_RU_Imperial_Laws
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
@@ -9,6 +9,7 @@
  - CP14ClothingCloakFurcapeBlue
  - CP14ClothingCloakMaidArpon
  - CP14ClothingCloakRitualAttireLeather
+  - CP14ClothingCloakWhite

 - type: loadout
  id: CP14ClothingCloakFurcapeBlack
@@ -30,6 +31,11 @@
  equipment:
    cloak: CP14ClothingCloakRitualAttireLeather

+- type: loadout
+  id: CP14ClothingCloakWhite
+  equipment:
+    cloak: CP14ClothingCloakWhite
+
 # Eyes

 - type: loadoutGroup
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml
@@ -7,12 +7,6 @@
  minLimit: 0
  loadouts:
  - CP14ClothingCloakGuardBlue
-  - CP14ClothingCloakGuardWhite
-
- type: loadout
-  id: CP14ClothingCloakGuardWhite
-  equipment:
-    cloak: CP14ClothingCloakGuardWhite

 - type: loadout
  id: CP14ClothingCloakGuardBlue
@@ -24,9 +18,14 @@
 - type: loadoutGroup
  id: CP14GuardHead
  name: cp14-loadout-guard-head
-  minLimit: 0
+  minLimit: 1
  loadouts:
-  - CP14ClothingHeadMetalHeadband
+  - CP14ClothingHeadGuardHelmet
+
+- type: loadout
+  id: CP14ClothingHeadGuardHelmet
+  equipment:
+    head: CP14ClothingHeadGuardHelmet

 # Pants

@@ -47,15 +46,23 @@
  id: CP14GuardShirt
  name: cp14-loadout-guard-shirt
  loadouts:
-  - CP14ClothingShirtGuardsChainmailShirtWB
  - CP14ClothingShirtGuardsChainmailShirtB

- type: loadout
-  id: CP14ClothingShirtGuardsChainmailShirtWB
-  equipment:
-    shirt: CP14ClothingShirtGuardsChainmailShirtWB
-
 - type: loadout
  id: CP14ClothingShirtGuardsChainmailShirtB
  equipment:
-    shirt: CP14ClothingShirtGuardsChainmailShirtB
+    shirt: CP14ClothingShirtGuardsChainmailShirtB
+
+# Spells
+
+- type: loadoutGroup
+  id: CP14GuardSpells
+  name: cp14-loadout-guard-spells
+  loadouts:
+  - CP14ActionSpellFlashLight
+
+- type: loadout
+  id: CP14ActionSpellFlashLight
+  dummyEntity: CP14ActionSpellFlashLight
+  actions:
+  - CP14ActionSpellFlashLight
--- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
@@ -68,6 +68,7 @@
  - CP14GeneralShoes
  - CP14GeneralBack
  - CP14GeneralTrinkets
+  - CP14GuardSpells

 - type: roleLoadout
  id: JobCP14Guard
@@ -82,6 +83,7 @@
  - CP14GeneralShoes
  - CP14GeneralBack
  - CP14GeneralTrinkets
+  - CP14GuardSpells

 - type: roleLoadout
  id: JobCP14Commandant
@@ -106,4 +108,4 @@
  - CP14BankPants
  - CP14BankShoes
  - CP14GeneralBack
-  - CP14GeneralTrinkets
+  - CP14GeneralTrinkets
--- a/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml
+++ b/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml
@@ -153,4 +153,26 @@
  id: PersonalHouse10
  group: PersonalHouse
  complexity: 3
-  name: cp14-lock-shape-personalhouse10
+  name: cp14-lock-shape-personalhouse10
+
+# Guard
+
+- type: CP14LockType
+  id: GuardEntrance
+  complexity: 3
+  name: cp14-lock-shaper-guard-entrance
+
+- type: CP14LockType
+  id: Guard
+  complexity: 5
+  name: cp14-lock-shaper-guard-staff
+
+- type: CP14LockType
+  id: GuardCommander
+  complexity: 7
+  name: cp14-lock-shaper-guard-commander
+
+- type: CP14LockType
+  id: GuardWeaponStorage
+  complexity: 7
+  name: cp14-lock-shaper-guard-weapon-storage
--- a/Resources/Prototypes/_CP14/Maps/arenas.yml
+++ b/Resources/Prototypes/_CP14/Maps/arenas.yml
@@ -62,7 +62,8 @@
            CP14Innkeeper: [ 3, 4 ]
            CP14Commandant: [1, 1]
            CP14Banker: [3, 4]
-            #CP14GuardCommander: [1, 1]
+            CP14Guard: [8, 8]
+            CP14GuardCommander: [1, 1]
        - type: CP14StationKeyDistribution
          keys:
          - TavernDorms1
@@ -80,4 +81,8 @@
          - PersonalHouse7
          - PersonalHouse8
          - PersonalHouse9
-          - PersonalHouse10
+          - PersonalHouse10
+          - PersonalHouse11
+          - PersonalHouse12
+          - PersonalHouse13
+          - PersonalHouse14
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml
@@ -14,4 +14,5 @@
 - type: startingGear
  id: CP14GuardGear
  equipment:
+    keys: CP14KeyRingGuard
    belt1: CP14WalletFilledTest
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml
@@ -19,4 +19,5 @@
 - type: startingGear
  id: CP14GuardCommanderGear
  equipment:
+    keys: CP14KeyRingGuardCommander
    belt1: CP14WalletFilledTest