Merge branch 'master' into fishing

Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml

@@ -84,18 +84,4 @@
   - type: Sprite
     sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi
-
-- type: entity
-  parent: CP14ClothingHeadBase
-  id: CP14ClothingHeadStrawHat
-  name: straw hat
-  description: Easy to make, not too bad to lose.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi
-  - type: Construction
-    graph: CP14StrawHat
-    node: cp14headstrawhat
+    sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml

@@ -1,45 +0,0 @@
-- type: entity
-  id: CP14ConstrainedSpawnerBase
-  abstract: true
-  parent: MarkerBase
-  description: lol
-  categories: [ ForkFiltered ]
-  components:
-  - type: Sprite
-    layers:
-      - state: red
-  - type: Physics
-    bodyType: Static
-    fixedRotation: true
-  - type: Fixtures
-    fixtures:
-      spawn:
-        shape:
-          !type:PhysShapeCircle
-          radius: 15
-        hard: false
-        layer:
-          - AllMask
-  - type: TriggerOnCollide
-    fixtureID: spawn
-  - type: StepTrigger
-    requiredTriggeredSpeed: 0
-    stepOn: true
-
-- type: entity
-  parent: CP14ConstrainedSpawnerBase
-  id: CP14ConstrainedSpawnerXeno
-  name: xeno constrained spawner
-  components:
-  - type: TriggerOnCollide
-    fixtureID: spawn
-  - type: CP14ConstrainedSpawnerOnTrigger
-    prototypes:
-    - CP14MobXeno
-    - CP14MobXenoDrone
-    - CP14MobSpaceCobra
-    - CP14MobSmallPurpleSnake
-    - CP14MobPurpleSnake
-    - MobLuminousEntity
-    - MobLuminousObject
-    - CP14MobWatcherMagmawing

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml

@@ -137,18 +137,4 @@
         color: green
       - state: frame
   - type: CP14BiomeSpawner
-    biome: CP14LeafMaze
-
-- type: entity
-  id: CP14BiomeSpawnerMarbleCave
-  parent: CP14BaseBiomeSpawner
-  suffix: Marble cave
-  components:
-  - type: Sprite
-    layers:
-      - state: cave
-      - state: frame
-      - sprite: _CP14/Objects/Materials/marble_block.rsi
-        state: stone_3
-  - type: CP14BiomeSpawner
-    biome: CP14MarbleCaves 
+    biome: CP14LeafMaze

Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml

@@ -45,8 +45,10 @@
       0: Alive
       50: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 5
-    baseSprintSpeed: 7
+    baseWalkSpeed: 2
+    baseSprintSpeed: 4
+    friction: 0.5
+    acceleration: 3
   - type: ProjectileBatteryAmmoProvider
     proto: WatcherBolt
     fireCost: 50

Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml

@@ -1,84 +0,0 @@
-- type: entity
-  id: CP14MobXeno
-  parent: MobXeno
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-
-- type: entity
-  id: CP14MobXenoDrone
-  parent: MobXenoDrone
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-
-- type: entity
-  id: CP14MobSpaceCobra
-  name: cobra
-  parent: MobCobraSpace
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: MeleeChemicalInjector
-    transferAmount: 2
-  - type: MeleeWeapon
-    hidden: true
-    soundHit:
-      path: /Audio/Effects/bite.ogg
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 2
-        Poison: 2
-
-- type: entity
-  id: CP14MobPurpleSnake
-  parent: MobPurpleSnake
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: MeleeWeapon
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 1
-  - type: MeleeChemicalInjector
-    transferAmount: 3
-
-- type: entity
-  id: CP14MobSmallPurpleSnake
-  parent: MobSmallPurpleSnake
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: SolutionTransfer
-    maxTransferAmount: 0.2
-  - type: MeleeWeapon
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 0.5
-  - type: MeleeChemicalInjector
-    transferAmount: 2
-
-- type: entity
-  id: CP14MobWatcherMagmawing
-  parent: MobWatcherMagmawing
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster

Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml

