From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 4 May 2025 02:39:19 +0000 (-0400) Subject: Revert "add material composition to some salv treasure" (#37149) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f1a17f360dfd5640a5b57280e26432006a18affb;p=space-station-14.git Revert "add material composition to some salv treasure" (#37149) * Revert "add material composition to some salv treasure (#31970)" This reverts commit 125258ea4803c882b5f59895e2d9ac2e8b1dfd5a. * Remove ring materials as well --- diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index bb494ffda4..1d8d38da79 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -69,11 +69,8 @@ abstract: true id: GoldRingBase components: - - type: PhysicalComposition - materialComposition: - Gold: 200 # 2 bars - - type: StaticPrice - price: 300 + - type: StaticPrice + price: 300 - type: entity abstract: true @@ -81,8 +78,5 @@ name: silver ring description: Looks slightly less valuable than a gold one. components: - - type: PhysicalComposition - materialComposition: - Silver: 200 # 2 bars - - type: StaticPrice - price: 275 + - type: StaticPrice + price: 275 diff --git a/Resources/Prototypes/Entities/Objects/Misc/treasure.yml b/Resources/Prototypes/Entities/Objects/Misc/treasure.yml index dfe33ab111..20e72f8a11 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/treasure.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/treasure.yml @@ -83,11 +83,6 @@ - state: cpu_super - type: Item size: Tiny - - type: PhysicalComposition - materialComposition: # big mats if you don't sell it - Steel: 500 - Glass: 1000 - Silver: 300 - type: StaticPrice price: 750 @@ -155,9 +150,6 @@ state: coin_iron - type: Item size: Tiny - - type: PhysicalComposition - materialComposition: - Steel: 300 - type: StaticPrice price: 75 @@ -167,12 +159,8 @@ components: - type: Sprite state: coin_silver - - type: PhysicalComposition - materialComposition: - Steel: 100 # coins are fake on the inside - Silver: 200 - type: StaticPrice - price: 135 + price: 125 - type: entity parent: TreasureCoinIron @@ -180,10 +168,6 @@ components: - type: Sprite state: coin_gold - - type: PhysicalComposition - materialComposition: - Steel: 100 - Gold: 200 - type: StaticPrice price: 175 @@ -193,10 +177,6 @@ components: - type: Sprite state: coin_adamantine - - type: PhysicalComposition - materialComposition: - Steel: 400 - Diamond: 5 - type: StaticPrice price: 250 @@ -206,10 +186,6 @@ components: - type: Sprite state: coin_diamond - - type: PhysicalComposition - materialComposition: - Steel: 300 - Diamond: 15 - type: StaticPrice price: 500