Quality of Life PR 1

Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml

@@ -1,4 +1,5 @@
 - type: entity
+  noSpawn: true
   id: Bonfire
   parent: BaseStructure
   name: bonfire
@@ -36,6 +37,7 @@
       - NoPaint
 
 - type: entity
+  noSpawn: true
   id: LegionnaireBonfire
   parent: Bonfire
   name: legionnaire bonfire

Resources/Prototypes/Maps/N14/sunnyvale.yml

@@ -5,7 +5,7 @@
   minPlayers: 0
   stations:
     Sunnyvale:
-      stationProto: StandardNanotrasenStation
+      stationProto: FalloutStation
       components:
         - type: StationNameSetup
           mapNameTemplate: 'Sunnyvale'

Resources/Prototypes/Maps/N14/waves.yml

@@ -5,7 +5,7 @@
   minPlayers: 0
   stations:
     Station:
-      stationProto: StandardNanotrasenStation
+      stationProto: FalloutStation
       components:
         - type: StationNameSetup
           mapNameTemplate: 'Super Duper Mart'

Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/animals.yml

@@ -498,6 +498,14 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: WastelandAnimal
+  - type: Timer
+  - type: TimedSpawner
+    prototypes:
+      - N14Dung
+    chance: 0.5
+    intervalSeconds: 300
+    minimumEntitiesSpawned: 1
+    maximumEntitiesSpawned: 1
 
 - type: entity
   name: bighorner

Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Food/meat.yml

@@ -1,6 +1,6 @@
 # Base
 - type: entity
-  parent: FoodInjectableBase
+  parent: FoodMeatRawBase
   id: N14FoodMeatBase
   abstract: true
   components:

Resources/Prototypes/Nuclear14/Entities/Objects/Decoration/flora.yml

@@ -1,26 +1,27 @@
 - type: entity
-  id: N14FloraLog1
+  id: N14FloraLogBase
   name: log
   description: Once a tree, always a log.
+  abstract: true
   components:
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
     noRot: true
     sprite: Nuclear14/Structures/Decoration/flora.rsi
     state: tree_log
-    drawdepth: Overdoors
+    drawdepth: FloorObjects
   - type: Physics
-    bodyType: Static
+    bodyType: Dynamic
   - type: Fixtures
     fixtures:
       fix1:
         shape:
-          !type:PhysShapeAabb
-          bounds: "-0.35,-0.4,0.35,0.4"
-        density: 100
-        layer:
-        - WallLayer
+          !type:PhysShapeCircle
+          radius: 0.2
+        density: 2000
+        mask:
+        - TableMask
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
@@ -52,7 +53,7 @@
         acts: [ "Destruction" ]
       - !type:SpawnEntitiesBehavior
         spawn:
-          N14FloraTimber:
+          N14FloraLogTimber:
             min: 1
             max: 1
   - type: SoundOnGather
@@ -64,15 +65,30 @@
   - type: OreVein
     oreChance: 1.0
     currentOre: Timber
+  - type: Strap
+    position: Stand
+    buckleOffset: "0,-0.05"
+  - type: Pullable
+
+- type: entity
+  parent: N14FloraLogBase
+  id: N14FloraLog1
+  suffix: seat
+  name: log
+  description: Once a tree, always a log.
+  components:
+  - type: Strap
+    position: Stand
+    buckleOffset: "0,-0.05"
 
 - type: entity
-  parent: N14FloraLog1
-  id: N14FloraTimber
+  parent: N14FloraLogBase
+  id: N14FloraLogTimber
+  name: timber
+  suffix: item
   components:
   - type: Sprite
-    sprite: Nuclear14/Structures/Decoration/flora.rsi
     state: tree_timber
-  - type: SoundOnGather
   - type: Gatherable
     whitelist:
       tags:
@@ -105,13 +121,19 @@
           MaterialWoodPlank1:
             min: 1
             max: 1
+  - type: Stack
+    stackType: N14Timber
+    count: 1
+  - type: Material
+  - type: Item
+    size: Huge
 
 - type: entity
-  parent: N14FloraLog1
+  parent: N14FloraLogBase
   id: N14FloraLog3
+  suffix: stash
   components:
   - type: Sprite
-    sprite: Nuclear14/Structures/Decoration/flora.rsi
     state: timber
   - type: PottedPlantHide
   - type: SecretStash

Resources/Prototypes/Nuclear14/Entities/Objects/Materials/materials.yml

@@ -129,3 +129,53 @@
   components:
   - type: Stack
     count: 1
