From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Date: Mon, 18 Dec 2023 19:38:11 +0000 (-0600)
Subject: Adds coal (#22559)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=27308915f101d8d848552988373fd48ed1ab3511;p=space-station-14.git

Adds coal (#22559)

* Adds coal

* Fix stack splitting spawn

* Convert size

* Ahhh, it's a reagent tooo....

* ore.rsi

* Adjust recipes, add reagent extraction

* solution name

* Adjust reagents to prevent reactions

* Adjust reagents for standard of 10u

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
---

diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index d515479a0e..a25cf2da14 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -24,6 +24,7 @@ materials-bananium = bananium
 materials-meat = meat
 materials-web = silk
 materials-bones = bone
+materials-coal = coal
 
 # Material Reclaimer
 material-reclaimer-upgrade-process-rate = process rate
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index e7dfdc234f..eb5b5d14d5 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -330,6 +330,8 @@
         orGroup: GiftPool
       - id: Ash
         orGroup: GiftPool
+      - id: Coal1
+        orGroup: GiftPool
       - id: MiningDrill
         orGroup: GiftPool
       - id: CowToolboxFilled
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 2b6fec873b..aa3ebfaaf2 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -195,3 +195,42 @@
   components:
   - type: Stack
     count: 1
+
+- type: entity
+  parent: OreBase
+  id: Coal
+  name: coal
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: Coal
+  - type: Sprite
+    state: coal
+  - type: Material
+  - type: Extractable
+    grindableSolutionName: coal
+  - type: SolutionContainerManager
+    solutions:
+      coal:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 8.4
+        - ReagentId: Ammonia
+          Quantity: 0.8
+        - ReagentId: Hydrogen
+          Quantity: 0.5
+        - ReagentId: Sulfur
+          Quantity: 0.2
+        - ReagentId: Mercury
+          Quantity: 0.1
+  - type: PhysicalComposition
+    materialComposition:
+      Coal: 500
+
+- type: entity
+  parent: Coal
+  id: Coal1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index a8fc1744b3..7d7d3ae905 100644
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -107,3 +107,11 @@
   icon: { sprite: Objects/Materials/materials.rsi, state: bones }
   color: "#896f5e"
   price: 0
+
+- type: material
+  id: Coal
+  name: materials-coal
+  unit: materials-unit-piece
+  icon: { sprite: Objects/Materials/ore.rsi, state: coal }
+  color: "#404040"
+  price: 0
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index f724b96bc0..cb31c55dda 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -12,6 +12,7 @@
   completetime: 2
   materials:
     Steel: 3000
+    Coal: 1000
 
 - type: latheRecipe
   id: SheetGlass1
@@ -75,14 +76,14 @@
   completetime: 2
   materials:
     Uranium: 3000
-  
+
 - type: latheRecipe
   id: IngotGold30
   result: IngotGold
   completetime: 2
   materials:
     Gold: 3000
-  
+
 - type: latheRecipe
   id: IngotSilver30
   result: IngotSilver
@@ -96,7 +97,7 @@
   completetime: 2
   materials:
     Bananium: 3000
-    
+
 - type: latheRecipe
   id: SheetUranium1
   result: SheetUranium1
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index 268c6b9a46..087786ded8 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -54,3 +54,11 @@
   spawn: BananiumOre1
   maxCount: 30
   itemSize: 2
+
+- type: stack
+  id: Coal
+  name: coal
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: coal }
+  spawn: Coal1
+  maxCount: 30
+  itemSize: 2
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index f8861af834..c4c81e99cb 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -14,6 +14,10 @@
   id: OreSpaceQuartz
   oreEntity: SpaceQuartz1
 
+- type: ore
+  id: OreCoal
+  oreEntity: Coal1
+
 # Medium yields
 - type: ore
   id: OreGold
@@ -62,6 +66,7 @@
   id: RandomOreDistributionStandard
   weights:
     OreSteel: 10
+    OreCoal: 10
     OreSpaceQuartz: 8
     OreGold: 2
     OrePlasma: 4