Merge branch 'master' into 21-04-2024-species-naming

Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml

@@ -0,0 +1,43 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: CP14ClothingEyesBase
+  components:
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: Small
+  - type: Clothing
+    equipDelay: 0.4
+    unequipDelay: 0
+    slots: [eyes]
+
+- type: entity
+  parent: CP14ClothingEyesBase
+  id: CP14ClothingEyesMonocle
+  name: monocle
+  description: Aristocratic, fancy, gold-plated.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Eyes/monocle.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Eyes/monocle.rsi
+
+- type: entity
+  parent: CP14ClothingEyesBase
+  id: CP14ClothingEyesGoldGlasses
+  name: gold glasses
+  description: Aristocratic, fancy, gold-plated.
+  components:
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-flip-verb
+    foldVerbText: fold-flip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: flipped
+    foldedHeldPrefix: flipped
+  - type: Sprite
+    sprite: _CP14/Clothing/Eyes/gold_glasses.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Eyes/gold_glasses.rsi
+

Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml

@@ -19,8 +19,7 @@
   description: A mask intented to be worn by not the brightest individuals. Executioners put them on themselves and the victim before execution.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Masks/pluto-mask.rsi
+    sprite: _CP14/Clothing/Masks/sinner.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Masks/pluto-mask.rsi
-  - type: IdentityBlocker  
- 
+    sprite: _CP14/Clothing/Masks/sinner.rsi
+  - type: IdentityBlocker

Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml

@@ -20,4 +20,15 @@
   - type: Sprite
     sprite: _CP14/Clothing/Pants/harlequin.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Pants/harlequin.rsi
+    sprite: _CP14/Clothing/Pants/harlequin.rsi
+    
+- type: entity
+  parent: CP14ClothingPantsBase
+  id: CP14ClothingPantsAristocratic
+  name: aristocrat's pants
+  description: Pants with enough quality fabric that you don't want to cave in them.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Pants/aristocratic.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Pants/aristocratic.rsi

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

@@ -13,7 +13,7 @@
      
 - type: entity
   parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtHarlequineRed  
+  id: CP14ClothingShirtHarlequineRed
   name: red harlequin shirt
   description: It doesn't show the bloodstains that are left behind after bad jokes.
   components:
@@ -21,4 +21,15 @@
     sprite: _CP14/Clothing/Shirt/harlequine_red.rsi
   - type: Clothing
     sprite: _CP14/Clothing/Shirt/harlequine_red.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
      

Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml

@@ -22,4 +22,15 @@
   - type: Sprite
     sprite: _CP14/Clothing/Shoes/black.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Shoes/black.rsi
+    sprite: _CP14/Clothing/Shoes/black.rsi
+    
+- type: entity
+  parent: CP14ClothingShoesBase
+  id: CP14ClothingAristocraticShoesBlack
+  name: aristocratic black boots
+  description: They're expensive enough that you don't want to go caving in them.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shoes/aristocratic_black.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shoes/aristocratic_black.rsi

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

@@ -0,0 +1,65 @@
+- type: entity
+  id: CP14WallmountTorch
+  name: wallmount torch
+  description: A good, reliable light source. Too bad it doesn't last.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Structures/Decoration/wallmount_torch.rsi
+    offset: 0, 0.25
+    layers:
+      - state: base
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 80
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTypeTrigger
+          damageType: Heat
+          damage: 50
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: CP14FlammableAmbientSound
+  - type: AmbientSound
+    enabled: false
+    volume: -5
+    range: 5
+    sound:
+      path: /Audio/Ambience/Objects/fireplace.ogg
+  - type: Appearance
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+  - type: Flammable
+    fireSpread: false
+    canResistFire: false
+    alwaysCombustible: true
+    canExtinguish: true
+    firestacksOnIgnite: 0.5
+    firestackFade: 0.3
+    firestackFadeOnIgnite: 0.3
+    firestackFadeFade: -0.2
+    damage:
+      types:
+        Heat: 0.01
+  - type: FireVisuals
+    sprite: _CP14/Structures/Decoration/wallmount_torch.rsi
+    normalState: fire
+  - type: Construction
+    graph: CP14WallmountTorch
+    node: CP14WallmountTorch

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml

@@ -13,4 +13,22 @@
               doAfter: 3
               
     - node: CP14Bonfire
-      entity: CP14Bonfire
+      entity: CP14Bonfire
+
+- type: constructionGraph
+  id: CP14WallmountTorch
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+        - to: CP14WallmountTorch
+          steps:
+            - material: WoodPlank
+              amount: 5
+              doAfter: 3
+              
+    - node: CP14WallmountTorch
+      entity: CP14WallmountTorch
+

Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml

@@ -52,6 +52,25 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  crystallPunkAllowed: true
+  name: Wallmount torch
+  description: A torch attached to the wall
+  id: CP14WallmountTorch
+  graph: CP14WallmountTorch
+  startNode: start
+  targetNode: CP14WallmountTorch
+  category: construction-category-furniture
+  icon:
+    sprite: _CP14/Structures/Decoration/wallmount_torch.rsi
+    state: fire
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  canRotate: true
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   crystallPunkAllowed: true
   name: Wooden chest