Master fix + Bank removal (#888)

* bugfix

* bank removal

* red and blue carpet

* Update carpets.yml

Resources/Prototypes/_CP14/Entities/Structures/Furniture/carpets.yml

@@ -0,0 +1,58 @@
+- type: entity
+  id: CP14CarpetBase
+  parent: BaseStructure
+  name: carpet
+  description: "Fancy walking surface."
+  categories: [ ForkFiltered ]
+  abstract: true
+  components:
+  - type: Sprite
+    drawdepth: FloorTiles
+  - type: Icon
+    state: full
+  - type: IconSmooth
+    key: full
+    base: carpet_
+  - type: Tag
+    tags:
+    - Carpet
+    - ForceFixRotations
+  - type: Physics
+    canCollide: false
+  - type: Fixtures
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Butcherable
+    butcheringType: Knife
+    butcherDelay: 2
+    spawned:
+    - id: CP14Cloth1
+      amount: 1
+
+- type: entity
+  id: CP14CarpetBlue
+  parent: CP14CarpetBase
+  suffix: Blue
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/blue_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/blue_carpet.rsi
+
+- type: entity
+  id: CP14CarpetRed
+  parent: CP14CarpetBase
+  suffix: Red
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/red_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/red_carpet.rsi

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

@@ -25,7 +25,7 @@
 - type: loadout
   id: CP14ClothingOuterClothingGreenVest
   equipment:
-    cloak: CP14ClothingOuterClothingGreenVest
+    outerClothing: CP14ClothingOuterClothingGreenVest
 
 # Shirt
 

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -11,59 +11,4 @@
           mapNameTemplate: "Meteor Arena"
         - type: StationJobs
           availableJobs:
-            CP14Adventurer: [ -1, -1 ]
-
-- type: gameMap
-  id: Comoss
-  mapName: "Comoss island"
-  mapPath: /Maps/_CP14/comoss.yml
-  maxRandomOffset: 0
-  randomRotation: false
-  minPlayers: 0
-  stations:
-    Comoss:
-      stationProto: CP14BaseExpedition
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: "Comoss island"
-        - type: StationJobs
-          availableJobs:
-            #Mercenary
-            CP14Guildmaster: [1, 1]
-            CP14Adventurer: [ -1, -1 ]
-            #Artisans
-            CP14Apprentice: [ 5, 5 ]
-            CP14Alchemist: [ 2, 2 ]
-            CP14Blacksmith: [ 2, 2 ]
-            CP14Innkeeper: [ 3, 4 ]
-            #Traders
-            CP14Commandant: [1, 1]
-            CP14Merchant: [3, 4]
-            #Guard
-            CP14Guard: [8, 8]
-            CP14GuardCommander: [1, 1]
-        - type: CP14StationZLevels
-          defaultMapLevel: 0
-          levels:
-            -1:
-              path: /Maps/_CP14/comoss_d.yml
-        - type: CP14StationKeyDistribution
-          keys:
-          - Alchemy1
-          - Alchemy2
-          - Blacksmith1
-          - Blacksmith2
-          - PersonalHouse1
-          - PersonalHouse2
-          #- PersonalHouse3 #TODO: return
-          - PersonalHouse4
-          - PersonalHouse5
-          - PersonalHouse6
-          - PersonalHouse7
-          - PersonalHouse8
-          - PersonalHouse9
-          - PersonalHouse10
-          - PersonalHouse11
-          - PersonalHouse12
-          - PersonalHouse13
-          - PersonalHouse14
+            CP14Adventurer: [ -1, -1 ]

Resources/Prototypes/_CP14/Maps/comoss.yml

@@ -0,0 +1,54 @@
+- type: gameMap
+  id: Comoss
+  mapName: "Comoss island"
+  mapPath: /Maps/_CP14/comoss.yml
+  maxRandomOffset: 0
+  randomRotation: false
+  minPlayers: 0
+  stations:
+    Comoss:
+      stationProto: CP14BaseExpedition
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: "Comoss island"
+        - type: StationJobs
+          availableJobs:
+            #Mercenary
+            CP14Guildmaster: [1, 1]
+            CP14Adventurer: [ -1, -1 ]
+            #Artisans
+            CP14Apprentice: [ 5, 5 ]
+            CP14Alchemist: [ 2, 2 ]
+            CP14Blacksmith: [ 2, 2 ]
+            CP14Innkeeper: [ 3, 4 ]
+            #Traders
+            #CP14Commandant: [1, 1]
+            #CP14Merchant: [3, 4]
+            #Guard
+            CP14Guard: [8, 8]
+            CP14GuardCommander: [1, 1]
+        - type: CP14StationZLevels
+          defaultMapLevel: 0
+          levels:
+            -1:
+              path: /Maps/_CP14/comoss_d.yml
+        - type: CP14StationKeyDistribution
+          keys:
+          - Alchemy1
+          - Alchemy2
+          - Blacksmith1
+          - Blacksmith2
+          - PersonalHouse1
+          - PersonalHouse2
+          #- PersonalHouse3 #TODO: return
+          - PersonalHouse4
+          - PersonalHouse5
+          - PersonalHouse6
+          - PersonalHouse7
+          - PersonalHouse8
+          - PersonalHouse9
+          - PersonalHouse10
+          - PersonalHouse11
+          - PersonalHouse12
+          - PersonalHouse13
+          - PersonalHouse14

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml

@@ -27,10 +27,6 @@
   - CP14DemiplanePeacefulAnimals
   layers:
     - !type:OreDunGen
-      tileMask: 
-      - CP14FloorGrass
-      - CP14FloorGrassLight
-      - CP14FloorGrassTall
       entity: CP14MobRabbit
       count: 3
       minGroupSize: 2
@@ -49,10 +45,6 @@
   - CP14DemiplanePeacefulAnimals
   layers:
     - !type:OreDunGen
-      tileMask: 
-      - CP14FloorGrass
-      - CP14FloorGrassLight
-      - CP14FloorGrassTall
       entity: CP14MobBoar
       count: 3
       minGroupSize: 2

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

@@ -3,6 +3,7 @@
   name: cp14-job-name-commandant
   description: cp14-job-desc-commandant
   playTimeTracker: CP14JobCommandant
+  setPreference: false
   startingGear: CP14CommandantGear
   icon: "CP14JobIconCommandant"
   requireAdminNotify: true

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

@@ -3,6 +3,7 @@
   name: cp14-job-name-merchant
   description: cp14-job-desc-merchant
   playTimeTracker: CP14JobMerchant
+  setPreference: false
   startingGear: CP14MerchantGear
   icon: "CP14JobIconMerchant"
   supervisors: cp14-job-supervisors-commandant

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

@@ -26,6 +26,7 @@
   description: department-CP14Bank-desc
   weight: 8
   color: "#fadb3e"
+  editorHidden: true
   roles:
   - CP14Commandant
   - CP14Merchant