From 644dd23a1e12b4ad0636ea6f085e8666ca0e8673 Mon Sep 17 00:00:00 2001 From: AJCM Date: Fri, 8 Jan 2021 11:14:58 -0400 Subject: [PATCH 1/3] Fixes console errors --- Content.Client/IgnoredComponents.cs | 3 ++- .../Catalog/Research/technologies.yml | 20 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs index 616a90eb8a..d9a2babe36 100644 --- a/Content.Client/IgnoredComponents.cs +++ b/Content.Client/IgnoredComponents.cs @@ -231,7 +231,8 @@ namespace Content.Client "GlassBeaker", "SliceableFood", "DamageOtherOnHit", - "DamageOnLand" + "DamageOnLand", + "Recyclable" }; } } diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 6e9800d817..79713742bd 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -25,7 +25,7 @@ name: "advanced botany" id: AdvancedBotany description: A better understanding of botany. - icon: Objects/Specific/Hydroponics/potato.rsi + icon: Objects/Specific/Hydroponics/potato.rsi/seed.png requiredPoints: 1500 requiredTechnologies: - BiologicalTechnology @@ -34,7 +34,7 @@ name: "advanced surgery" id: AdvancedSugery description: Research new surgical procedures. - icon: Objects/Specific/Medical/surgery_tools.rsi + icon: Objects/Specific/Medical/surgery_tools.rsi/bone_saw.png requiredPoints: 1500 requiredTechnologies: - BiologicalTechnology @@ -45,7 +45,7 @@ name: "chemistry technology" id: ChemistryTechnology description: A crash course in chemistry. - icon: Objects/Specific/Chemistry/beakers.rsi + icon: Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png requiredPoints: 1000 requiredTechnologies: - BasicResearch @@ -56,7 +56,7 @@ name: "security technology" id: SecurityTechnology description: Beginning of the long hard road to exosuits. - icon: Objects/Weapons/Melee/stunbaton.rsi + icon: Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png requiredPoints: 1000 requiredTechnologies: - BasicResearch @@ -65,7 +65,7 @@ name: "ballistic technology" id: BallisticTechnology description: Just a fancy term for guns. - icon: Objects/Weapons/Guns/Pistols/clarissa.rsi + icon: Objects/Weapons/Guns/Pistols/clarissa.rsi/icon.png requiredPoints: 1500 requiredTechnologies: - SecurityTechnology @@ -74,7 +74,7 @@ name: "direct energy technology" id: DirectEnergyTechnology description: Basically laser guns. - icon: Objects/Weapons/Guns/Battery/taser.rsi + icon: Objects/Weapons/Guns/Battery/taser.rsi/icon.png requiredPoints: 1500 requiredTechnologies: - SecurityTechnology @@ -83,7 +83,7 @@ name: "explosives technology" id: ExplosivesTechnology description: Let's just start with grenades for now. - icon: Objects/Weapons/Grenades/flashbang.rsi + icon: Objects/Weapons/Grenades/flashbang.rsi/icon.png requiredPoints: 1500 requiredTechnologies: - SecurityTechnology @@ -92,7 +92,7 @@ name: "armor technology" id: ArmorTechnology description: Basic protective gear for security personnel. - icon: Clothing/OuterClothing/Vests/kevlar.rsi + icon: Clothing/OuterClothing/Vests/kevlar.rsi/icon.png requiredPoints: 1500 requiredTechnologies: - SecurityTechnology @@ -125,9 +125,7 @@ name: material sheet printing id: Sheets description: Print those sheets! - icon: - sprite: Objects/Materials/sheets.rsi - state: researchicon + icon: Objects/Materials/sheets.rsi/researchicon.png requiredPoints: 250 requiredTechnologies: - IndustrialEngineering From 333f84f637d80b60f6cd7fe82b959259f9d7850f Mon Sep 17 00:00:00 2001 From: AJCM Date: Fri, 8 Jan 2021 11:59:59 -0400 Subject: [PATCH 2/3] address review --- .../Catalog/Research/technologies.yml | 62 ++++++++++++++----- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 79713742bd..1ba2cbcb25 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -1,5 +1,5 @@ # In order to make this list somewhat organized, please place new technologies underneath their overarching "base" technology. -# The technology tree is using this layout - https://tgstation13.org/wiki//images/thumb/f/f4/ResearchTree.png/800px-ResearchTree.png +# The technology tree is using this layout - https://tgstation13.org/wiki//images/thumb/f/f4/ResearchTree/800px-ResearchTree.png # Base Technology @@ -7,7 +7,9 @@ name: "basic research technology" id: BasicResearch description: Nanotrasen basic research technologies. - icon: Constructible/Power/server.rsi/server-on.png + icon: + sprite: Constructible/Power/server.rsi + state: server-on requiredPoints: 250 # Biological Technology Tree @@ -16,7 +18,9 @@ name: "biological technology" id: BiologicalTechnology description: Investigations into the natural world. - icon: Constructible/Misc/potted_plants.rsi/applebush.png + icon: + sprite: Constructible/Misc/potted_plants.rsi + state: applebush requiredPoints: 1000 requiredTechnologies: - BasicResearch @@ -25,7 +29,9 @@ name: "advanced botany" id: AdvancedBotany description: A better understanding of botany. - icon: Objects/Specific/Hydroponics/potato.rsi/seed.png + icon: + sprite: Objects/Specific/Hydroponics/potato.rsi + state: seed requiredPoints: 1500 requiredTechnologies: - BiologicalTechnology @@ -34,7 +40,9 @@ name: "advanced surgery" id: AdvancedSugery description: Research new surgical procedures. - icon: Objects/Specific/Medical/surgery_tools.rsi/bone_saw.png + icon: + sprite: Objects/Specific/Medical/surgery_tools.rsi + state: bone_saw requiredPoints: 1500 requiredTechnologies: - BiologicalTechnology @@ -45,7 +53,9 @@ name: "chemistry technology" id: ChemistryTechnology description: A crash course in chemistry. - icon: Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png + icon: + sprite: Objects/Specific/Chemistry/beakers.rsi + state: beakerlarge requiredPoints: 1000 requiredTechnologies: - BasicResearch @@ -56,7 +66,9 @@ name: "security technology" id: SecurityTechnology description: Beginning of the long hard road to exosuits. - icon: Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png + icon: + sprite: Objects/Weapons/Melee/stunbaton.rsi + state: stunbaton_off requiredPoints: 1000 requiredTechnologies: - BasicResearch @@ -65,7 +77,9 @@ name: "ballistic technology" id: BallisticTechnology description: Just a fancy term for guns. - icon: Objects/Weapons/Guns/Pistols/clarissa.rsi/icon.png + icon: + sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi + state: icon requiredPoints: 1500 requiredTechnologies: - SecurityTechnology @@ -74,7 +88,9 @@ name: "direct energy technology" id: DirectEnergyTechnology description: Basically laser guns. - icon: Objects/Weapons/Guns/Battery/taser.rsi/icon.png + icon: + sprite: Objects/Weapons/Guns/Battery/taser.rsi + state: icon requiredPoints: 1500 requiredTechnologies: - SecurityTechnology @@ -83,7 +99,9 @@ name: "explosives technology" id: ExplosivesTechnology description: Let's just start with grenades for now. - icon: Objects/Weapons/Grenades/flashbang.rsi/icon.png + icon: + sprite: Objects/Weapons/Grenades/flashbang.rsi + state: icon requiredPoints: 1500 requiredTechnologies: - SecurityTechnology @@ -92,7 +110,9 @@ name: "armor technology" id: ArmorTechnology description: Basic protective gear for security personnel. - icon: Clothing/OuterClothing/Vests/kevlar.rsi/icon.png + icon: + sprite: Clothing/OuterClothing/Vests/kevlar.rsi + state: icon requiredPoints: 1500 requiredTechnologies: - SecurityTechnology @@ -103,7 +123,9 @@ name: "data theory" id: DataTheory description: Just like regular data, but in space! - icon: Constructible/Power/computers.rsi/computer-datatheory.png + icon: + sprite: Constructible/Power/computers.rsi + state: computer-datatheory requiredPoints: 1000 requiredTechnologies: - BasicResearch @@ -114,7 +136,9 @@ name: "industrial engineering" id: IndustrialEngineering description: A refresher course on modern engineering technology. - icon: Constructible/Power/protolathe.rsi/protolathe.png + icon: + sprite: Constructible/Power/protolathe.rsi + state: protolathe requiredPoints: 1000 requiredTechnologies: - BasicResearch @@ -125,7 +149,9 @@ name: material sheet printing id: Sheets description: Print those sheets! - icon: Objects/Materials/sheets.rsi/researchicon.png + icon: + sprite: Objects/Materials/sheets.rsi + state: researchicon requiredPoints: 250 requiredTechnologies: - IndustrialEngineering @@ -139,7 +165,9 @@ name: "electromagnetic theory" id: ElectromagneticTheory description: Try not to fry yourself. - icon: Constructible/Power/apc.rsi/apcewires.png + icon: + sprite: Constructible/Power/apc.rsi + state: apcewires requiredPoints: 1000 requiredTechnologies: - BasicResearch @@ -150,7 +178,9 @@ name: "basic bluespace theory" id: BluespaceTheory description: An experimental course on the mysterious technology known as bluespace. - icon: Objects/Misc/skub.rsi/icon.png + icon: + sprite: Objects/Misc/skub.rsi + state: icon requiredPoints: 1000 requiredTechnologies: - BasicResearch From 62a2cf9931d3effef5223895823a39bb387ba7dc Mon Sep 17 00:00:00 2001 From: AJCM Date: Fri, 8 Jan 2021 12:02:23 -0400 Subject: [PATCH 3/3] oops --- Resources/Prototypes/Catalog/Research/technologies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 1ba2cbcb25..c80b3fd010 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -1,5 +1,5 @@ # In order to make this list somewhat organized, please place new technologies underneath their overarching "base" technology. -# The technology tree is using this layout - https://tgstation13.org/wiki//images/thumb/f/f4/ResearchTree/800px-ResearchTree.png +# The technology tree is using this layout - https://tgstation13.org/wiki//images/thumb/f/f4/ResearchTree.png/800px-ResearchTree.png # Base Technology