From 2ed0dced3eb64b2a294b91d9b08e52a26cd0e903 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 16 Dec 2023 14:52:11 -0600 Subject: [PATCH] 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... --- .../Objects/Materials/Sheets/glass.yml | 25 ++++++++++--------- .../Objects/Materials/Sheets/metal.yml | 12 +++------ .../Objects/Materials/Sheets/other.yml | 13 +++++++--- .../Entities/Objects/Materials/parts.yml | 6 ++--- .../Entities/Objects/Materials/shards.yml | 8 +++--- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index 4b829d1cf82..0cdeae4e6d0 100644 --- 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 @@ -195,11 +195,12 @@ 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 id: SheetPGlass @@ -273,7 +274,7 @@ pglass: reagents: - ReagentId: Silicon - Quantity: 22 + Quantity: 10 - ReagentId: Plasma Quantity: 10 @@ -311,13 +312,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 @@ -391,7 +392,7 @@ uglass: reagents: - ReagentId: Silicon - Quantity: 22 + Quantity: 10 - ReagentId: Uranium Quantity: 10 @@ -442,13 +443,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 c7f8337b70c..8559b77e3a1 100644 --- 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 @@ -142,11 +140,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 59cc6647935..21c7c505a59 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -159,8 +159,11 @@ solutions: plastic: reagents: - - ReagentId: Carbon - Quantity: 22 + - ReagentId: Oil + Quantity: 5 + - ReagentId: Phosphorus + Quantity: 5 + - type: entity parent: SheetPlastic id: SheetPlastic10 @@ -222,7 +225,9 @@ food: reagents: - ReagentId: Uranium - Quantity: 10 + Quantity: 8 + - ReagentId: Radium + Quantity: 2 - type: entity parent: SheetUranium @@ -271,7 +276,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 f243eab8da0..5792fec1d9e 100644 --- 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 b5ab173ce54..1d92d4f4cb0 100644 --- 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