Protolathe Printing and R&D technology (#4039)

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>

Content.Server/Cargo/CargoOrderDatabase.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Prototypes.Cargo;

Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs

@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Research;

Resources/Prototypes/Catalog/Research/technologies.yml

@@ -1,4 +1,4 @@
-# In order to make this list somewhat organized, please place new technologies underneath their overarching "base" technology.
+# 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
 
 # Base Technology
@@ -12,6 +12,22 @@
     state: server-on
   requiredPoints: 2500
 
+# Cleaning Technology Tree
+
+- type: technology
+  name: "cleaning technology"
+  id: MopBucket 
+  description: Start to a shiny clean station
+  icon:
+    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    state: mopbucket
+  requiredPoints: 5000
+  requiredTechnologies:
+    - BasicResearch
+  unlockedRecipes:
+    - Bucket
+    - MopItem
+
 # Biological Technology Tree
 
 - type: technology
@@ -27,6 +43,7 @@
   unlockedRecipes:
     - Scythe
     - Hatchet
+    - KitchenKnife  
 
 - type: technology
   name: "advanced botany"
@@ -40,6 +57,7 @@
     - BiologicalTechnology
   unlockedRecipes:
     - Shovel
+    - ButchCleaver
 
 - type: technology
   name: "advanced surgery"
@@ -94,7 +112,23 @@
     - Handcuffs
     - Stunbaton
 
-# - type: technology
+- type: technology
+  name: "ballistic technology"
+  id: BallisticTechnology
+  description: Just a fancy term for guns.
+  icon:
+    sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
+    state: icon
+  requiredPoints: 15000
+  requiredTechnologies:
+     - SecurityTechnology
+  unlockedRecipes:
+    - CartridgePistolBase
+    - ShellShotgunBase
+    - CartridgeLRifleBase
+    - CartridgeMagnumBase
+
+#- type: technology
 #   name: "ballistic technology"
 #   id: BallisticTechnology
 #   description: Just a fancy term for guns.
@@ -167,6 +201,8 @@
     - ConveyorAssembly
     - RCD
     - RCDAmmo
+    - FlashlightLantern
+    - FireExtinguisher
 
 - type: technology
   name: material sheet printing
@@ -178,6 +214,8 @@
     - IndustrialEngineering
   unlockedRecipes:
     - SheetSteel
+    - SheetPlastic
+    - SheetRGlass
     - GlassStack
 
 # Electromagnetic Theory Technology Tree
@@ -194,8 +232,8 @@
     - BasicResearch
   unlockedRecipes:
     - CableStack
-    - LightTube
     - LightBulb
+    - LightTube
     - FirelockElectronics
     - DoorElectronics
     - APCElectronics

Resources/Prototypes/Entities/Constructible/Power/lathe.yml

@@ -135,6 +135,8 @@
       - LightBulb
       - SheetSteel
       - GlassStack
+      - SheetRGlass
+      - SheetPlastic
       - CableStack
       - ConveyorAssembly
       - RCD
@@ -155,9 +157,19 @@
       - Flash
       - Handcuffs
       - Stunbaton
+      - CartridgePistolBase
+      - ShellShotgunBase
+      - CartridgeLRifleBase
+      - CartridgeMagnumBase
       - FirelockElectronics
       - DoorElectronics
       - APCElectronics
+      - Bucket
+      - MopItem
+      - FireExtinguisher
+      - KitchenKnife
+      - ButchCleaver
+      - FlashlightLantern
 
   - type: UserInterface
     interfaces:

Resources/Prototypes/Recipes/Lathes/cooking.yml

@@ -1,6 +1,8 @@
 - type: latheRecipe
   id: ButchCleaver
-  icon: Objects/Weapons/Melee/cleaver.rsi
+  icon: 
+     sprite: Objects/Weapons/Melee/cleaver.rsi
+     state: butch
   result: ButchCleaver
   completetime: 500
   materials:
@@ -8,9 +10,11 @@
 
 - type: latheRecipe
   id: KitchenKnife
-  icon: Objects/Weapons/Melee/kitchen_knife.rsi
+  icon:
+    sprite: Objects/Weapons/Melee/kitchen_knife.rsi
+    state: icon
   result: KitchenKnife 
-  completetime: 400
+  completetime: 500
   materials:
     Steel: 200
 

Resources/Prototypes/Recipes/Lathes/janitorial.yml

@@ -1,6 +1,8 @@
 - type: latheRecipe
   id: MopItem
-  icon: Objects/Specific/Janitorial/mop.rsi
+  icon: 
+    sprite: Objects/Specific/Janitorial/mop.rsi
+    state: mop
   result: MopItem
   completetime: 500
   materials:
@@ -17,7 +19,9 @@
 
 - type: latheRecipe
   id: Bucket
-  icon: Objects/Specific/Janitorial/janitorial.rsi
+  icon:
+    sprite: Objects/Tools/bucket.rsi
+    state: icon
   result: Bucket
   completetime: 500
   materials:

Resources/Prototypes/Recipes/Lathes/misc.yml

@@ -42,9 +42,11 @@
     Plastic: 50
 
 - type: latheRecipe
-  id: FlashLightLantern
+  id: FlashlightLantern
-  icon: Objects/Tools/flashlight.rsi
+  icon: 
-  result: FlashLightLantern
+    sprite: Objects/Tools/flashlight.rsi
+    state: lantern_off
+  result: FlashlightLantern
   completetime: 500
   materials:
     Steel: 100
@@ -53,7 +55,9 @@
 
 - type: latheRecipe
   id: FireExtinguisher
-  icon: Objects/Misc/fire_extinguisher.rsi
+  icon:
+    sprite: Objects/Misc/fire_extinguisher.rsi
+    state: fire_extinguisher_closed
   result: FireExtinguisher 
   completetime: 500
   materials:

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -30,3 +30,43 @@
     Glass: 100
     Plastic: 200
     Steel: 100
+
+- type: latheRecipe
+  id: CartridgePistolBase
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  result: CartridgePistolBase
+  completetime: 500
+  materials:
+    Steel: 10
+
+- type: latheRecipe
+  id: ShellShotgunBase
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+    state: base
+  result: ShellShotgunBase
+  completetime: 500
+  materials:
+    Steel: 20
+
+- type: latheRecipe
+  id: CartridgeMagnumBase
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  result: CartridgeMagnumBase
+  completetime: 500
+  materials:
+    Steel: 20
+
+- type: latheRecipe
+  id: CartridgeLRifleBase
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  result: CartridgeLRifleBase
+  completetime: 500
+  materials:
+    Steel: 30

Resources/Prototypes/Recipes/Lathes/sheet.yml

@@ -17,3 +17,23 @@
   completetime: 500
   materials:
     Glass: 100
+
+- type: latheRecipe
+  id: SheetRGlass
+  icon:
+    sprite: Objects/Materials/Sheets/glass.rsi
+    state: rglass
+  result: SheetRGlass1
+  completetime: 500
+  materials:
+    Glass: 200
+
+- type: latheRecipe
+  id: SheetPlastic
+  icon:
+    sprite: Objects/Materials/Sheets/other.rsi
+    state: plastic
+  result: SheetPlastic1
+  completetime: 500
+  materials:
+    Plastic: 100