@@ -1,124 +0,0 @@
-- type: entity
-  id: CP14DirtBlock1
-  parent: BaseItem
-  name: dirt block
-  description: A block of excellent black soil.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/dirt_block.rsi
-    layers:
-      - state: dirt
-        map: ["base"]
-  - type: FloorTile
-    placeTileSound:
-      collection: CP14Digging
-      params:
-        variation: 0.03
-        volume: 2
-    outputs:
-      - CP14FloorDirt
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Dirt
-    count: 1
-    baseLayer: base
-    layerStates:
-    - dirt
-    - dirt_2
-    - dirt_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Dirt: 100
-  - type: CP14MagicEssenceContainer
-    essences:
-      Earth: 1
-
-- type: entity
-  id: CP14DirtBlock10
-  parent: CP14DirtBlock1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
-- type: entity
-  id: CP14StoneBlock1
-  parent: BaseItem
-  name: stone block
-  description: A block of cold stone.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/stone_block.rsi
-    layers:
-      - state: stone
-        map: ["base"]
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Stone
-    count: 1
-    baseLayer: base
-    layerStates:
-    - stone
-    - stone_2
-    - stone_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Stone: 100
-  - type: CP14MagicEssenceContainer
-    essences:
-      Earth: 1
-
-- type: entity
-  id: CP14StoneBlock10
-  parent: CP14StoneBlock1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
-- type: entity
-  id: CP14MarbleBlock1
-  parent: BaseItem
-  name: marble block
-  description: A block of white marble.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/marble_block.rsi
-    layers:
-      - state: stone
-        map: ["base"]
-  - type: Appearance
-  - type: Stack
-    stackType: CP14MarbleStone
-    count: 1
-    baseLayer: base
-    layerStates:
-    - stone
-    - stone_2
-    - stone_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14MarbleStone: 100
-
-- type: entity
-  id: CP14MarbleBlock10
-  parent: CP14MarbleBlock1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10

Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml

@@ -1,3 +1,91 @@
+- type: entity
+  id: CP14DirtBlock1
+  parent: BaseItem
+  name: dirt block
+  description: A block of excellent black soil.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/dirt_block.rsi
+    layers:
+      - state: dirt
+        map: ["base"]
+  - type: FloorTile
+    placeTileSound:
+      collection: CP14Digging
+      params:
+        variation: 0.03
+        volume: 2
+    outputs:
+      - CP14FloorDirt
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Dirt
+    count: 1
+    baseLayer: base
+    layerStates:
+    - dirt
+    - dirt_2
+    - dirt_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Dirt: 100
+  - type: CP14MagicEssenceContainer
+    essences:
+      Earth: 1
+
+- type: entity
+  id: CP14DirtBlock10
+  parent: CP14DirtBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  id: CP14StoneBlock1
+  parent: BaseItem
+  name: stone block
+  description: A block of cold stone.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/stone_block.rsi
+    layers:
+      - state: stone
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Stone
+    count: 1
+    baseLayer: base
+    layerStates:
+    - stone
+    - stone_2
+    - stone_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Stone: 100
+  - type: CP14MagicEssenceContainer
+    essences:
+      Earth: 1
+
+- type: entity
+  id: CP14StoneBlock10
+  parent: CP14StoneBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
 - type: entity
   id: CP14Nail1
   parent: BaseItem

Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml

@@ -66,19 +66,6 @@
   - type: Stack
     stackType: CP14FloorTileMarbleBrick
 
-- type: entity
-  parent: CP14FloorTileBase
-  id: CP14FloorTileMarbleSmallbricks
-  name: marble small brick
-  components:
-  - type: Sprite
-    state: marble_smallbricks
-  - type: FloorTile
-    outputs:
-      - CP14FloorMarbleSmallbricks
-  - type: Stack
-    stackType: CP14FloorTileMarbleSmallbricks
-
 - type: entity
   parent: CP14FloorTileBase
   id: CP14FloorTileOakWoodplanks

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

@@ -2,9 +2,8 @@
   parent: BaseStructure
   id: CP14FloorWaterOptimized
   name: water
-  suffix: Optimized, Empty
   description: A trough of plain water. Clean enough for consumption
-  categories: [ ForkFiltered ]
+  categories: [ HideSpawnMenu ]
   placement:
     mode: SnapgridCenter
     snap:
@@ -63,30 +62,11 @@
   - type: TileEntityEffect
     effects:
     - !type:ExtinguishReaction
-  - type: FrictionContacts
-
-- type: entity
-  parent: CP14FloorWaterOptimized
-  id: CP14FloorWaterOptimizedDeep
-  name: deep water
-  suffix: Deep, Air damage
-  components:
-  - type: Sprite
-    drawdepth: OverMobs
-    color: "#869dc2"
-  - type: SpeedModifierContacts
-    walkSpeedModifier: 0.2
-    sprintSpeedModifier: 0.2
-  - type: FrictionContacts
-  - type: DamageContacts
-    damage:
-      types:
-        Asphyxiation: 2.5
 
 - type: entity
   parent: CP14FloorWaterOptimized
   id: CP14FloorWater