+
+- type: entity
+  parent: BaseItem
+  id: N14Dung
+  name: dung pile
+  description: flip those cowpats for free fertilizer!
+  components:
+  - type: Sprite
+    sprite: /Textures/Nuclear14/Objects/Misc/crafting_material.rsi
+    noRot: true
+    layers:
+      - state: dung
+      - state: dung-flies
+  - type: Perishable
+    rotAfter: 240
+    # don't want it giving off ammonia only bodies
+    molsPerSecondPerUnitMass: 0
+  - type: RotInto
+    entity: N14CompostRotted
+    stage: 1
+# N14:TODO: Add creampie ing but worse and it makes you throw up.
+
+- type: entity
+  parent: BaseItem
+  id: N14CompostRotted
+  name: compost
+  description: Rotting remains, like a compost. Good for fertilizing.
+  components:
+  - type: Sprite
+    sprite: /Textures/Nuclear14/Objects/Misc/crafting_material.rsi
+    state: compost
+  - type: SolutionContainerManager
+    solutions:
+      dung:
+        maxVol: 25
+        reagents:
+        - ReagentId: Fertilizer
+          Quantity: 25
+  - type: DrainableSolution
+    solution: dung
+  - type: SolutionTransfer
+    canChangeTransferAmount: false
+  - type: DeleteOnSolutionEmpty
+    solution: dung
+  - type: TimedDespawn
+    lifetime: 120 # Absorbs into the ground if you're not quick
+  - type: Material
+  - type: Stack
+    stackType: Compost
+    count: 1

Resources/Prototypes/Nuclear14/Entities/Structures/Decoration/bonfire.yml

@@ -0,0 +1,7 @@
+- type: entity
+  parent: Bonfire
+  id: N14Bonfire
+  components:
+  - type: Construction
+    graph: N14Bonfire
+    node: bonfire

Resources/Prototypes/Nuclear14/Entities/Structures/Misc/wells.yml

@@ -67,6 +67,12 @@
   - type: DrainableSolution
     solution: well
   - type: ReagentTank
+  - type: SolutionRegeneration
+    solution: well
+    generated:
+      reagents:
+      - ReagentId: Water
+        Quantity: 1
 
 - type: entity
   parent: N14WellWaterClean
@@ -79,6 +85,12 @@
         reagents:
         - ReagentId: WaterDirty
           Quantity: 500
+  - type: SolutionRegeneration
+    solution: well
+    generated:
+      reagents:
+      - ReagentId: WaterDirty
+        Quantity: 1
 
 - type: entity
   parent: N14WellWaterClean
@@ -91,3 +103,9 @@
         reagents:
         - ReagentId: WaterIrradiated
           Quantity: 500
+  - type: SolutionRegeneration
+    solution: well
+    generated:
+      reagents:
+      - ReagentId: WaterIrradiated
+        Quantity: 1

Resources/Prototypes/Nuclear14/Entities/Structures/Walls/fences.yml

@@ -54,5 +54,5 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: IconSmooth
-    key: walls
+    key: fence
     base: fence

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

@@ -20,7 +20,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: IconSmooth
-    key: walls
+    key: wallsstore
     base: store
 
 - type: entity
@@ -44,7 +44,7 @@
   - type: Icon
     sprite: Nuclear14/Structures/Walls/ruins.rsi
   - type: IconSmooth
-    key: walls
+    key: wallsruins
     base: ruin
 
 - type: entity
@@ -57,7 +57,7 @@
   - type: Icon
     sprite: Nuclear14/Structures/Walls/brick.rsi
   - type: IconSmooth
-    key: walls
+    key: wallsbrick
     base: brick
 
 - type: entity
@@ -105,7 +105,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: IconSmooth
-    key: walls
+    key: wallsenclave
     base: enclave
 
 # Wood walls
@@ -151,7 +151,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: IconSmooth
-    key: walls
+    key: wallswood
     base: wood
 
 - type: entity
@@ -223,11 +223,11 @@
   description: A wall made out of wooden logs.
   components:
   - type: Sprite
-    sprite: Nuclear14/Structures/Walls/woodlog.rsi
+    sprite: Nuclear14/Structures/Walls/woodlognew.rsi
   - type: Icon
-    sprite: Nuclear14/Structures/Walls/woodlog.rsi
+    sprite: Nuclear14/Structures/Walls/woodlognew.rsi
   - type: IconSmooth
-    key: walls
+    key: log
     base: log
   - type: Construction
     graph: N14WoodWall
@@ -259,5 +259,5 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: IconSmooth
-    key: walls
+    key: tent
     base: tent

Resources/Prototypes/Nuclear14/Entities/Structures/planter.yml

@@ -56,9 +56,9 @@
         solution: soil
   - type: Appearance
   - type: PlantHolderVisuals
-  # - type: Construction
-    # graph: N14Soil
-    # node: Soil
+  - type: Construction
+    graph: N14Soil
+    node: Soil
 
 
 - type: entity
@@ -94,9 +94,9 @@
             max: 1
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  # - type: Construction
-    # graph: N14Planter
-    # node: box
+  - type: Construction
+    graph: N14Planter
+    node: box
 
 
 - type: entity
@@ -172,6 +172,6 @@
             max: 1
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  # - type: Construction
-    # graph: N14Planter
-    # node: Planter
+  - type: Construction
+    graph: N14Planter
+    node: Planter

Resources/Prototypes/Nuclear14/Entities/stations.yml

@@ -0,0 +1,13 @@
+- type: entity
+  id: FalloutStation
+  parent:
+    - BaseStation
+    - BaseStationNews
+    - BaseStationCargo
+    - BaseStationJobsSpawning
+    # - BaseStationEvacuation
+    # - BaseStationExpeditions
+    # - BaseStationAllEventsEligible
+  noSpawn: true
+  components:
+    - type: Transform