From 3ee4c5f791e0c4cd9e2c7af4567f641b6f87ccd6 Mon Sep 17 00:00:00 2001 From: Tarlan2 <76408146+Tarlan2@users.noreply.github.com> Date: Tue, 23 Feb 2021 04:30:50 +0200 Subject: [PATCH] Auto lathe branch (#3284) * My first contribution in a while.Change AddAccent command to be case insensitive (#3112) * got rid of the bottle of nothingness. thought it was an empty bottle. * new correction * Delete SpaceStation14.sln I honestly don't know what happened here. I didn't code those lines. * Revert "Delete SpaceStation14.sln" This reverts commit 68876841dce9c6e2ce9d21996e4caef3512b1385. * new attempt at fixing * Revert "new attempt at fixing" This reverts commit 780f66fda3d66b6d4d086871d0b2ea2f6d4ee004. * Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)" This reverts commit 08041a30365331b82309aedaf2136d7631459887. * Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"" This reverts commit b2dc76a6683e8df88188d37a836f9ab9a54287b5. * Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""" This reverts commit 478d2bfe5daf6098d2f5665249ce0f161704dd73. * Revert "Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"""" This reverts commit 23c195143e1e3d05cb5f344329c01754432684a9. * Revert "Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"""" This reverts commit 23c195143e1e3d05cb5f344329c01754432684a9. * still having figured what happened with the sln file * please work * -Added wood as a material. -Made a few changes in the material requirements for some of the recipes. * ok. added a small correction for wood at material_stacks.yml * ok added another correction for misc.yml because for some reason a : just disappeared. * -added plastic as a material, complete with a png (credits: tgstation) -replaced glass with plastic for material requirements for some of the latherecipes * for some reason the shovel was duplicate, being in both botany.yml and in tools.yml. deleted it from tools * ok. one last try. noticed that the sprite path for shovel was weird even though it already has its own sprite at Objects/Tools/shovel.rsi . so I decided to fix the path then move the shovel back to tools.yml while deleting it from botany.yml. maybe that was the problem? * corrected the extra space on the type: material for plastic discovered by Peptide90. * noticed that wood also had a bad icon path. * another attempt * weird. I don't remember messing with the flashlight requirements. * added plastic in the SharedStakedComponent and the meta.json from materials.rsi is back to how it was * hopefully this icon is valid. * small corrections concerning double space. Co-authored-by: DrSmugleaf --- .../Components/SharedStackComponent.cs | 1 + .../Catalog/LatheRecipes/botany.yml | 7 +-- .../Catalog/LatheRecipes/janitorial.yml | 12 ++--- .../Catalog/LatheRecipes/medical.yml | 11 ++--- .../Prototypes/Catalog/LatheRecipes/misc.yml | 9 ++-- .../Catalog/LatheRecipes/security.yml | 5 +- .../Prototypes/Catalog/LatheRecipes/tools.yml | 37 +++++++-------- .../Entities/Objects/Misc/material_stacks.yml | 44 ++++++++++++++++-- Resources/Prototypes/Reagents/materials.yml | 20 +++++++- .../Objects/Materials/materials.rsi/meta.json | 3 ++ .../Objects/Materials/sheets.rsi/plastic.png | Bin 0 -> 256 bytes 11 files changed, 98 insertions(+), 51 deletions(-) create mode 100644 Resources/Textures/Objects/Materials/sheets.rsi/plastic.png diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index b33534b18a..56ec14217c 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -125,6 +125,7 @@ namespace Content.Shared.GameObjects.Components Plasteel, Cable, Wood, + Plastic, MVCable, HVCable, Gold, diff --git a/Resources/Prototypes/Catalog/LatheRecipes/botany.yml b/Resources/Prototypes/Catalog/LatheRecipes/botany.yml index 4cd6a0979f..2712871704 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/botany.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/botany.yml @@ -7,7 +7,6 @@ completetime: 500 materials: steel: 30 - glass: 10 - type: latheRecipe id: Scythe @@ -18,7 +17,7 @@ completetime: 500 materials: steel: 40 - glass: 30 + wood: 30 - type: latheRecipe id: Hatchet @@ -29,7 +28,6 @@ completetime: 500 materials: steel: 60 - glass: 10 - type: latheRecipe id: Spade @@ -39,5 +37,4 @@ result: Spade completetime: 500 materials: - steel: 30 - glass: 10 + steel: 40 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/janitorial.yml b/Resources/Prototypes/Catalog/LatheRecipes/janitorial.yml index 2192205135..cbb99d862e 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/janitorial.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/janitorial.yml @@ -4,8 +4,8 @@ result: MopItem completetime: 500 materials: - steel: 10 - glass: 40 + plastic: 10 + wood: 40 - type: latheRecipe id: MopBucket @@ -14,7 +14,7 @@ completetime: 500 materials: steel: 20 - glass: 60 + plastic: 60 - type: latheRecipe id: Bucket @@ -30,7 +30,7 @@ result: WetFloorSign completetime: 500 materials: - glass: 60 + plastic: 60 - type: latheRecipe id: SprayBottle @@ -38,7 +38,7 @@ result: SprayBottle completetime: 500 materials: - glass: 50 + plastic: 50 - type: latheRecipe id: TrashBag @@ -46,4 +46,4 @@ result: TrashBag completetime: 300 materials: - glass: 15 + plastic: 15 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/medical.yml b/Resources/Prototypes/Catalog/LatheRecipes/medical.yml index f60ac0b5f5..c983e5ba94 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/medical.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/medical.yml @@ -22,7 +22,7 @@ result: Gauze completetime: 500 materials: - glass: 40 + plastic: 40 - type: latheRecipe id: Scalpel @@ -47,7 +47,6 @@ completetime: 500 materials: steel: 80 - glass: 20 - type: latheRecipe id: Drill @@ -55,8 +54,7 @@ result: Drill completetime: 500 materials: - steel: 70 - glass: 30 + steel: 90 - type: latheRecipe id: BoneSaw @@ -64,8 +62,7 @@ result: BoneSaw completetime: 500 materials: - steel: 80 - glass: 20 + steel: 90 - type: latheRecipe id: Hemostat @@ -81,4 +78,4 @@ result: BodyBag_Item completetime: 300 materials: - glass: 20 + plastic: 20 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/misc.yml b/Resources/Prototypes/Catalog/LatheRecipes/misc.yml index d58d31231f..2f09a10ac2 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/misc.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/misc.yml @@ -31,7 +31,7 @@ result: GlowStickRed completetime: 500 materials: - glass: 20 + plastic: 20 - type: latheRecipe id: FlareBase @@ -39,7 +39,7 @@ result: FlareBase completetime: 500 materials: - glass: 40 + plastic: 40 - type: latheRecipe id: FlashLightLantern @@ -48,7 +48,7 @@ completetime: 500 materials: steel: 50 - glass: 60 + glass: 40 - type: latheRecipe id: FireExtinguisher @@ -57,7 +57,6 @@ completetime: 500 materials: steel: 80 - glass: 30 - type: latheRecipe id: Matchbox @@ -65,4 +64,4 @@ result: Matchbox completetime: 10 materials: - glass: 10 + wood: 10 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/security.yml b/Resources/Prototypes/Catalog/LatheRecipes/security.yml index 512accfb85..2f31dd1bd6 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/security.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/security.yml @@ -13,7 +13,7 @@ completetime: 500 materials: steel: 70 - glass: 30 + plastic: 30 - type: latheRecipe id: Flash @@ -21,4 +21,5 @@ result: Flash completetime: 500 materials: - glass: 60 + glass: 30 + plastic: 30 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/tools.yml b/Resources/Prototypes/Catalog/LatheRecipes/tools.yml index 0bb6483cf0..dce6ba041f 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/tools.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/tools.yml @@ -24,8 +24,7 @@ result: Welder completetime: 500 materials: - steel: 70 - glass: 30 + steel: 90 - type: latheRecipe id: Wrench @@ -34,7 +33,6 @@ completetime: 500 materials: steel: 70 - glass: 30 - type: latheRecipe id: CableStack @@ -44,7 +42,7 @@ completetime: 500 materials: steel: 50 - glass: 50 + plastic: 50 - type: latheRecipe id: Crowbar @@ -62,6 +60,17 @@ materials: steel: 80 +- type: latheRecipe + id: Shovel + icon: + sprite: Objects/Tools/shovel.rsi + state: icon + result: Shovel + completetime: 500 + materials: + steel: 50 + wood: 30 + - type: latheRecipe id: Multitool icon: @@ -71,7 +80,7 @@ completetime: 500 materials: steel: 50 - glass: 20 + plastic: 20 - type: latheRecipe id: PowerDrill @@ -81,8 +90,7 @@ result: PowerDrill completetime: 500 materials: - steel: 80 - glass: 20 + steel: 90 - type: latheRecipe id: RCD @@ -93,7 +101,7 @@ completetime: 1000 materials: steel: 250 - glass: 100 + plastic: 100 - type: latheRecipe id: RCDAmmo @@ -104,15 +112,4 @@ completetime: 600 materials: steel: 90 - glass: 80 - -- type: latheRecipe - id: Shovel - icon: - sprite: Objects/Tools/Hydroponics/hatchet.rsi - state: icon - result: Shovel - completetime: 500 - materials: - steel: 60 - glass: 10 + plastic: 80 diff --git a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml b/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml index 68dd39ce8b..04533f5d0e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: material stack id: MaterialStack abstract: true @@ -207,12 +207,18 @@ parent: MaterialStack suffix: Full components: - # TODO: Specify a material. + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: wood + - type: Stack + stacktype: enum.StackType.Wood - type: Sprite sprite: Objects/Materials/materials.rsi - state: wood_plank - - type: Stack - stacktype: enum.StackType.Wood + state: wood + - type: Item + sprite: Objects/Materials/materials.rsi + HeldPrefix: wood - type: entity id: WoodPlank1 @@ -222,3 +228,31 @@ components: - type: Stack count: 1 + +- type: entity + name: plastic sheet + id: PlasticSheet + parent: MaterialStack + suffix: Full + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plastic + - type: Stack + stacktype: enum.StackType.Plastic + - type: Sprite + sprite: Objects/Materials/sheets.rsi/plastic.png + state: plastic + - type: Item + sprite: Objects/Materials/sheets.rsi/plastic.png + HeldPrefix: plastic + +- type: entity + id: PlasticSheet1 + name: plastic sheet + parent: PlasticSheet + suffix: 1 + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Reagents/materials.yml b/Resources/Prototypes/Reagents/materials.yml index b78a44f430..4787489a8e 100644 --- a/Resources/Prototypes/Reagents/materials.yml +++ b/Resources/Prototypes/Reagents/materials.yml @@ -1,4 +1,4 @@ -- type: material +- type: material id: steel name: steel color: gray @@ -54,3 +54,21 @@ electricResistivity: 6.9e-7 thermalConductivity: 18 specificHeat: 200 + +- type: material + id: wood + name: wood + icon: Objects/Materials/wood_plank.png + density: 6000 + electricResistivity: 1.0e+13 + thermalConductivity: 1.5 + specificHeat: 600 + +- type: material + id: plastic + name: plastic + icon: Objects/Materials/sheets.rsi/plastic.png + density: 6500 + electricResistivity: 1.0e+13 + thermalConductivity: 1.5 + specificHeat: 600 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index b4f8812367..d82b6ade16 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json @@ -75,6 +75,9 @@ }, { "name": "rods" + }, + { + "name": "plastic" } ] } diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plastic.png b/Resources/Textures/Objects/Materials/sheets.rsi/plastic.png new file mode 100644 index 0000000000000000000000000000000000000000..87153bca4420af97007179a3cc8bb3af59f73baf GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK^0#}sIEF;D zzMW>scUXbPwSKjiM^8*oa)F)Rvx`E(yOs!g%}%n;jQn%#$?5;MH7pt)`#e(m{99dV#^y)z4*}Q$iB} D(IRP9 literal 0 HcmV?d00001