Standardizes / nerfs material sheets to 10u, no more lead in steel sheets (#22569)

* standardizes / nerfs material sheets to 10u, no more lead in steel sheets, also radium in uranium i guess

* plastic into oil

* adds phosphurous to plastic too

* OIL

* fix tests now? maybe? emo you better not be LYING... or else...

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index b5d98cf7aba6ffbd90b90300fa058653b45c0b4a..6d622ff97cb7b62eca838360c416c39e6af313ac 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -81,7 +81,7 @@
       glass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 22
+          Quantity: 10
 
 - type: entity
   parent: SheetGlass
@@ -187,11 +187,11 @@
       rglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 22
+          Quantity: 10
         - ReagentId: Iron
-          Quantity: 11
+          Quantity: 4.5
         - ReagentId: Carbon
-          Quantity: 1
+          Quantity: 0.5
 
 - type: entity
   parent: SheetGlassBase
@@ -263,7 +263,7 @@
       pglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 22
+          Quantity: 10
         - ReagentId: Plasma
           Quantity: 10
 
@@ -301,13 +301,13 @@
       rpglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 22
+          Quantity: 10
         - ReagentId: Plasma
           Quantity: 10
         - ReagentId: Iron
-          Quantity: 11
+          Quantity: 4.5
         - ReagentId: Carbon
-          Quantity: 1
+          Quantity: 0.5
 
 - type: entity
   parent: SheetRPGlass
@@ -379,7 +379,7 @@
       uglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 22
+          Quantity: 10
         - ReagentId: Uranium
           Quantity: 10
 
@@ -428,13 +428,13 @@
       ruglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 22
+          Quantity: 10
         - ReagentId: Uranium
           Quantity: 10
         - ReagentId: Iron
-          Quantity: 11
+          Quantity: 4.5
         - ReagentId: Carbon
-          Quantity: 1
+          Quantity: 0.5
 - type: entity
   parent: SheetRUGlass
   id: SheetRUGlass1

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 9e5d735587ae2756316178581552a58a62212796..829a78326a8d6707912381570659bb2273f9c398 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -63,11 +63,9 @@
       steel:
         reagents:
         - ReagentId: Iron
-          Quantity: 22
+          Quantity: 9
         - ReagentId: Carbon
-          Quantity: 2.5
-        - ReagentId: Lead
-          Quantity: 0.5
+          Quantity: 1
 
 - type: entity
   parent: SheetSteel
@@ -136,11 +134,9 @@
         - ReagentId: Plasma
           Quantity: 10
         - ReagentId: Iron
-          Quantity: 22
+          Quantity: 9
         - ReagentId: Carbon
-          Quantity: 2.5
-        - ReagentId: Lead
-          Quantity: 0.5
+          Quantity: 1
 
 - type: entity
   parent: SheetPlasteel

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index b55840d9fcfecdd40e983811813286daed902bcc..29bef20b7cf986f47bf64dd609c0da5474abfe06 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -154,8 +154,11 @@
     solutions:
       plastic:
         reagents:
-        - ReagentId: Carbon
-          Quantity: 22
+        - ReagentId: Oil
+          Quantity: 5
+        - ReagentId: Phosphorus
+          Quantity: 5
+
 - type: entity
   parent: SheetPlastic
   id: SheetPlastic10
@@ -213,7 +216,9 @@
       food:
         reagents:
         - ReagentId: Uranium
-          Quantity: 10
+          Quantity: 8
+        - ReagentId: Radium
+          Quantity: 2
 
 - type: entity
   parent: SheetUranium
@@ -260,7 +265,7 @@
         meatsheet:
           reagents:
           - ReagentId: Protein
-            Quantity: 22 #for consistency with other materials
+            Quantity: 7
           - ReagentId: Fat
             Quantity: 3
 

diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
index 2892dc4a28aae258092f6d755c806d64a87ee5cf..15159ba69de4fe73bd05cf90959aaabe47f296b1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -68,9 +68,9 @@
       rod:
         reagents:
         - ReagentId: Iron
-          Quantity: 11
-        - ReagentId: Carbon #Not 1.25 (half of 2.5) because that would probably be really weird
-          Quantity: 1
+          Quantity: 4.5
+        - ReagentId: Carbon
+          Quantity: 0.5
 
 - type: entity
   parent: PartRodMetal

diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index f2d2b3a63b628a096cf81bb064145a4829050c15..cdccac8c60e4927541181668e9a36db0ada7a37d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -107,7 +107,7 @@
       shardglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 11 #Half of the value of regular glass. TECHNICALLY, welding a single shard of glass gives you the full thing back with just 1 sheet, but that is stupid so I am making it half.
+          Quantity: 5 #Half of the value of regular glass. TECHNICALLY, welding a single shard of glass gives you the full thing back with just 1 sheet, but that is stupid so I am making it half.
 
 - type: entity
   parent: ShardBase
@@ -136,7 +136,7 @@
       shardrglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 11 #I don't care enough to divide all of the reinforced glass materials by 2 because reinforced glass shards are due for removal anyways.
+          Quantity: 5 #I don't care enough to divide all of the reinforced glass materials by 2 because reinforced glass shards are due for removal anyways.
 
 - type: entity
   parent: ShardBase
@@ -165,7 +165,7 @@
       shardpglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 11
+          Quantity: 5
         - ReagentId: Plasma
           Quantity: 5
 
@@ -197,6 +197,6 @@
       sharduglass:
         reagents:
         - ReagentId: Silicon
-          Quantity: 11
+          Quantity: 5
         - ReagentId: Uranium
           Quantity: 5