-  suffix: Normal
+  categories: [ ForkFiltered ]
   components:
   - type: DrawableSolution
     solution: pool

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

@@ -1,7 +1,8 @@
 - type: entity
   parent:
   - BaseStructure
-  id: CP14TableBase
+  - CP14BaseFlammable
+  id: CP14WoodenTableBase
   categories: [ ForkFiltered ]
   abstract: true
   components:
@@ -16,31 +17,6 @@
         - TableMask
         layer:
         - TableLayer
-  - type: Damageable
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 60
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/picaxe2.ogg
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepHull
-  - type: Climbable
-  - type: PlaceableSurface
-
-- type: entity
-  parent:
-  - CP14TableBase
-  - CP14BaseFlammable
-  id: CP14WoodenTableBase
-  abstract: true
-  components:
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
@@ -76,6 +52,8 @@
   - type: FireVisuals
     sprite: _CP14/Effects/fire.rsi
     normalState: full
+  - type: Climbable
+  - type: PlaceableSurface
 
 - type: entity
   parent: CP14WoodenTableBase
@@ -138,25 +116,4 @@
     state: full
   - type: Construction
     graph: CP14TableWoodenCounter
-    node: CP14TableWoodenCounter
-
-- type: entity
-  parent: CP14TableBase
-  id: CP14TableMarble
-  name: marble table
-  description: Exquisite white marble table.
-  components:
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
-  - type: Sprite
-    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
-  - type: Icon
-    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
-    state: full
-  - type: IconSmooth
-    key: state
-    base: state
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepFloor
+    node: CP14TableWoodenCounter

Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml

@@ -38,39 +38,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
 
-- type: entity
-  id: CP14WallMarbleStone
-  name: marble
-  parent: CP14WallStone
-  components:
-  - type: Sprite
-    sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi
-  - type: Icon
-    sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 350
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/break_stone.ogg
-          params:
-            volume: -6
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          CP14MarbleBlock1:
-            min: 2
-            max: 3
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
 
 - type: entity
   id: CP14WallStoneIndestructable

Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml

@@ -71,25 +71,6 @@
     sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi
   - type: IconSmooth
     base: stonebricks
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Rock
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/break_stone.ogg
-          params:
-            volume: -6
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Construction
-    graph: CP14WallMarbleBrick
-    node: CP14WallMarbleBrick
   - type: CP14WallpaperHolder
 
 - type: entity

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

@@ -202,7 +202,6 @@
   - CP14ClothingHeadJestersCap
   - CP14ClothingHeadHuntersHat
   - CP14ClothingHeadJagermeisterHat
-  - CP14ClothingHeadStrawHat
 
 - type: loadout
   id: CP14ClothingHeadMetalHeadband
@@ -224,11 +223,6 @@
   equipment:
     head: CP14ClothingHeadJestersCap
 
-- type: loadout
-  id: CP14ClothingHeadStrawHat
-  equipment:
-    head: CP14ClothingHeadStrawHat
-
 - type: loadout
   id: CP14ClothingHeadHuntersHat
   equipment:

Resources/Prototypes/_CP14/Maps/Factoria.yml

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

Resources/Prototypes/_CP14/Materials/simple.yml

@@ -25,15 +25,6 @@
   color: "#555963"
   price: 0
 
-- type: material
-  id: CP14MarbleStone
-  stackEntity: CP14MarbleBlock1
-  name: cp14-material-stone-block #TODO
-  unit: materials-unit-chunk
-  icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
-  color: "#555963"
-  price: 0
-
 - type: material
   id: CP14Nail
   stackEntity: CP14Nail1

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml

@@ -41,10 +41,6 @@
       biomeTemplate: CP14CavesFloor
       tileMask:
       - CP14FloorGrass
-    - !type:BiomeDunGen
-      biomeTemplate: CP14MarbleCaves
-      tileMask:
-      - CP14FloorMarble
 
 - type: dungeonConfig
   id: CP14DemiplaneCavesRingFloorMaskStone
@@ -106,9 +102,9 @@
   - !type:NoiseDistanceDunGen
     size: 50, 50
     distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.8
