Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo

Merged master into branch

Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml

@@ -46,13 +46,8 @@
         doAfter: 1
     - to: memory_cell
       steps:
-      - tag: MicroManipulatorStockPart
-        icon:
-          sprite: Objects/Misc/stock_parts.rsi
-          state: micro_mani
-        name: construction-graph-tag-manipulator
       - material: Manipulator
-        amount: 1
+        amount: 2
       - material: Cable
         amount: 2
         doAfter: 1

Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml

@@ -16,6 +16,9 @@
           steps:
             - component: ApcElectronics
               name: construction-graph-component-apc-electronics
+              icon:
+                sprite: "Objects/Misc/module.rsi"
+                state: "charger_APC"
               doAfter: 2
         - to: start
           completed:

Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml

@@ -34,6 +34,7 @@
   - ClothingUniformJumpskirtCapFormalDress
   # HoP
   - ClothingHeadHatHopcap
+  - ClothingHeadHatBeretHop
   - ClothingUniformJumpsuitHoP
   - ClothingUniformJumpskirtHoP
   # Generic

Resources/Prototypes/Recipes/Lathes/clothing.yml

@@ -810,6 +810,11 @@
   id: ClothingHeadHatHopcap
   result: ClothingHeadHatHopcap
 
+- type: latheRecipe
+  parent: BaseCommandHatRecipe
+  id: ClothingHeadHatBeretHop
+  result: ClothingHeadHatBeretHop
+  
 - type: latheRecipe
   parent: BaseCommandHatRecipe
   id: ClothingHeadHatQMsoft

Resources/Prototypes/Recipes/Lathes/tiles.yml

@@ -229,7 +229,7 @@
   result: FloorTileItemSteelMaint
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseMaintTileRecipe
   id: FloorTileItemTechmaintDark
   result: FloorTileItemTechmaintDark