From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Fri, 15 Dec 2023 20:37:07 +0000 (-0600) Subject: Makes MORE raw materials grindable (#22550) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=90bcbc160b91a4be26a199d69df19fdc020f5329;p=space-station-14.git Makes MORE raw materials grindable (#22550) * makes MORE raw materials grindable (and adds cellulose fibers) * meat sheets + cable coil + idk + dode * uhhh uhhh um * i have a disease and its called DODE --- diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl index bcf3502c6b..2efb3eba4c 100644 --- a/Resources/Locale/en-US/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/reagents/meta/biological.ftl @@ -17,4 +17,4 @@ reagent-name-fat = fat reagent-desc-fat = No matter how it was obtained, its application is important. reagent-name-vomit = vomit -reagent-desc-vomit = You can see a few chunks of someones last meal in it. +reagent-desc-vomit = You can see a few chunks of someone's last meal in it. \ No newline at end of file diff --git a/Resources/Locale/en-US/reagents/meta/chemicals.ftl b/Resources/Locale/en-US/reagents/meta/chemicals.ftl index 94851adc0d..827d0fd6d5 100644 --- a/Resources/Locale/en-US/reagents/meta/chemicals.ftl +++ b/Resources/Locale/en-US/reagents/meta/chemicals.ftl @@ -12,3 +12,6 @@ reagent-desc-artifexium = A lavender mixture of microscopic artifact fragments a reagent-name-sodium-polyacrylate = Sodium Polyacrylate reagent-desc-sodium-polyacrylate = A super-absorbent polymer with assorted industrial uses. + +reagent-name-cellulose = cellulose fibers +reagent-desc-cellulose = A crystaline polydextrose polymer, plants swear by this stuff. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index cf347bee86..b55840d9fc 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -49,17 +49,14 @@ - type: Item heldPrefix: paper - type: Appearance + - type: Extractable + grindableSolutionName: paper - type: SolutionContainerManager -#This should maybe be cellulose later on, refer to the comments in materials.yml on wood. solutions: - wood: + paper: reagents: - - ReagentId: Carbon - Quantity: 2 - - ReagentId: Oxygen - Quantity: 0.5 - - ReagentId: Hydrogen - Quantity: 0.5 + - ReagentId: Cellulose + Quantity: 3 - type: entity @@ -151,7 +148,14 @@ - type: Item heldPrefix: plastic - type: Appearance - + - type: Extractable + grindableSolutionName: plastic + - type: SolutionContainerManager + solutions: + plastic: + reagents: + - ReagentId: Carbon + Quantity: 22 - type: entity parent: SheetPlastic id: SheetPlastic10 @@ -249,7 +253,16 @@ - type: Item sprite: Objects/Materials/Sheets/meaterial.rsi heldPrefix: meat - - type: Appearance + - type: Extractable + grindableSolutionName: meatsheet + - type: SolutionContainerManager + solutions: + meatsheet: + reagents: + - ReagentId: Protein + Quantity: 22 #for consistency with other materials + - ReagentId: Fat + Quantity: 3 - type: entity parent: MaterialSheetMeat diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 2f3a142a6e..9cfc2c00f2 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -47,6 +47,14 @@ - state: cardboard_3 map: ["base"] - type: Appearance + - type: Extractable + grindableSolutionName: cardboard + - type: SolutionContainerManager + solutions: + cardboard: + reagents: + - ReagentId: Cellulose + Quantity: 6 - type: entity parent: MaterialCardboard @@ -238,17 +246,11 @@ - type: Extractable grindableSolutionName: wood - type: SolutionContainerManager -#Apparently these all components of cellulose, which is what you got in /tg/ when grinding wood + a bunch of other shit. -#Considering the frequency of it, maybe there should be a cellulose reagent instead? solutions: wood: reagents: - - ReagentId: Carbon + - ReagentId: Cellulose Quantity: 10 - - ReagentId: Oxygen - Quantity: 5 - - ReagentId: Hydrogen - Quantity: 5 - type: entity parent: MaterialWoodPlank diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index f1f300bc9c..e1e565cc18 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -61,7 +61,7 @@ - ReagentId: Iron Quantity: 3 - ReagentId: Copper - Quantity: 3 + Quantity: 2 - ReagentId: Carbon #steel-reinforced Quantity: 1 @@ -128,7 +128,7 @@ - ReagentId: Iron Quantity: 3 - ReagentId: Copper - Quantity: 3 + Quantity: 2 - type: entity parent: CableMVStack @@ -192,7 +192,7 @@ - ReagentId: Iron Quantity: 3 - ReagentId: Copper - Quantity: 3 + Quantity: 2 - type: entity parent: CableApcStack diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml index 794d287435..01cffa3e99 100644 --- a/Resources/Prototypes/Reagents/chemicals.yml +++ b/Resources/Prototypes/Reagents/chemicals.yml @@ -98,3 +98,13 @@ type: Local messages: [ "generic-reagent-effect-parched" ] probability: 0.1 + +- type: reagent + id: Cellulose + name: reagent-name-cellulose + group: Biological + desc: reagent-desc-cellulose + flavor: bitter + color: "#E6E6DA" + physicalDesc: reagent-physical-desc-crystalline + slippery: false