+      blendWeight: 0.6
     layers:
-    - tile: CP14FloorMarble
+    - tile: Space
       threshold: 0.50
       noise:
         frequency: 0.010
@@ -116,4 +112,18 @@
         fractalType: FBm
         octaves: 5
         lacunarity: 2
+        gain: 0.5
+  - !type:NoiseDistanceDunGen
+    size: 80, 50
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.2
+    layers:
+    - tile: Space
+      threshold: 0.50
+      noise:
+        frequency: 0.08
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
         gain: 0.5

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml

@@ -220,7 +220,7 @@
   - CP14DemiplaneHot
   layers:
     - !type:OreDunGen
-      entity: CP14MobSlimeBase
+      entity: CP14MobWatcherIce
       count: 2
       minGroupSize: 2
       maxGroupSize: 3
@@ -239,7 +239,7 @@
   - CP14DemiplaneCold
   layers:
     - !type:OreDunGen
-      entity: CP14MobSlimeBase
+      entity: CP14MobWatcherMagma
       count: 2
       minGroupSize: 2
       maxGroupSize: 3

Resources/Prototypes/_CP14/Procedural/fill.yml

@@ -48,7 +48,7 @@
       allowedTiles:
         - FloorSnow
       entities:
-        - CP14FloorWaterOptimizedDeep
+        - CP14FloorWaterOptimized
 
 - type: biomeTemplate
   id: CP14SandOceanFill
@@ -61,7 +61,7 @@
       allowedTiles:
         - FloorDesert
       entities:
-        - CP14FloorWaterOptimizedDeep
+        - CP14FloorWaterOptimized
 
 - type: biomeTemplate
   id: CP14LavaOceanFill

Resources/Prototypes/_CP14/Procedural/marble_cave.yml

@@ -1,47 +0,0 @@
-- type: biomeTemplate
-  id: CP14MarbleCaves
-  layers:
-    - !type:BiomeTileLayer
-      threshold: -1.0
-      tile: CP14FloorMarbleCave
-    #Rocks
-    - !type:BiomeEntityLayer
-      threshold: 0.4
-      noise:
-        seed: 1
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        frequency: 2
-      allowedTiles:
-        - CP14FloorMarbleCave
-      entities:
-        - CP14RockSmall
-    # Lakes
-    - !type:BiomeEntityLayer
-      threshold: -0.45
-      invert: true
-      noise:
-        seed: 12
-        noiseType: Perlin
-        fractalType: Ridged
-        octaves: 1
-        frequency: 0.1
-        gain: 0.5
-      allowedTiles:
-        - CP14FloorMarbleCave
-      entities:
-        - CP14FloorLava
-    - !type:BiomeEntityLayer
-      threshold: -0.45
-      invert: true
-      noise:
-        seed: 0
-        noiseType: Perlin
-        fractalType: Ridged
-        octaves: 1
-        frequency: 0.1
-        gain: 0.5
-      allowedTiles:
-        - CP14FloorMarbleCave
-      entities:
-        - CP14WallMarbleStone

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml

@@ -1,16 +0,0 @@
-- type: constructionGraph
-  id: CP14WallMarbleBrick
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: CP14WallMarbleBrick
-          completed:
-            - !type:SnapToGrid
-              southRotation: true
-          steps:
-            - material: CP14MarbleStone
-              amount: 3
-              doAfter: 2
-    - node: CP14WallMarbleBrick
-      entity: CP14WallMarbleBrick

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

@@ -90,7 +90,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: stonebrick wall
+  name: stone wall
   description: Sturdy enough to cover you from threats or cold winds.
   id: CP14WallStonebrick
   graph: CP14WallStonebrick
@@ -106,24 +106,6 @@
   conditions:
     - !type:TileNotBlocked
 
-- type: construction
-  crystallPunkAllowed: true
-  name: marble brick wall
-  description: Sturdy enough to cover you from threats or cold winds.
-  id: CP14WallMarbleBrick
-  graph: CP14WallMarbleBrick
-  startNode: start
-  targetNode: CP14WallMarbleBrick
-  category: construction-category-structures
-  icon:
-    sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi
-    state: full
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
-
 - type: construction
   crystallPunkAllowed: true
   name: iron grille

Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/straw_hat.yml

