Added a bunch more textures (#356)

Resources/Prototypes/1_Temperature.yml

@@ -4,10 +4,10 @@
   components:
   - type: Clickable
   - type: Sprite
-    texture: Objects/shoes.png
+    texture: Objects/Misc/shoes.png
 
   - type: Icon
-    texture: Objects/shoes.png
+    texture: Objects/Misc/shoes.png
 
   - type: Damageable
     resistanceset: Standard

Resources/Prototypes/Construction/machines.yml

@@ -6,7 +6,7 @@
   description: A simple wall-mounted light fixture.
   placementmode: SnapgridBorder
   icon:
-    sprite: Objects/lighting.rsi
+    sprite: Objects/Lighting/lighting.rsi
     state: on
 
   result: poweredlight
@@ -14,13 +14,13 @@
   - material: Metal
     amount: 1
     icon:
-      sprite: Objects/lighting.rsi
+      sprite: Objects/Lighting/lighting.rsi
       state: construct
 
   - material: Cable
     amount: 1
     icon:
-      sprite: Objects/lighting.rsi
+      sprite: Objects/Lighting/lighting.rsi
       state: empty
 
   - material: Glass

Resources/Prototypes/Construction/power.yml

@@ -25,12 +25,12 @@
   category: Machines/Power
   placementmode: SnapgridCenter
   description: A portable generator capable of producing power from thin air.
-  icon: Objects/generator.png
+  icon: Objects/Power/generator.png
   result: Generator
   steps:
   - material: Metal
     amount: 2
-    icon: Objects/generator.png
+    icon: Objects/Power/generator.png
 
   - material: Cable
     amount: 2
@@ -54,4 +54,3 @@
 
   - material: Cable
     amount: 2
-

Resources/Prototypes/Construction/structures.yml

@@ -25,7 +25,7 @@
   name: Table
   id: table
   category: Structures
-  icon: Objects/worktop_single.png
+  icon: Objects/Furniture/worktop_single.png
   result: table
   placementmode: SnapgridCenter
   steps:

Resources/Prototypes/Construction/weapons.yml

@@ -4,7 +4,7 @@
   category: Items/Weapons
   keywords: [melee]
   description: A crude spear for when you need to put holes in somebody.
-  icon: Objects/spear.png
+  icon: Objects/Melee/spear.rsi/spear.png
   objecttype: Item
   steps:
   - material: Metal

Resources/Prototypes/Entities/Janitor.yml

@@ -2,12 +2,12 @@
   parent: ReagentItem
   name: "Extra-Grip™ Mop"
   id: MopItem
-  description: A mop that cant be stopped, viscera cleanup detail awaits.
+  description: A mop that can't be stopped, viscera cleanup detail awaits.
   components:
   - type: Sprite
-    texture: Objects/mop.png
+    texture: Objects/Janitorial/mop.png
   - type: Icon
-    texture: Objects/mop.png
+    texture: Objects/Janitorial/mop.png
   - type: Item
     Size: 10
   - type: Solution
@@ -21,14 +21,14 @@
   description: Holds water and the tears of the janitor.
   components:
   - type: Sprite
-    texture: Objects/mopbucket.png
+    texture: Objects/Janitorial/mopbucket.png
   - type: Icon
-    texture: Objects/mopbucket.png
+    texture: Objects/Janitorial/mopbucket.png
   - type: Clickable
   - type: Solution
     maxVol: 500
     caps: 3
-    
+
 - type: entity
   parent: ReagentItem
   name: Bucket
@@ -36,10 +36,9 @@
   description: "It's a bucket."
   components:
   - type: Sprite
-    texture: Objects/bucket.png
+    texture: Objects/Janitorial/bucket.png
   - type: Icon
-    texture: Objects/bucket.png
+    texture: Objects/Janitorial/bucket.png
   - type: Solution
     maxVol: 500
     caps: 3
-    

Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml

@@ -6,22 +6,22 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/laser_retro.rsi
+    sprite: Objects/Guns/Laser/laser_retro.rsi
     state: laser_retro_100
   - type: Icon
-    sprite: Objects/laser_retro.rsi
+    sprite: Objects/Guns/Laser/laser_retro.rsi
     state: laser_retro_100
   - type: RangedWeapon
   - type: HitscanWeapon
     damage: 30
-    fireSprite: "Objects/laser.png"
+    fireSprite: "Objects/Projectiles/laser.png"
     fireSound: "/Audio/Guns/Gunshots/laser.ogg"
     lowerDischargeLimit: 10
   - type: HitscanWeaponCapacitor
     capacity: 1200
   - type: Item
     Size: 24
-    sprite: Objects/laser_retro.rsi
+    sprite: Objects/Guns/Laser/laser_retro.rsi
     prefix: laser_retro_100
   - type: Appearance
     visuals:
@@ -37,23 +37,23 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/laser_cannon.rsi
+    sprite: Objects/Guns/Laser/laser_cannon.rsi
     state: laser_cannon_100
   - type: Icon
-    sprite: Objects/laser_cannon.rsi
+    sprite: Objects/Guns/Laser/laser_cannon.rsi
     state: laser_cannon_100
   - type: HitscanWeapon
     damage: 90
-    fireSprite: "Objects/heavylaser.png"
+    fireSprite: "Objects/Projectiles/heavylaser.png"
     fireSound: "/Audio/Guns/Gunshots/laser_cannon.ogg"
     lowerDischargeLimit: 10
   - type: HitscanWeaponCapacitor
     capacity: 2400
   - type: Item
     Size: 32
-    sprite: Objects/laser_cannon.rsi
+    sprite: Objects/Guns/Laser/laser_cannon.rsi
     prefix: laser_cannon_100
   - type: Appearance
     visuals:
     - type: HitscanWeaponVisualizer2D
-      prefix: laser_cannon
+      prefix: laser_cannon

Resources/Prototypes/Entities/items/bike_horn.yml

@@ -5,16 +5,16 @@
   description: A horn off of a bicycle.
   components:
   - type: Sprite
-    sprite: Objects/bikehorn.rsi
+    sprite: Objects/Fun/bikehorn.rsi
     state: icon
 
   - type: Icon
-    sprite: Objects/bikehorn.rsi
+    sprite: Objects/Fun/bikehorn.rsi
     state: icon
 
   - type: Item
     Size: 5
-    sprite: Objects/bikehorn.rsi
+    sprite: Objects/Fun/bikehorn.rsi
 
   - type: Sound
   - type: EmitSoundOnUse

Resources/Prototypes/Entities/items/dice.yml

@@ -15,10 +15,10 @@
     sides: 100
     step: 10
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d100100
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d100100
 
 - type: entity
@@ -29,12 +29,12 @@
   - type: Dice
     sides: 20
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d2020
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d2020
-    
+
 - type: entity
   name: "d12"
   parent: BaseDice
@@ -43,12 +43,12 @@
   - type: Dice
     sides: 12
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d1212
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d1212
-    
+
 - type: entity
   name: "d10"
   parent: BaseDice
@@ -57,12 +57,12 @@
   - type: Dice
     sides: 10
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d1010
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d1010
-    
+
 - type: entity
   name: "d8"
   parent: BaseDice
@@ -71,12 +71,12 @@
   - type: Dice
     sides: 8
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d88
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d88
-    
+
 - type: entity
   name: "d6"
   parent: BaseDice
@@ -85,12 +85,12 @@
   - type: Dice
     sides: 6
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d66
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d66
-    
+
 - type: entity
   name: "d4"
   parent: BaseDice
@@ -99,8 +99,8 @@
   - type: Dice
     sides: 4
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d44
   - type: Icon
-    sprite: Objects/items/dice.rsi
-    state: d44
+    sprite: Objects/Fun/dice.rsi
+    state: d44

Resources/Prototypes/Entities/items/explosives.yml

@@ -5,13 +5,13 @@
   id: ExGrenade
   components:
   - type: Sprite
-    sprite: Objects/grenade.rsi
+    sprite: Objects/Grenades/grenade.rsi
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
 
   - type: Icon
-    sprite: Objects/grenade.rsi
+    sprite: Objects/Grenades/grenade.rsi
     state: icon
 
   - type: Item
@@ -29,7 +29,7 @@
   - type: Damageable
   - type: Destructible
     thresholdvalue: 10
-    
+
   - type: Appearance
     visuals:
     - type: TimerTriggerVisualizer2D
@@ -42,13 +42,13 @@
   id: SyndieMiniBomb
   components:
   - type: Sprite
-    sprite: Objects/syndgrenade.rsi
+    sprite: Objects/Grenades/syndgrenade.rsi
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
 
   - type: Icon
-    sprite: Objects/syndgrenade.rsi
+    sprite: Objects/Grenades/syndgrenade.rsi
     state: icon
 
   - type: Item
@@ -71,4 +71,3 @@
     visuals:
     - type: TimerTriggerVisualizer2D
       countdown_sound: /Audio/effects/countdown.ogg
-

Resources/Prototypes/Entities/items/fire_extinguisher.yml

@@ -5,8 +5,8 @@
   description: Extinguishes fires.
   components:
   - type: Sprite
-    texture: Objects/fire_extinguisher.png
+    texture: Objects/Misc/fire_extinguisher.png
   - type: Icon
-    texture: Objects/fire_extinguisher.png
+    texture: Objects/Misc/fire_extinguisher.png
   - type: Item
     Size: 10

Resources/Prototypes/Entities/items/flashlight.yml

@@ -6,14 +6,14 @@
   components:
   - type: HandheldLight
   - type: Sprite
-    sprite: Objects/lantern.rsi
+    sprite: Objects/Tools/flashlight.rsi
     layers:
     - state: lantern_off
     - state: HandheldLightOnOverlay
       shader: unshaded
       visible: false
   - type: Icon
-    sprite: Objects/lantern.rsi
+    sprite: Objects/Tools/flashlight.rsi
     state: lantern_off
   - type: PointLight
     enabled: false

Resources/Prototypes/Entities/items/light_bulb.yml

@@ -7,11 +7,11 @@
     bulb: Bulb
 
   - type: Sprite
-    sprite: Objects/light_bulb.rsi
+    sprite: Objects/Lighting/light_bulb.rsi
     state: normal
 
   - type: Icon
-    sprite: Objects/light_bulb.rsi
+    sprite: Objects/Lighting/light_bulb.rsi
     state: normal
 
 - type: entity
@@ -30,11 +30,11 @@
     bulb: Tube
 
   - type: Sprite
-    sprite: Objects/light_tube.rsi
+    sprite: Objects/Lighting/light_tube.rsi
     state: normal
 
   - type: Icon
-    sprite: Objects/light_tube.rsi
+    sprite: Objects/Lighting/light_tube.rsi
     state: normal
 
 - type: entity
@@ -48,9 +48,8 @@
     BurningTemperature: 350
     PowerUse: 9
   - type: Sprite
-    sprite: Objects/light_tube.rsi
+    sprite: Objects/Lighting/light_tube.rsi
     state: normal
   - type: Icon
-    sprite: Objects/light_tube.rsi
+    sprite: Objects/Lighting/light_tube.rsi
     state: normal
-

Resources/Prototypes/Entities/items/materials.yml

@@ -18,9 +18,9 @@
   - type: Stack
     stacktype: enum.StackType.Metal
   - type: Sprite
-    texture: Objects/sheet_metal.png
+    texture: Objects/Materials/sheet_metal.png
   - type: Icon
-    texture: Objects/sheet_metal.png
+    texture: Objects/Materials/sheet_metal.png
 
 - type: entity
   id: SteelSheet1
@@ -42,10 +42,10 @@
   - type: Stack
     stacktype: enum.StackType.Glass
   - type: Sprite
-    texture: Objects/sheet_glass.png
+    texture: Objects/Materials/sheet_glass.png
   - type: Icon
-    texture: Objects/sheet_glass.png
-    
+    texture: Objects/Materials/sheet_glass.png
+
 - type: entity
   id: GlassSheet1
   name: Glass Sheet 1
@@ -62,8 +62,8 @@
   - type: Stack
     stacktype: enum.StackType.Cable
   - type: Sprite
-    texture: Objects/cable_coil.png
+    texture: Objects/Tools/cable_coil.png
     color: red
   - type: Icon
-    texture: Objects/cable_coil.png
+    texture: Objects/Tools/cable_coil.png
   - type: WirePlacer

Resources/Prototypes/Entities/items/medical.yml

@@ -4,9 +4,9 @@
   id: Medkit
   components:
   - type: Sprite
-    texture: Objects/medkit_r.png
+    texture: Objects/Medical/medkit_r.png
   - type: Icon
-    texture: Objects/medkit_r.png
+    texture: Objects/Medical/medkit_r.png
   - type: Healing
     heal: 100
     damage: Brute
@@ -30,9 +30,9 @@
   id: Ointment
   components:
   - type: Sprite
-    texture: Objects/ointment.png
+    texture: Objects/Medical/ointment.png
   - type: Icon
-    texture: Objects/ointment.png
+    texture: Objects/Medical/ointment.png
   - type: Healing
     heal: 10
     damage: Heat
@@ -49,9 +49,9 @@
   id: Brutepack
   components:
   - type: Sprite
-    texture: Objects/brutepack.png
+    texture: Objects/Medical/brutepack.png
   - type: Icon
-    texture: Objects/brutepack.png
+    texture: Objects/Medical/brutepack.png
   - type: Healing
     heal: 10
     damage: Brute

Resources/Prototypes/Entities/items/powercells.yml

@@ -18,11 +18,11 @@
   parent: PowerCellSmallBase
   components:
   - type: Sprite
-    sprite: Objects/PowerCells/power_cell_small_st.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_st.rsi
     layers:
     - state: s_st
   - type: Icon
-    sprite: Objects/PowerCells/power_cell_small_st.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_st.rsi
     state: s_st
   - type: PowerCell
     capacity: 1500
@@ -39,11 +39,11 @@
   parent: PowerCellSmallBase
   components:
   - type: Sprite
-    sprite: Objects/PowerCells/power_cell_small_hi.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi
     layers:
     - state: s_hi
   - type: Icon
-    sprite: Objects/PowerCells/power_cell_small_hi.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi
     state: s_hi
   - type: PowerCell
     capacity: 3000
@@ -60,11 +60,11 @@
   parent: PowerCellSmallBase
   components:
   - type: Sprite
-    sprite: Objects/PowerCells/power_cell_small_sup.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi
     layers:
     - state: s_sup
   - type: Icon
-    sprite: Objects/PowerCells/power_cell_small_sup.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi
     state: s_sup
   - type: PowerCell
     capacity: 6000
@@ -81,11 +81,11 @@
   parent: PowerCellSmallBase
   components:
   - type: Sprite
-    sprite: Objects/PowerCells/power_cell_small_hy.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_hy.rsi
     layers:
     - state: s_hy
   - type: Icon
-    sprite: Objects/PowerCells/power_cell_small_hy.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_hy.rsi
     state: s_hy
   - type: PowerCell
     capacity: 10000

Resources/Prototypes/Entities/items/table_parts.yml

@@ -5,13 +5,13 @@
   description: Parts of a table.
   components:
   - type: Sprite
-    sprite: Objects/table_parts.rsi
+    sprite: Objects/Parts/table_parts.rsi
     state: icon
 
   - type: Icon
-    sprite: Objects/table_parts.rsi
+    sprite: Objects/Parts/table_parts.rsi
     state: icon
 
   - type: Item
     Size: 25
-    sprite: Objects/table_parts.rsi
+    sprite: Objects/Parts/table_parts.rsi

Resources/Prototypes/Entities/items/teleporters.yml

@@ -5,16 +5,16 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/hand_tele.rsi
+    sprite: Objects/Misc/hand_tele.rsi
     state: ready
   - type: Icon
-    sprite: Objects/hand_tele.rsi
+    sprite: Objects/Misc/hand_tele.rsi
     state: ready
   - type: ItemTeleporter
     teleporter_type: Random
   - type: Item
     Size: 12
-    sprite: Objects/hand_tele.rsi
+    sprite: Objects/Misc/hand_tele.rsi
   - type: Sound
   - type: Appearance
     visuals:
@@ -60,4 +60,4 @@
     state: portal-pending
   - type: Appearance
     visuals:
-    - type: PortalVisualizer2D
+    - type: PortalVisualizer2D

Resources/Prototypes/Entities/items/toolbox.yml

@@ -2,12 +2,12 @@
   name: Emergency Toolbox
   parent: BaseItem
   id: RedToolboxItem
-  description: A shiny red and robust container
+  description: A bright red toolbox, stocked with emergency tools
   components:
   - type: Sprite
-    texture: Objects/toolbox_r.png
+    texture: Objects/Tools/toolbox_r.png
   - type: Icon
-    texture: Objects/toolbox_r.png
+    texture: Objects/Tools/toolbox_r.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -17,12 +17,12 @@
   name: Mechanical Toolbox
   parent: BaseItem
   id: BlueToolboxItem
-  description: A blue box, not the kind you're thinking of
+  description: A blue box, stocked with mechanical tools
   components:
   - type: Sprite
-    texture: Objects/Toolbox_b.png
+    texture: Objects/Tools/Toolbox_b.png
   - type: Icon
-    texture: Objects/Toolbox_b.png
+    texture: Objects/Tools/Toolbox_b.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -35,9 +35,9 @@
   description: A toolbox typically stocked with electrical gear
   components:
   - type: Sprite
-    texture: Objects/Toolbox_y.png
+    texture: Objects/Tools/Toolbox_y.png
   - type: Icon
-    texture: Objects/Toolbox_y.png
+    texture: Objects/Tools/Toolbox_y.png
   - type: Storage
     Capacity: 60
   - type: Item

Resources/Prototypes/Entities/items/tools.yml

@@ -6,9 +6,9 @@
   components:
   - type: Wirecutter
   - type: Sprite
-    texture: Objects/wirecutter.png
+    texture: Objects/Tools/wirecutter.png
   - type: Icon
-    texture: Objects/wirecutter.png
+    texture: Objects/Tools/wirecutter.png
   - type: MeleeWeapon
 
 - type: entity
@@ -19,9 +19,9 @@
   components:
   - type: Screwdriver
   - type: Sprite
-    texture: Objects/screwdriver.png
+    texture: Objects/Tools/screwdriver.png
   - type: Icon
-    texture: Objects/screwdriver.png
+    texture: Objects/Tools/screwdriver.png
   - type: MeleeWeapon
 
 - type: entity
@@ -32,7 +32,7 @@
   components:
   - type: Welder
   - type: Sprite
-    sprite: Objects/tools.rsi
+    sprite: Objects/Tools/welder.rsi
     layers:
     - state: welder
     - state: welder_flame
@@ -40,7 +40,7 @@
       visible: false
 
   - type: Icon
-    sprite: Objects/tools.rsi
+    sprite: Objects/Tools/welder.rsi
     state: welder
   - type: MeleeWeapon
 
@@ -52,9 +52,9 @@
   components:
   - type: Wrench
   - type: Sprite
-    texture: Objects/wrench.png
+    texture: Objects/Tools/wrench.png
   - type: Icon
-    texture: Objects/wrench.png
+    texture: Objects/Tools/wrench.png
   - type: MeleeWeapon
 
 - type: entity
@@ -65,9 +65,9 @@
   components:
   - type: Crowbar
   - type: Sprite
-    texture: Objects/crowbar.png
+    texture: Objects/Tools/crowbar.png
   - type: Icon
-    texture: Objects/crowbar.png
+    texture: Objects/Tools/crowbar.png
   - type: MeleeWeapon
 
 - type: entity
@@ -78,7 +78,7 @@
   components:
   - type: Multitool
   - type: Sprite
-    texture: Objects/multitool.png
+    texture: Objects/Tools/multitool.png
   - type: Icon
-    texture: Objects/multitool.png
+    texture: Objects/Tools/multitool.png
   - type: PowerDebugTool

Resources/Prototypes/Entities/items/weapons/kitchen.yml

@@ -5,16 +5,16 @@
   desc: A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products.
   components:
   - type: Sprite
-    sprite: Objects/items/cleaver.rsi
+    sprite: Objects/Melee/cleaver.rsi
     size: 4
     state: butch
 
   - type: Icon
-    sprite: Objects/items/cleaver.rsi
+    sprite: Objects/Melee/cleaver.rsi
     state: butch
 
   - type: MeleeWeapon
   - type: Item
     Size: 10
-    sprite: Objects/items/cleaver.rsi
+    sprite: Objects/Melee/cleaver.rsi
     prefix: inhand

Resources/Prototypes/Entities/items/weapons/mining.yml

@@ -4,17 +4,17 @@
   id: Pickaxe
   components:
   - type: Sprite
-    sprite: Objects/items/pickaxe.rsi
+    sprite: Objects/Melee/pickaxe.rsi
     state: pickaxe
 
   - type: Icon
-    sprite: Objects/items/pickaxe.rsi
+    sprite: Objects/Melee/pickaxe.rsi
     state: pickaxe
   - type: Pickaxe
   - type: MeleeWeapon
     damage: 25
   - type: Item
     Size: 24
-    sprite: Objects/items/pickaxe.rsi
+    sprite: Objects/Melee/pickaxe.rsi
     prefix: inhand
   - type: Sound

Resources/Prototypes/Entities/items/weapons/spear.yml

@@ -4,15 +4,15 @@
   id: Spear
   components:
   - type: Sprite
-    sprite: Objects/items/spear.rsi
+    sprite: Objects/Melee/spear.rsi
     state: spear
 
   - type: Icon
-    sprite: Objects/items/spear.rsi
+    sprite: Objects/Melee/spear.rsi
     state: spear
 
   - type: MeleeWeapon
   - type: Item
     Size: 24
-    sprite: Objects/items/spear.rsi
+    sprite: Objects/Melee/spear.rsi
     prefix: inhand

Resources/Prototypes/LatheRecipes/medical.yml

@@ -1,17 +1,17 @@
 - type: latheRecipe
   id: Brutepack
-  icon: Objects/brutepack.png
+  icon: Objects/Medical/brutepack.png
   result: Brutepack
   completetime: 500
   materials:
     steel: 400
     glass: 125
-    
+
 - type: latheRecipe
   id: Ointment
-  icon: Objects/ointment.png
+  icon: Objects/Medical/ointment.png
   result: Ointment
   completetime: 500
   materials:
     steel: 400
-    glass: 125
+    glass: 125

Resources/Prototypes/LatheRecipes/misc.yml

@@ -1,17 +1,17 @@
 - type: latheRecipe
   id: LightTube
-  icon: Objects/light_tube.rsi/normal.png
+  icon: Objects/Lighting/light_tube.rsi/normal.png
   result: LightTube
   completetime: 500
   materials:
     steel: 60
     glass: 100
-    
+
 - type: latheRecipe
   id: LightBulb
-  icon: Objects/light_bulb.rsi/normal.png
+  icon: Objects/Lighting/light_bulb.rsi/normal.png
   result: LightBulb
   completetime: 500
   materials:
     steel: 30
-    glass: 50
+    glass: 50

Resources/Prototypes/LatheRecipes/sheet.yml

@@ -1,15 +1,15 @@
 - type: latheRecipe
   id: MetalStack
-  icon: Objects/sheet_metal.png
+  icon: Objects/Materials/sheet_metal.png
   result: SteelSheet1
   completetime: 500
   materials:
     steel: 3750
-    
+
 - type: latheRecipe
   id: GlassStack
-  icon: Objects/sheet_glass.png
+  icon: Objects/Materials/sheet_glass.png
   result: GlassSheet1
   completetime: 500
   materials:
-    glass: 3750
+    glass: 3750

Resources/Prototypes/LatheRecipes/tools.yml

@@ -1,6 +1,6 @@
 - type: latheRecipe
   id: Wirecutter
-  icon: Objects/wirecutter.png
+  icon: Objects/Tools/wirecutter.png
   result: Wirecutter
   completetime: 500
   materials:
@@ -8,7 +8,7 @@
 
 - type: latheRecipe
   id: Screwdriver
-  icon: Objects/screwdriver.png
+  icon: Objects/Tools/screwdriver.png
   result: Screwdriver
   completetime: 500
   materials:
@@ -16,44 +16,44 @@
 
 - type: latheRecipe
   id: Welder
-  icon: Objects/welder.png
+  icon: Objects/Tools/autolathe_welder.png
   result: Welder
   completetime: 500
   materials:
     steel: 70
     glass: 30
-    
+
 - type: latheRecipe
   id: Wrench
-  icon: Objects/wrench.png
+  icon: Objects/Tools/wrench.png
   result: Wrench
   completetime: 500
   materials:
     steel: 70
     glass: 30
-    
+
 - type: latheRecipe
   id: CableStack
-  icon: Objects/cable_coil.png
+  icon: Objects/Tools/cable_coil.png
   result: CableStack
   completetime: 500
   materials:
     steel: 50
     glass: 50
-    
+
 - type: latheRecipe
   id: Crowbar
-  icon: Objects/crowbar.png
+  icon: Objects/Tools/crowbar.png
   result: Crowbar
   completetime: 500
   materials:
     steel: 50
-        
+
 - type: latheRecipe
   id: Multitool
-  icon: Objects/multitool.png
+  icon: Objects/Tools/multitool.png
   result: Multitool
   completetime: 500
   materials:
     steel: 50
-    glass: 20
+    glass: 20

Resources/Prototypes/Technologies/sheet.yml

@@ -1,26 +0,0 @@
-- type: technology
-  name: "Test Technology 1"
-  id: Parent1
-  description: Parent technology needed for sheets
-  icon: Objects/sheet_glass.png
-  requiredpoints: 5000
-  
-- type: technology
-  name: "Test Technology 2"
-  id: Parent2
-  description: Parent technology 2 needed for sheets
-  icon: Objects/sheet_glass.png
-  requiredpoints: 5000
-
-- type: technology
-  name: Material sheet printing
-  id: Sheets
-  description: Print those sheets!
-  icon: Objects/sheet_metal.png
-  requiredpoints: 500
-  requiredtechnologies:
-    - Parent1
-    - Parent2
-  unlockedrecipes:
-    - MetalStack
-    - GlassStack

Resources/Prototypes/Technologies/technologies.yml

@@ -0,0 +1,78 @@
+# 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
+
+- type: technology
+  name: "Basic Research Technology"
+  id: Base_1
+  description: Nanotransen basic research technologies.
+  icon: Buildings/research.rsi/server-on.png
+  requiredpoints: 250
+
+# Biological Technology Tree
+
+- type: technology
+  name: "Biological Technology"
+  id: Bio_Base_1
+  description: Investigations into the natural world.
+  icon: Buildings/plants.rsi/plant_1.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
+
+# Data Theory Technology Tree
+
+- type: technology
+  name: "Data Theory"
+  id: Data_Base_1
+  description: Just like regular data, but in space!
+  icon: Buildings/computers.rsi/computer-datatheory.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
+
+# Industrial Engineering Technology Tree
+
+  - type: technology
+  name: "Industrial Engineering"
+  id: Industrial_Base_1
+  description: A refresher course on modern engineering technology.
+  icon: Buildings/research.rsi/protolathe.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
+
+  - type: technology
+  name: Material sheet printing
+  id: Sheets
+  description: Print those sheets!
+  icon: Objects/Materials/sheet_metal.png
+  requiredpoints: 250
+  requiredtechnologies:
+    - Industrial_Base_1
+  unlockedrecipes:
+    - MetalStack
+    - GlassStack
+
+# Electromagnetic Theory Technology Tree
+
+  - type: technology
+  name: "Electromagnetic Theory"
+  id: Electro_Base_1
+  description: Try not to fry yourself.
+  icon: Buildings/apc.rsi/apcwires.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
+
+# Bluespace Theory Technology Tree
+
+  - type: technology
+  name: "Basic Bluespace Theory"
+  id: Bluespace_Base_1
+  description: An experimental course on the mysterious technology known as bluespace.
+  icon: Buildings/teleporters.rsi/teleporter-theory.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1

Resources/Prototypes/materials.yml

@@ -2,7 +2,7 @@
   id: steel
   name: Steel
   color: gray
-  icon: Objects/sheet_metal.png
+  icon: Objects/Materials/sheet_metal.png
   density: 7700
   electricresistivity: 6.9e-7
   thermalconductivity: 18
@@ -12,7 +12,7 @@
   id: glass
   name: Glass
   color: '#e8f0ff33'
-  icon: Objects/sheet_glass.png
+  icon: Objects/Materials/sheet_glass.png
   density: 2500
   electricresistivity: 1.0e+13
   thermalconductivity: 0.9

Resources/Textures/Buildings/plants.rsi/meta.json

@@ -0,0 +1,123 @@
+{
+    "version": 1,
+
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/plants.dmi and modified by Swept",
+
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "plant_1",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_2",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_3",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_4",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_5",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_6",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_7",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_8",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_9",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_10",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_11",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_12",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_13",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_14",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_15",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+]
+}
+
+
+
+
+