Split decal cleaner into Broom + Max Gab papers and hair (#470)

* add broom

* water fix

* new hair

* paper added

* feather pen

* some unfinished inkwell

* inkstorage

* Update meta.json

* fixes

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml

@@ -148,4 +148,12 @@
   markingCategory: Hair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_hair.rsi
-      state: wisp
+      state: wisp
+      
+- type: marking
+  id: CP14HumanHairMaxyShagy
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_hair.rsi
+      state: maxy_shagy

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml

@@ -0,0 +1,74 @@
+- type: entity
+  parent: BaseItem
+  id: CP14BasePaper
+  abstract: true
+  components:
+  - type: Paper
+  - type: PaperLabelType
+  - type: ActivatableUI
+    key: enum.PaperUiKey.Key
+    requiresComplex: false
+  - type: UserInterface
+    interfaces:
+      enum.PaperUiKey.Key:
+        type: PaperBoundUserInterface
+  - type: Item
+    size: Tiny
+  - type: Appearance
+  - type: PaperVisuals
+  - type: Flammable
+    fireSpread: true
+    alwaysCombustible: true
+    damage:
+      types:
+        Heat: 1
+  - type: FireVisuals
+    sprite: Effects/fire.rsi
+    normalState: fire
+  - type: Damageable
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+            Ash:
+              min: 1
+              max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Food
+    solution: food
+    delay: 7
+    forceFeedDelay: 7
+  - type: FlavorProfile
+    flavors:
+    - paper
+  - type: BadFood
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 1
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 1
+
+- type: entity
+  parent: CP14BasePaper
+  id: CP14Paper
+  name: paper
+  description: A piece of white paper
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Bureaucracy/paper.rsi
+    layers:
+    - state: paper
+    - state: paper_filled
+      map: ["enum.PaperVisualLayers.Writing"]
+      visible: false
+    #- state: paper_stamp-generic
+    #  map: ["enum.PaperVisualLayers.Stamp"]
+    #  visible: false

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml

@@ -0,0 +1,54 @@
+- type: entity
+  parent: Pen
+  id: CP14PenFeather
+  name: fountain pen
+  description: A sharp clipped feather of a bird, adapted as a writing implement.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Bureaucracy/pens.rsi
+    state: feather
+  - type: Item
+    sprite: _CP14/Objects/Bureaucracy/pens.rsi
+    heldPrefix: feather
+    size: Tiny
+  - type: Tag
+    tags:
+    - Write
+    - Pen
+    - CP14InkwellFittable
+
+# TODO: Чернильницу нужно доделать. Перо должно быть видно, пока оно внутри чернильницы. Предмет должен быть через ItemSlots, чтобы перо вставлять забирать можно было кликом. Нужно добавить прикольные звуки вставляния, выставляния. И добавить механ, который будет требовать периодически макать перо в чернильницу.
+- type: entity
+  parent: BaseItem
+  id: CP14Inkwell
+  name: inkwell
+  description: An endless (for now) source of ink for your letters
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Bureaucracy/inkwell.rsi
+    drawdepth: SmallObjects
+    layers:
+      - state: icon
+      - state: feather
+        map: ["enum.StorageFillLayers.Fill"]
+        visible: false
+  #- type: Appearance
+  #- type: StorageFillVisualizer
+  #  maxFillLevels: 1
+  #  fillBaseName: fill
+  - type: Pullable
+  - type: Storage
+    grid:
+    - 0,0,0,0
+    maxItemSize: Tiny
+    whitelist:
+      tags:
+        - CP14InkwellFittable
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: InteractionOutline
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container

Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml

@@ -210,7 +210,7 @@
           Quantity: 4
         - ReagentId: Vitamin
           Quantity: 2
-        - ReagentId: CP14Water
+        - ReagentId: Water
           Quantity: 3
   - type: FoodSequenceElement
     entries:

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml

@@ -31,4 +31,27 @@
     solutions:
       absorbed:
         maxVol: 100
-  - type: CP14DecalCleaner
+
+- type: entity
+  id: CP14BaseBroom
+  parent: 
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  name: wooden broom
+  description: Sweeps up dried footprints and other stains from the floor
+  components:
+  - type: Item
+    size: Large
+    sprite: _CP14/Objects/Tools/broom.rsi
+  - type: Sprite
+    sprite: _CP14/Objects/Tools/broom.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 10
+    damage:
+      types:
+        Blunt: 2
+    soundHit:
+      collection: MetalThud
+  - type: CP14DecalCleaner
+    delay: 0.75

Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml

@@ -52,7 +52,7 @@
       pool:
         maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
         reagents:
-        - ReagentId: CP14Water
+        - ReagentId: Water
           Quantity: 9999999
   - type: DrainableSolution
     solution: pool

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

@@ -101,7 +101,7 @@
     solutions:
       barrel:
         reagents:
-        - ReagentId: CP14Water
+        - ReagentId: Water
           Quantity: 300
 
 - type: entity

Resources/Prototypes/_CP14/PlantMetabolizer/metabolizers.yml

@@ -1,6 +1,6 @@
 - type: CP14PlantMetabolizer
   id: Base
   metabolization:
-    CP14Water:
+    Water:
       - !type:AffectPlantValues
         resource: 1

Resources/Prototypes/_CP14/Reagents/Consumable/Drink/drinks.yml

@@ -1,7 +0,0 @@
-- type: reagent
-  parent: Water
-  id: CP14Water
-  name: cp14-reagent-name-water
-  desc: cp14-reagent-desc-water
-  flavor: CP14Water
-  color: "#75b1f0"

Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml

@@ -41,4 +41,14 @@
   stacks:
     CP14WoodenPlanks: 2
     CP14Cloth: 1
-  result: CP14BaseMop
+  result: CP14BaseMop
+
+- type: CP14Recipe
+  id: CP14BaseBroom
+  tag: CP14RecipeWorkbench
+  craftTime: 3
+  entities:
+    CP14Wheat: 2
+  stacks:
+    CP14WoodenPlanks: 2
+  result: CP14BaseBroom

Resources/Prototypes/_CP14/tags.yml

@@ -31,6 +31,9 @@
 - type: Tag
   id: CP14Plate
 
+- type: Tag
+  id: CP14InkwellFittable
+
 - type: Tag
   id: CP14RecipeSewing