@@ -1,17 +0,0 @@
-- type: constructionGraph
-  id: CP14StrawHat
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: cp14headstrawhat
-      steps:
-      - tag: CP14Wheat
-        name: wheat
-        icon:
-          sprite: _CP14/Objects/Flora/Farm/wheat.rsi
-          state: base1
-        doAfter: 4
-
-  - node: cp14headstrawhat
-    entity: CP14ClothingHeadStrawHat

Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml

@@ -11,17 +11,3 @@
   icon:
     sprite: _CP14/Clothing/Head/Produced/wreath.rsi
     state: icon
-
-- type: construction
-  crystallPunkAllowed: true
-  name: straw hat
-  id: cp14headstrawhat
-  graph: CP14StrawHat
-  startNode: start
-  targetNode: cp14headstrawhat
-  category: construction-category-clothing
-  objectType: Item
-  description: Easy to make, not too bad to lose.
-  icon:
-    sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi
-    state: icon

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

@@ -15,22 +15,11 @@
   craftTime: 1
   requirements:
   - !type:StackResource
-    stack: CP14MarbleStone
+    stack: CP14Stone
     count: 1
   result: CP14FloorTileMarbleBrick
   resultCount: 4
 
-- type: CP14Recipe
-  id: CP14FloorTileMarbleSmallbricks
-  tag: CP14RecipeWorkbench
-  craftTime: 1
-  requirements:
-  - !type:StackResource
-    stack: CP14MarbleStone
-    count: 1
-  result: CP14FloorTileMarbleSmallbricks
-  resultCount: 4
-
 - type: CP14Recipe
   id: CP14FloorTileStonebricks
   tag: CP14RecipeWorkbench

Resources/Prototypes/_CP14/Species/silva.yml

@@ -10,6 +10,7 @@
   defaultSkinTone: "#6c741d"
   maleFirstNames: CP14_Names_Silva_Male_First
   femaleFirstNames: CP14_Names_Silva_Female_First
+  naming: First
 
 - type: speciesBaseSprites
   id: CP14MobSilvaSprites

Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml

@@ -12,13 +12,6 @@
   icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble }
   maxCount: 30
 
-- type: stack
-  id: CP14FloorTileMarbleSmallbricks
-  name: marble small brick
-  spawn: CP14FloorTileMarbleSmallbricks
-  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble_smallbricks }
-  maxCount: 30
-
 - type: stack
   id: CP14FloorTileOakWoodplanks
   name: oak woodplanks

Resources/Prototypes/_CP14/Stacks/materials.yml

@@ -12,13 +12,6 @@
   icon: { sprite: _CP14/Objects/Materials/stone_block.rsi, state: stone_2 }
   maxCount: 10
 
-- type: stack
-  id: CP14MarbleStone
-  name: cp14-stack-marble-block
-  spawn: CP14MarbleBlock1
-  icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
-  maxCount: 10
-
 - type: stack
   id: CP14WoodenPlanks
   name: cp14-stack-wood-planks

Resources/Prototypes/_CP14/Tiles/natural.yml

@@ -40,37 +40,6 @@
   heatCapacity: 10000
   weather: true
 
-- type: tile
-  editorHidden: false
-  id: CP14FloorMarbleCave
-  name: cp14-tiles-marble-cave
-  sprite: /Textures/_CP14/Tiles/marble_cave.png
-  variants: 14
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  baseTurf: CP14FloorBase
-  deconstructTools: [ CP14Digging ]
-  isSubfloor: true
-  itemDrop: CP14MarbleBlock1
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
-
 - type: tile
   editorHidden: false
   id: CP14FloorSand

Resources/Prototypes/_CP14/Tiles/produced.yml

@@ -205,34 +205,6 @@
   deconstructTools: [ Prying ]
   itemDrop: CP14FloorTileMarbleBrick
 
-- type: tile
-  editorHidden: false
-  id: CP14FloorMarbleSmallbricks
-  name: cp14-tiles-stonebricks-marble
-  sprite: /Textures/_CP14/Tiles/Marble/small_bricks.png
-  variants: 9
-  placementVariants:
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  - 1.0
-  edgeSpritePriority: 102
-  edgeSprites:
-    South: /Textures/_CP14/Tiles/Marble/double_edge_S.png
-  baseTurf: CP14FloorFoundation
-  isSubfloor: false
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  deconstructTools: [ Prying ]
-  itemDrop: CP14FloorTileMarbleSmallbricks
-
 - type: tile
   editorHidden: false
   id: CP14FloorDirtSeedbed