Content pack (#337)

* added rope

* black shirt replace

* Update migration.yml

* more berets

* loadout update

* captain role and jacket

* bruhh captain cap

* add one-handed sword

* shield!

* Update entities.ftl

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

@@ -1,5 +1,5 @@
-department-CP14Free = Free civilians
-department-CP14Free-desc = Individuals who are not burdened by contracts and work for the government, but do not receive free assistance from it either. Find your own way of earning a living.
+department-CP14Mercenary = Mercenaries
+department-CP14Mercenary-desc = People who joined the expedition to make some money.
 
-department-CP14Command = Officers of the Law
-department-CP14Command-desc = Persons working directly for government officials. Bound by a magical contract, they cannot act against the interests of the state.
+department-CP14Command = Expedition organizers
+department-CP14Command-desc = Persons responsible for carrying out the task assigned from the great house.

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

@@ -1,3 +1,6 @@
+cp14-job-name-captain = Expedition captain
+cp14-job-desc-captain = You are the most important person in this expedition. Organize its participants and manage the processes to complete the task set from the management.
+
 cp14-job-name-adventurer = Adventurer
 cp14-job-desc-adventurer = A hunter of thrills, riches and fame, constantly risking his life. Search for valuables in dangerous places and sell them to the settlement.
 

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

@@ -0,0 +1,15 @@
+# Basic
+
+cp14-loadout-basic-cloak = Cloak
+cp14-loadout-basic-eyes = Goggles
+cp14-loadout-basic-gloves = Gloves
+cp14-loadout-basic-head = Head
+cp14-loadout-basic-mask = Mask
+cp14-loadout-basic-pants = Pants
+cp14-loadout-basic-shirt = Shirt
+cp14-loadout-basic-shoes = Shoes
+
+# Org
+
+cp14-loadout-captain-cloak = Captain's cloak
+cp14-loadout-captain-head = Captain's head

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

@@ -1,8 +0,0 @@
-cp14-loadout-test-cloak = Cloak
-cp14-loadout-test-eyes = Goggles
-cp14-loadout-test-gloves = Gloves
-cp14-loadout-test-head = Headgear
-cp14-loadout-test-mask = Mask
-cp14-loadout-test-pants = Pants
-cp14-loadout-test-shirt = Shirt
-cp14-loadout-test-shoes = Shoes

Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl

@@ -45,6 +45,9 @@ ent-CP14ClothingCloakSimpleWhite = белый плащ
 ent-CP14ClothingCloakSimpleDarkBlue = { ent-CP14ClothingCloakSimpleWhite }
     .desc = { ent-CP14ClothingCloakSimpleWhite.desc }
 
+ent-CP14ClothingCloakCaptainJacket = капитанский жилет
+    .desc = Белое золото говорит о том, что вы смотрите на серьезного представителя власти.
+
 ent-CP14ClothingEyesMonocle = монокль
     .desc = Аристократично и красиво.
 
@@ -78,9 +81,18 @@ ent-CP14ClothingHeadRedBeret = красный берет
 ent-CP14ClothingHeadPurpleBeret = фиолетовый берет
     .desc = Это берет.
 
-ent-CP14ClothingHeadWhiteBeret = белый берет
+ent-CP14ClothingHeadYellowBeret = желтый берет
     .desc = Это берет.
 
+ent-CP14ClothingHeadBlueBeret = синий берет
+    .desc = Это берет.
+
+ent-CP14ClothingHeadBlackBeret = черный берет
+    .desc = Это берет.
+
+ent-CP14ClothingHeadCaptainCap = капитанская кепка
+    .desc = Нет, ну вы посмотрите какой красавчик!
+
 ent-CP14ClothingMaskSinner = маска грешника
     .desc = Маска предназначенная для ношения не самыми светлыми личностями. Палачи надевают их на себя и на жертву перед казнью.
 
@@ -97,9 +109,9 @@ ent-CP14ClothingPantsLoincloth = набедренная повязка
     .desc = Свободные, ничего не мешает, да еще и выглядят экстремально брутально
 
 ent-CP14ClothingShirtCottonBlue = хлопковая синяя рубаха
-    .desc = Приятный на ощупь материал, удобная свободная форма рубашки.
+    .desc = { ent-CP14ClothingShirtCottonBlue.desc }
 
-ent-CP14ClothingShirtCottonBlueDark = хлопковая темная рубаха
+ent-CP14ClothingShirtCottonBlack = хлопковая черная рубаха
     .desc = { ent-CP14ClothingShirtCottonBlue.desc }
 
 ent-CP14ClothingShirtCottonPurple = хлопковая фиолетовая рубаха
@@ -375,6 +387,9 @@ ent-CP14Shovel = лопата
 ent-CP14Hoe = мотыга
     .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков.
 
+ent-CP14Rope = веревка
+    .desc = Многофункциональная веревка. Ей можно связать что-нить. Или кого-нибудь.
+
 ent-CP14BaseSharpeningStone = точильный камень
     .desc = Позволит заточить притупленное оружие. Если перестараться, вы вполне можете сточить оружие полностью.
 
@@ -396,12 +411,18 @@ ent-CP14BaseLightHammer = легкий молот
 ent-CP14BaseMace = булава
     .desc = Тяжелый кусок металла на длинной палке. Что может быть проще?
 
+ent-CP14BaseShield = щит
+    .desc = Деревянный щит, способный выдержать несколько ударов.
+
 ent-CP14BaseSickle = серп
     .desc = Изначально разработанное как оружие против травы, серп внезапно показал себя хорош и в более кровавой жатве.
 
 ent-CP14BaseThrowableSpear = метательное копьё
     .desc = Оружие, исправно выполняющее свой долг еще со времен эпохи великанов.
 
+ent-CP14BaseSword = меч
+    .desc = Золотой стандарт холодного оружия. Средняя длина, удобная рукоять и никаких излишеств.
+
 ent-CP14BaseTwoHandedSword = двуручный меч
     .desc = Мощное оружие, требующее огромной силы и умения для эффективного использования.
 
@@ -835,6 +856,9 @@ ent-CP14WallWooden = деревянная стена
 ent-CP14WallCardboard = картонная стена
     .desc = Тонкая, непрочная стена из бумаги и картона. Популярна в теплых странах.
 
+ent-CP14WallCyan = голубая стена
+    .desc = { ent-CP14BaseWall.desc }
+
 ent-CP14BaseFenceWood = деревянный забор
     .desc = Деревянный кусок ограды. Надеюсь, за ним находится сад бабушки.
 
@@ -877,6 +901,12 @@ ent-CP14WindowStoneBrick = окно в стене из каменного кир
 ent-CP14WindowWooden = wooden window
     .desc = A wooden wall with a glass window in it.
 
+ent-CP14ClothingHeadWhiteBeret = белый берет
+    .desc = Это берет.
+
+ent-CP14ClothingShirtCottonBlueDark = хлопковая темная рубаха
+    .desc = { ent-CP14ClothingShirtCottonBlue.desc }
+
 ent-CP14ClothingEyesGoldGlasses = золотые очки
     .desc = Аристократично, модно, да еще и с позолотой.
 

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

@@ -1,5 +1,5 @@
-department-CP14Free = Свободные гражданские
-department-CP14Free-desc = Лица, не обремененные контрактами и работой на государство, но и не получающие от него бесплатной помощи. Найдите свой способ заработка.
+department-CP14Mercenary = Наемники
+department-CP14Mercenary-desc = Лица, присоединившиеся к экспедиции с целью подзаработать деньжат.
 
-department-CP14Command = Служители закона
-department-CP14Command-desc = Лица, напрямую работающие на представителей власти. Связанные магическим контрактом, они не могут действовать против интересов государства.
+department-CP14Command = Организаторы экспедиции
+department-CP14Command-desc = Лица, ответственные за выполнение поставленной от великого дома задачи.

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

@@ -1,3 +1,6 @@
+cp14-job-name-captain = Капитан экспедиции
+cp14-job-desc-captain = Вы - самая важная персона в этой экспедиции. Организуйте ее участников и руководите процессами, чтобы выполнить поставленную от руководства задачу.
+
 cp14-job-name-adventurer = Авантюрист
 cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Ищите ценности в опасных местах, и продавайте их поселению.
 

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

@@ -0,0 +1,14 @@
+# Basic
+
+cp14-loadout-basic-cloak = Накидка
+cp14-loadout-basic-eyes = Очки
+cp14-loadout-basic-gloves = Перчатки
+cp14-loadout-basic-head = Головa
+cp14-loadout-basic-mask = Маска
+cp14-loadout-basic-pants = Штаны
+cp14-loadout-basic-shirt = Рубашка
+cp14-loadout-basic-shoes = Обувь
+
+# Org
+
+cp14-loadout-captain-cloak = Капитанская накидка

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

@@ -1,8 +0,0 @@
-cp14-loadout-test-cloak = Накидка
-cp14-loadout-test-eyes = Очки
-cp14-loadout-test-gloves = Перчатки
-cp14-loadout-test-head = Головной убор
-cp14-loadout-test-mask = Маска
-cp14-loadout-test-pants = Штаны
-cp14-loadout-test-shirt = Рубашка
-cp14-loadout-test-shoes = Обувь

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

@@ -84,4 +84,17 @@
   - type: Sprite
     sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi
+    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

Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml

@@ -71,11 +71,44 @@
 
 - type: entity
   parent: CP14ClothingHeadBase
-  id: CP14ClothingHeadWhiteBeret
-  name: white beret
+  id: CP14ClothingHeadYellowBeret
+  name: yellow beret
   description: this is beret.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Head/Beret/white.rsi
+    sprite: _CP14/Clothing/Head/Beret/yellow.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Head/Beret/white.rsi
+    sprite: _CP14/Clothing/Head/Beret/yellow.rsi
+
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadBlueBeret
+  name: blue beret
+  description: this is beret.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/Beret/blue.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/Beret/blue.rsi
+
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadBlackBeret
+  name: black beret
+  description: this is beret.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/Beret/black.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/Beret/black.rsi
+
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadCaptainCap
+  name: captain's cap
+  description: No, look how handsome he is!
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/captain_cap.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/captain_cap.rsi

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

@@ -24,14 +24,14 @@
 
 - type: entity
   parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtCottonBlueDark
-  name: cotton dark shirt
+  id: CP14ClothingShirtCottonBlack
+  name: cotton black shirt
   description: Pleasant to the touch material, in a comfortable loose shirt shape.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Cotton/dark_blue.rsi
+    sprite: _CP14/Clothing/Shirt/Cotton/black.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Cotton/dark_blue.rsi
+    sprite: _CP14/Clothing/Shirt/Cotton/black.rsi
 
 - type: entity
   parent: CP14ClothingShirtBase

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

@@ -83,13 +83,15 @@
     - CP14ClothingHeadTriangularHatGolden
     - CP14ClothingHeadRedBeret
     - CP14ClothingHeadPurpleBeret
-    - CP14ClothingHeadWhiteBeret
+    - CP14ClothingHeadYellowBeret
+    - CP14ClothingHeadBlueBeret
+    - CP14ClothingHeadBlackBeret
     - CP14ClothingPantsTrouserWhite
     - CP14ClothingPantsTrouserDarkBlue
     - CP14ClothingPantsAristocratic
     - CP14ClothingPantsLoincloth
     - CP14ClothingShirtCottonBlue
-    - CP14ClothingShirtCottonBlueDark
+    - CP14ClothingShirtCottonBlack
     - CP14ClothingShirtCottonPurple
     - CP14ClothingShirtCottonRed
     - CP14ClothingShirtCottonWhite

Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml

@@ -0,0 +1,34 @@
+- type: entity
+  id: CP14Rope
+  parent: BaseItem
+  name: rope
+  description: Multifunctional rope. You can tie something with it. Or someone.
+  components:
+  - type: Item
+    size: Small
+    storedRotation: 90
+  - type: Handcuff
+    cuffedRSI: _CP14/Objects/Tools/rope.rsi
+    bodyIconState: body-overlay
+    startCuffSound:
+      path: /Audio/Items/Handcuffs/rope_start.ogg
+    endCuffSound:
+      path: /Audio/Items/Handcuffs/rope_end.ogg
+    startUncuffSound:
+      path: /Audio/Items/Handcuffs/rope_start.ogg
+    endUncuffSound:
+      path: /Audio/Items/Handcuffs/rope_breakout.ogg
+    startBreakoutSound:
+      path: /Audio/Items/Handcuffs/rope_takeoff.ogg
+  - type: Sprite
+    sprite: _CP14/Objects/Tools/rope.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 90
+    resetOnHandSelected: false
+    animation: WeaponArcDisarm
+    damage:
+      types:
+        Blunt: 0
+  - type: UseDelay
+    delay: 3

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml

@@ -0,0 +1,65 @@
+- type: entity
+  id: CP14BaseShield
+  parent: BaseItem
+  name: shield
+  description: A wooden shield capable of withstanding multiple blows.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
+    state: icon
+  - type: Item
+    sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
+    size: Ginormous
+  - type: Blocking
+    passiveBlockModifier:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+    activeBlockModifier:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+        Heat: 0.8
+      flatReductions:
+        Blunt: 1
+        Slash: 1
+        Piercing: 1
+        Heat: 1
+  - type: Clothing
+    equipDelay: 0.45
+    unequipDelay: 0.45
+    sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - back
+  - type: Damageable
+    damageContainer: Shield
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 140
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 100 #This is probably enough damage before it breaks
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalBreak
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              SheetSteel:
+                min: 2
+                max: 2
+              SheetGlass:
+                min: 2
+                max: 2

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml

@@ -0,0 +1,36 @@
+- type: entity
+  id: CP14BaseSword
+  parent: 
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSharp
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponLight
+  name: sword
+  description: the gold standard of edged weapons. Medium length, comfortable grip. No frills.
+  components:
+  - type: Item
+    size: Normal
+    storedRotation: -45 
+  - type: Clothing
+    equipDelay: 0.45
+    unequipDelay: 0.45
+    sprite: _CP14/Objects/Weapons/Melee/Sword/sword.rsi
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - back
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Sword/sword.rsi
+    layers:
+    - state: icon
+  - type: MeleeWeapon
+    attackRate: 1.5
+    wideAnimationRotation: 210
+    wideAnimation: CP14WeaponArcSlash
+    cPAnimationLength: 0.18
+    damage:
+      types:
+        Slash: 12
+    soundHit:
+      collection: MetalThud

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

@@ -127,13 +127,31 @@
     head: CP14ClothingHeadPurpleBeret
 
 - type: loadout
-  id: CP14ClothingHeadWhiteBeret
-  equipment: CP14ClothingHeadWhiteBeret
+  id: CP14ClothingHeadYellowBeret
+  equipment: CP14ClothingHeadYellowBeret
 
 - type: startingGear
-  id: CP14ClothingHeadWhiteBeret
+  id: CP14ClothingHeadYellowBeret
   equipment:
-    head: CP14ClothingHeadWhiteBeret
+    head: CP14ClothingHeadYellowBeret
+
+- type: loadout
+  id: CP14ClothingHeadBlueBeret
+  equipment: CP14ClothingHeadBlueBeret
+
+- type: startingGear
+  id: CP14ClothingHeadBlueBeret
+  equipment:
+    head: CP14ClothingHeadBlueBeret
+
+- type: loadout
+  id: CP14ClothingHeadBlackBeret
+  equipment: CP14ClothingHeadBlackBeret
+
+- type: startingGear
+  id: CP14ClothingHeadBlackBeret
+  equipment:
+    head: CP14ClothingHeadBlackBeret
 
 # Mask
 
@@ -200,13 +218,13 @@
 
 
 - type: loadout
-  id: CP14ClothingShirtCottonBlueDark
-  equipment: CP14ClothingShirtCottonBlueDark
+  id: CP14ClothingShirtCottonBlack
+  equipment: CP14ClothingShirtCottonBlack
 
 - type: startingGear
-  id: CP14ClothingShirtCottonBlueDark
+  id: CP14ClothingShirtCottonBlack
   equipment:
-    shirt: CP14ClothingShirtCottonBlueDark
+    shirt: CP14ClothingShirtCottonBlack
 
 
 - type: loadout

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

@@ -0,0 +1,19 @@
+# Head
+- type: loadout
+  id: CP14ClothingHeadCaptainCap
+  equipment: CP14ClothingHeadCaptainCap
+
+- type: startingGear
+  id: CP14ClothingHeadCaptainCap
+  equipment:
+    head: CP14ClothingHeadCaptainCap
+
+# Cloak
+- type: loadout
+  id: CP14ClothingCloakCaptainJacket
+  equipment: CP14ClothingCloakCaptainJacket
+
+- type: startingGear
+  id: CP14ClothingCloakCaptainJacket
+  equipment:
+    cloak: CP14ClothingCloakCaptainJacket

Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml

@@ -1,6 +1,8 @@
+# Basic
+
 - type: loadoutGroup
-  id: CP14TestCloak
-  name: cp14-loadout-test-cloak
+  id: CP14BasicCloak
+  name: cp14-loadout-basic-cloak
   minLimit: 0
   loadouts:
   - CP14ClothingCloakSimpleWhite
@@ -10,23 +12,29 @@
   - CP14ClothingCloakFurcapeBlue
 
 - type: loadoutGroup
-  id: CP14TestEyes
-  name: cp14-loadout-test-eyes
+  id: CP14BasicEyes
+  name: cp14-loadout-basic-eyes
   minLimit: 0
   loadouts:
   - CP14ClothingEyesMonocle
   - CP14ClothingEyesGlasses
 
 - type: loadoutGroup
-  id: CP14TestGloves
-  name: cp14-loadout-test-gloves
+  id: CP14BasicGloves
+  name: cp14-loadout-basic-gloves
   minLimit: 0
   loadouts:
   - CP14Girdles
+- type: loadoutGroup
+  id: CP14BasicMask
+  name: cp14-loadout-basic-mask
+  minLimit: 0
+  loadouts:
+  - CP14Sinner
 
 - type: loadoutGroup
-  id: CP14TestHead
-  name: cp14-loadout-test-head
+  id: CP14BasicHead
+  name: cp14-loadout-basic-head
   minLimit: 0
   loadouts:
   - CP14ClothingHeadMetalHeadband
@@ -34,18 +42,13 @@
   - CP14ClothingHeadTriangularHatGolden
   - CP14ClothingHeadRedBeret
   - CP14ClothingHeadPurpleBeret
-  - CP14ClothingHeadWhiteBeret
+  - CP14ClothingHeadYellowBeret
+  - CP14ClothingHeadBlueBeret
+  - CP14ClothingHeadBlackBeret
 
 - type: loadoutGroup
-  id: CP14TestMask
-  name: cp14-loadout-test-mask
-  minLimit: 0
-  loadouts:
-  - CP14Sinner
-
-- type: loadoutGroup
-  id: CP14TestPants
-  name: cp14-loadout-test-pants
+  id: CP14BasicPants
+  name: cp14-loadout-basic-pants
   loadouts:
   - CP14ClothingPantsTrouserWhite
   - CP14ClothingPantsTrouserDarkBlue
@@ -53,20 +56,34 @@
   - CP14ClothingPantsLoincloth
 
 - type: loadoutGroup
-  id: CP14TestShirt
-  name: cp14-loadout-test-shirt
+  id: CP14BasicShirt
+  name: cp14-loadout-basic-shirt
   loadouts:
   - CP14ClothingShirtCottonWhite
   - CP14ClothingShirtCottonBlue
-  - CP14ClothingShirtCottonBlueDark
+  - CP14ClothingShirtCottonBlack
   - CP14ClothingShirtCottonPurple
   - CP14ClothingShirtCottonRed
   - CP14ClothingShirtCottonYellow
 
 - type: loadoutGroup
-  id: CP14TestShoes
-  name: cp14-loadout-test-shoes
+  id: CP14BasicShoes
+  name: cp14-loadout-basic-shoes
   loadouts:
   - CP14ShoesBlack
   - CP14ShoesAristocraticBlack
-  - CP14ShoesSandals
+  - CP14ShoesSandals
+
+# Command
+
+- type: loadoutGroup
+  id: CP14CaptainHead
+  name: cp14-loadout-captain-head
+  loadouts:
+  - CP14ClothingHeadCaptainCap
+
+- type: loadoutGroup
+  id: CP14CaptainCloak
+  name: cp14-loadout-captain-cloak
+  loadouts:
+  - CP14ClothingCloakCaptainJacket

Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml

@@ -1,23 +1,35 @@
 - type: roleLoadout
   id: JobCP14Adventurer
   groups:
-  - CP14TestHead
-  - CP14TestEyes
-  - CP14TestMask
-  - CP14TestCloak
-  - CP14TestGloves
-  - CP14TestShirt
-  - CP14TestPants
-  - CP14TestShoes
+  - CP14BasicHead
+  - CP14BasicEyes
+  - CP14BasicMask
+  - CP14BasicCloak
+  - CP14BasicGloves
+  - CP14BasicShirt
+  - CP14BasicPants
+  - CP14BasicShoes
 
 - type: roleLoadout
   id: JobCP14Alchemist
   groups:
-  - CP14TestHead
-  - CP14TestEyes
-  - CP14TestMask
-  - CP14TestCloak
-  - CP14TestGloves
-  - CP14TestShirt
-  - CP14TestPants
-  - CP14TestShoes
+  - CP14BasicHead #TODO
+  - CP14BasicEyes
+  - CP14BasicMask
+  - CP14BasicCloak #TODO
+  - CP14BasicGloves
+  - CP14BasicShirt
+  - CP14BasicPants
+  - CP14BasicShoes
+
+- type: roleLoadout
+  id: JobCP14Captain
+  groups:
+  - CP14CaptainHead
+  - CP14BasicEyes
+  - CP14BasicMask
+  - CP14CaptainCloak
+  - CP14BasicGloves
+  - CP14BasicShirt
+  - CP14BasicPants
+  - CP14BasicShoes

Resources/Prototypes/_CP14/Roles/Jobs/Command/captain.yml

@@ -0,0 +1,16 @@
+- type: job
+  id: CP14Captain
+  name: cp14-job-name-captain
+  description: cp14-job-desc-captain
+  playTimeTracker: CP14JobCaptain
+  startingGear: CP14CaptainGear
+  icon: "CP14JobIconCaptain"
+  requireAdminNotify: true
+  joinNotifyCrew: true
+  canBeAntag: false
+  supervisors: cp14-job-supervisors-command
+
+- type: startingGear
+  id: CP14CaptainGear
+  equipment:
+    belt1: CP14WalletFilledTest

Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml

@@ -2,7 +2,7 @@
   id: CP14DeathMatchGear
   equipment:
     cloak: CP14ClothingCloakFurcapeBlue
-    shirt: CP14ClothingShirtCottonBlueDark
+    shirt: CP14ClothingShirtCottonBlack
     pants: CP14ClothingPantsLoincloth
     shoes: CP14ClothingShoesSandals
   inhand:

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml

@@ -11,19 +11,6 @@
     skills:
     - Warcraft
 
-- type: job
-  id: CP14Alchemist
-  name: cp14-job-name-alchemist
-  description: cp14-job-desc-alchemist
-  playTimeTracker: CP14JobAlchemist
-  startingGear: CP14AdventurerGear #TODO
-  icon: "CP14JobIconAlchemist"
-  supervisors: cp14-job-supervisors-command
-  special:
-  - !type:CP14AddSkillSpecial
-    skills:
-    - Alchemy
-
 - type: startingGear
   id: CP14AdventurerGear
   equipment:

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/alchemist.yml

@@ -0,0 +1,17 @@
+- type: job
+  id: CP14Alchemist
+  name: cp14-job-name-alchemist
+  description: cp14-job-desc-alchemist
+  playTimeTracker: CP14JobAlchemist
+  startingGear: CP14AlchemistGear
+  icon: "CP14JobIconAlchemist"
+  supervisors: cp14-job-supervisors-command
+  special:
+  - !type:CP14AddSkillSpecial
+    skills:
+    - Alchemy
+
+- type: startingGear
+  id: CP14AlchemistGear
+  equipment:
+    belt1: CP14WalletFilledTest

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

@@ -1,5 +1,5 @@
 - type: department
-  id: CP14Free
+  id: CP14Mercenary
   description: department-CP14Free-desc
   color: "#429976"
   roles:
@@ -10,3 +10,5 @@
   id: CP14Command
   description: department-CP14Command-desc
   color: "#fadb3e"
+  roles:
+  - CP14Captain

Resources/Prototypes/_CP14/Roles/play_time_tracker.yml

@@ -4,4 +4,7 @@
   id: CP14JobAdventurer
 
 - type: playTimeTracker
-  id: CP14JobAlchemist
+  id: CP14JobAlchemist
+
+- type: playTimeTracker
+  id: CP14JobCaptain

Resources/Prototypes/_CP14/StatusEffects/job.yml

@@ -17,4 +17,11 @@
   id: CP14JobIconAlchemist
   icon:
     sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
-    state: Alchemist
+    state: Alchemist
+
+- type: statusIcon
+  parent: CP14JobIcon
+  id: CP14JobIconCaptain
+  icon:
+    sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
+    state: Captain

Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/meta.json

@@ -11,7 +11,7 @@
             "name": "icon"
         },
         {
-            "name": "equipped-SHIRT",
+            "name": "equipped-CLOAK",
             "directions": 4
         }
     ]

Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "All rights reserved for the CrystallPunk14 project only",
+    "copyright": "CrystallPunk14, by Prazat",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "All rights reserved for the CrystallPunk14 project only",
+    "copyright": "CrystallPunk14, by Prazat",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "All rights reserved for the CrystallPunk14 project only",
+    "copyright": "CrystallPunk14, by Jaraten",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "All rights reserved for the CrystallPunk14 project only",
+    "copyright": "CrystallPunk14, by Jaraten and TheShuEd",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-SHIRT",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json

@@ -12,6 +12,9 @@
     },
     {
       "name": "Alchemist"
+    },
+    {
+      "name": "Captain"
     }
   ]
 }

Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by TheShuEd (github) for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "body-overlay-2",
+      "directions": 4
+    },
+    {
+      "name": "body-overlay-4",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk",
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    }
+  ]
+}

Resources/migration.yml

@@ -25,7 +25,10 @@ CP14GatherableBloodgrass5: CP14GatherableBloodgrass
 # 2024-06-10
 CP14ClothingCloakHoodieYellow: CP14ClothingCloakSimpleWhite
 CP14ClothingPantsHarlequinRed: CP14ClothingPantsTrouserDarkBlue
-CP14ClothingShirtHarlequineRed: CP14ClothingShirtCottonBlueDark
+CP14ClothingShirtHarlequineRed: CP14ClothingShirtCottonBlack
+
+# 2024-07-18
+CP14ClothingShirtCottonBlueDark: CP14ClothingShirtCottonBlack
 
 # <---> CrystallPunk migration zone end