Merge remote-tracking branch 'upstream/master' into fucking-upstream

2024-08-24 13:13:56 +03:00
parent 3c0bf9751e dba9565865
commit b460eb54ba
2222 changed files with 247186 additions and 50848 deletions
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/quiver.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/quiver.yml
@@ -0,0 +1,19 @@
+- type: constructionGraph
+  id: Quiver
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: Quiver
+      steps:
+      - material: Cable
+        amount: 2
+        doAfter: 1
+      - material: Cloth
+        amount: 5
+        doAfter: 2
+      - material: WoodPlank
+        amount: 1
+        doAfter: 2
+  - node: Quiver
+    entity: ClothingBeltQuiver
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
@@ -0,0 +1,160 @@
+- type: constructionGraph
+  id: GlassBox
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DeleteEntity
+      edges:
+        - to: boxMissingWires
+          completed:
+            - !type:SetAnchor
+              value: false
+          steps:
+            - material: WoodPlank
+              amount: 10
+              doAfter: 5
+
+    - node: boxMissingWires
+      entity: GlassBoxFrame
+      edges:
+        - to: boxMissingTrigger
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - material: Cable
+              amount: 2
+              doAfter: 0.5
+
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 5
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 10
+
+    - node: boxMissingTrigger
+      edges:
+        - to: boxTriggerUnsecured
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - tag: SignalTrigger
+              name: a Signal Trigger
+              icon:
+                sprite: Objects/Devices/signaltrigger.rsi
+                state: signaltrigger
+              doAfter: 0.5
+
+        - to: boxMissingWires
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - tool: Cutting
+              doAfter: 0.25
+          completed:
+            - !type:SpawnPrototype
+              prototype: CableApcStack1
+              amount: 2
+
+    - node: boxTriggerUnsecured
+      edges:
+        - to: boxMissingRGlass
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - tool: Screwing
+              doAfter: 0.5
+
+        - to: boxMissingTrigger
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - tool: Prying
+              doAfter: 0.5
+          completed:
+            - !type:SpawnPrototype
+              prototype: SignalTrigger
+              amount: 1
+
+    - node: boxMissingRGlass
+      edges:
+        - to: boxRGlassUnsecured
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2.5
+
+        - to: boxTriggerUnsecured
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - tool: Screwing
+              doAfter: 0.5
+
+    - node: boxRGlassUnsecured
+      edges:
+        - to: glassBox
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - tool: Screwing
+              doAfter: 0.5
+
+        - to: boxMissingRGlass
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - tool: Prying
+              doAfter: 2
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetRGlass1
+              amount: 5
+
+    - node: brokenGlassBox
+      entity: GlassBoxBroken
+      edges:
+        - to: boxMissingWires
+          steps:
+            - tool: Prying
+              doAfter: 2
+          completed:
+            - !type:SpawnPrototype
+              prototype: ShardGlassReinforced
+              amount: 1
+
+    - node: glassBox
+      entity: GlassBoxLaser
+      edges:
+        - to: boxMissingWires
+          steps:
+            - tool: Screwing
+              doAfter: 4
+            - tool: Pulsing
+              doAfter: 2
+            - tool: Cutting
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 10
+            - tool: Anchoring
+              doAfter: 2
+            - tool: Prying
+              doAfter: 2
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+              prototype: CableApcStack1
+              amount: 2
+            - !type:SpawnPrototype
+              prototype: SignalTrigger
+              amount: 1
+            - !type:SpawnPrototype
+              prototype: SheetRGlass1
+              amount: 5
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml
@@ -33,16 +33,6 @@
          - tool: Welding
            doAfter: 5

-      - to: airtightFlaps
-        completed:
-          - !type:SnapToGrid { }
-        steps:
-          - material: Plastic
-            amount: 5
-            doAfter: 5
-          - tool: Screwing
-            doAfter: 5
-
  - node: opaqueFlaps
    entity: PlasticFlapsOpaque
    edges:
@@ -54,44 +44,3 @@
        steps:
          - tool: Anchoring
            doAfter: 10
-
-      - to: airtightopaqueFlaps
-        completed:
-          - !type:SnapToGrid { }
-        steps:
-          - material: Plastic
-            amount: 5
-            doAfter: 5
-          - tool: Screwing
-            doAfter: 5
-
-  - node: airtightFlaps
-    entity: PlasticFlapsAirtightClear
-    edges:
-      - to: plasticFlaps
-        completed:
-          - !type:SpawnPrototype
-            prototype: SheetPlastic
-            amount: 5
-        steps:
-          - tool: Screwing
-            doAfter: 10
-
-      - to: airtightopaqueFlaps #test
-        completed:
-          - !type:SnapToGrid { }
-        steps:
-          - tool: Welding
-            doAfter: 5
-
-  - node: airtightopaqueFlaps
-    entity: PlasticFlapsAirtightOpaque
-    edges:
-      - to: opaqueFlaps
-        completed:
-          - !type:SpawnPrototype
-            prototype: SheetPlastic
-            amount: 5
-        steps:
-          - tool: Screwing
-            doAfter: 10
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
@@ -49,8 +49,8 @@
            state: "charger_APC"
          doAfter: 0.5
        - anyTags:
-          - PowerCell
-          - PowerCellSmall
+            - PowerCell
+            - PowerCellSmall
          store: powercell
          name: a powercell
          icon:
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -107,3 +107,14 @@
  description: A pair of sunglasses, modified to have a built-in security HUD.
  icon: { sprite: Clothing/Eyes/Glasses/secglasses.rsi, state: icon }
  objectType: Item
+
+- type: construction
+  name: quiver
+  id: ClothingBeltQuiver
+  graph: Quiver
+  startNode: start
+  targetNode: Quiver
+  category: construction-category-clothing
+  description: Can hold up to 15 arrows, and fits snug around your waist.
+  icon: { sprite: Clothing/Belt/quiver.rsi, state: icon }
+  objectType: Item
--- a/Resources/Prototypes/Recipes/Construction/storage.yml
+++ b/Resources/Prototypes/Recipes/Construction/storage.yml
@@ -196,3 +196,21 @@
  canBuildInImpassable: true
  conditions:
    - !type:WallmountCondition
+
+# ItemCabinets
+- type: construction
+  id: ShowCase
+  name: showcase
+  description: A sturdy showcase for an expensive exhibit.
+  graph: GlassBox
+  startNode: start
+  targetNode: glassBox
+  category: construction-category-storage
+  icon:
+    sprite: Structures/Storage/glassbox.rsi
+    state: icon
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1625,23 +1625,6 @@
  conditions:
    - !type:TileNotBlocked

- type: construction
-  name: airtight plastic flaps
-  id: PlasticFlapsAirtight
-  graph: PlasticFlapsGraph
-  startNode: start
-  targetNode: airtightFlaps
-  category: construction-category-structures
-  placementMode: SnapgridCenter
-  description: An airtight plastic flap to let items through and keep people out.
-  objectType: Structure
-  canBuildInImpassable: false
-  icon:
-    sprite: Structures/plastic_flaps.rsi
-    state: plasticflaps
-  conditions:
-    - !type:TileNotBlocked
-
 - type: construction
  name: opaque plastic flaps
  id: PlasticFlapsOpaque
@@ -1659,23 +1642,6 @@
  conditions:
    - !type:TileNotBlocked

- type: construction
-  name: airtight opaque plastic flaps
-  id: PlasticFlapsAirtightOpaque
-  graph: PlasticFlapsGraph
-  startNode: start
-  targetNode: airtightopaqueFlaps
-  category: construction-category-structures
-  placementMode: SnapgridCenter
-  description: An opaque, airtight plastic flap to let items through and keep people out.
-  objectType: Structure
-  canBuildInImpassable: false
-  icon:
-    sprite: Structures/plastic_flaps.rsi
-    state: plasticflaps
-  conditions:
-    - !type:TileNotBlocked
-
 - type: construction
  name: bananium clown statue
  id: StatueBananiumClown
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -135,7 +135,7 @@
    FoodBreadBun: 1
    FoodMeat: 2
    FoodCheeseSlice: 2
-    FoodChili: 1
+    FoodChiliPepper: 1
    FoodCabbage: 1
    CrayonGreen: 1
    Flare: 1
@@ -177,7 +177,7 @@
  solids:
    FoodBreadBun: 1
    FoodMeat: 1
-    FoodChili: 3
+    FoodChiliPepper: 3

 - type: microwaveMealRecipe
  id: RecipeGhostBurger
@@ -675,7 +675,7 @@
  solids:
    FoodRiceBoiled: 1
    FoodMeatCutlet: 3
-    FoodChili: 2
+    FoodChiliPepper: 2

 - type: microwaveMealRecipe
  id: RecipeEggRice
@@ -894,7 +894,7 @@
  solids:
    FoodBowlBig: 1
    FoodBungo: 2
-    FoodChili: 1
+    FoodChiliPepper: 1

 #Pies

@@ -965,7 +965,7 @@
  time: 15
  solids:
    FoodDoughPie: 1
-    FoodChilly: 3
+    FoodChillyPepper: 3
    FoodPlateTin: 1

 - type: microwaveMealRecipe
@@ -1063,7 +1063,7 @@
  solids:
    FoodDough: 1
    FoodCheeseSlice: 2
-    FoodChili: 1
+    FoodChiliPepper: 1
    FoodMeatFish: 2

 - type: microwaveMealRecipe
@@ -1511,7 +1511,7 @@
  time: 20
  solids:
    FoodBowlBig: 1
-    FoodChili: 1
+    FoodChiliPepper: 1
    FoodMeatCutlet: 1
    FoodOnionSlice: 1
    FoodTomato: 1
@@ -1544,7 +1544,7 @@
  time: 30
  solids:
    FoodBowlBig: 1
-    FoodChili: 1
+    FoodChiliPepper: 1
    FoodMeatCutlet: 1
    FoodOnionSlice: 1
    FoodTomato: 1
@@ -1559,7 +1559,7 @@
  #reagents:
    #blackpepper: 5
  solids:
-    FoodChili: 1
+    FoodChiliPepper: 1
    FoodCheeseSlice: 2

 - type: microwaveMealRecipe
@@ -1579,7 +1579,7 @@
  result: FoodMealEnchiladas
  time: 20
  solids:
-    FoodChili: 2
+    FoodChiliPepper: 2
    FoodMeatCutlet: 1
    FoodCorn: 1

@@ -1755,7 +1755,7 @@
  result: FoodMeatHawaiianKebab
  time: 5
  solids:
-    FoodChili: 1
+    FoodChiliPepper: 1
    FoodMeatCutlet: 1
    FoodPineappleSlice: 1
    FoodKebabSkewer: 1
@@ -1766,7 +1766,7 @@
  result: FoodMeatFiestaKebab
  time: 5
  solids:
-    FoodChili: 1
+    FoodChiliPepper: 1
    FoodCorn: 1
    FoodMeatCutlet: 1
    FoodTomato: 1
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
@@ -6,17 +6,11 @@
    edges:
    - to: bot
      steps:
-      - tag: BoxHug
+      - tag: HappyHonk
        icon:
-          sprite: Objects/Storage/boxes.rsi
-          state: box_hug
-        name: коробка обнимашек
-      - tag: ClownRubberStamp
-        icon:
-          sprite: Objects/Misc/stamps.rsi
-          state: stamp-clown
-        name: печать клоуна
-        doAfter: 2
+          sprite: Objects/Storage/Happyhonk/clown.rsi
+          state: box
+        name: happy honk meal
      - tag: BikeHorn
        icon:
            sprite: White/Objects/Fun/bikehorn.rsi
@@ -45,17 +39,11 @@
    edges:
    - to: bot
      steps:
-      - tag: HappyHonk
+      - tag: CluwneHappyHonk
        icon:
-          sprite: Objects/Storage/Happyhonk/clown.rsi
+          sprite: Objects/Storage/Happyhonk/cluwne.rsi
          state: box
-        name: Хэппи Хонк Мил
-      - tag: ClownRubberStamp
-        icon:
-          sprite: Objects/Misc/stamps.rsi
-          state: stamp-clown
-        name: печать клоуна
-        doAfter: 2
+        name: woeful cluwne meal
      - tag: CluwneHorn
        icon:
            sprite: White/Objects/Fun/cluwnehorn.rsi
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
@@ -0,0 +1,23 @@
+- type: constructionGraph
+  id: SupplyBot
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bot
+      steps:
+      - tag: ProximitySensor
+        icon:
+          sprite: Objects/Misc/proximity_sensor.rsi
+          state: icon
+        name: proximity sensor
+      - tag: BorgHead
+        icon:
+          sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+          state: borg_head
+        name: borg head
+        doAfter: 1
+      - material: Steel
+        amount: 10
+  - node: bot
+    entity: MobSupplyBot
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
@@ -1,34 +1,3 @@
-#- type: constructionGraph
-#  id: makeshiftstunprod
-#  start: start
-#  graph:
-#    - node: start
-#      edges:
-#        - to: msstunprod
-#          steps:
-#            - material: MetalRod
-#              amount: 1
-#            - material: Cable
-#              amount: 15
-#            - tag: DrinkSpaceGlue
-#              name: Drink Space Glue
-#              icon:
-#                sprite: Objects/Consumable/Drinks/glue-tube.rsi
-#                state: icon
-#            - tag: PowerCellSmall
-#              name: Power Cell Small
-#              icon:
-#                sprite: Objects/Power/power_cells.rsi
-#                state: small
-#            - tag: CapacitorStockPart
-#              name: Capacitor Stock Part
-#              icon:
-#                sprite: Objects/Misc/stock_parts.rsi
-#                state: capacitor
-#              doAfter: 20
-#    - node: msstunprod
-#      entity: Stunprod
-
 - type: constructionGraph
  id: makeshiftstunprod
  start: start
@@ -39,18 +8,22 @@
          steps:
            - material: MetalRod
              amount: 1
-            - material: Cable
-              amount: 15
+            - tag: PowerCellSmall
+              name: Power Cell Small
+              icon:
+                sprite: Objects/Power/power_cells.rsi
+                state: small
+            - tag: Handcuffs
+              icon:
+                sprite: Objects/Misc/cablecuffs.rsi
+                state: cuff
+                color: red
+              name: cuffs
            - tag: Igniter
              name: Igniter
              icon:
                sprite: Objects/Devices/igniter.rsi
                state: icon
-            - tag: CapacitorStockPart
-              name: Capacitor Stock Part
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
-              doAfter: 20
+              doAfter: 15
    - node: msstunprod
      entity: Stunprod
--- a/Resources/Prototypes/Recipes/Crafting/bots.yml
+++ b/Resources/Prototypes/Recipes/Crafting/bots.yml
@@ -62,3 +62,16 @@
  icon:
    sprite: Mobs/Silicon/Bots/mimebot.rsi
    state: mimebot
+
+- type: construction
+  name: supplybot
+  id: supplybot
+  graph: SupplyBot
+  startNode: start
+  targetNode: bot
+  category: construction-category-utilities
+  objectType: Item
+  description: This bot can be loaded with cargo to make deliveries.
+  icon:
+    sprite: Mobs/Silicon/Bots/supplybot.rsi
+    state: supplybot
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -217,6 +217,22 @@
    Cloth: 300
    Durathread: 100

+- type: latheRecipe
+  id: ClothingUniformJumpsuitCMOTurtle
+  result: ClothingUniformJumpsuitCMOTurtle
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtCMOTurtle
+  result: ClothingUniformJumpskirtCMOTurtle
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
 - type: latheRecipe
  id: ClothingUniformJumpsuitDetective
  result: ClothingUniformJumpsuitDetective
--- a/Resources/Prototypes/Recipes/Lathes/cooking.yml
+++ b/Resources/Prototypes/Recipes/Lathes/cooking.yml
@@ -49,6 +49,13 @@
  materials:
    Glass: 100

+- type: latheRecipe 
+  id: CustomDrinkJug 
+  result: CustomDrinkJug 
+  completetime: 2 
+  materials: 
+    Plastic: 200
+    
 - type: latheRecipe
  id: FoodPlate
  result: FoodPlate
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -114,7 +114,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -124,7 +124,7 @@
  completetime: 4
  materials:
    Steel: 150
-    Glass: 900
+    Glass: 500
    Gold: 50

 - type: latheRecipe
@@ -134,7 +134,7 @@
  completetime: 4
  materials:
    Steel: 150
-    Glass: 900
+    Glass: 500
    Gold: 50

 - type: latheRecipe
@@ -144,7 +144,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: PortableScrubberMachineCircuitBoard
@@ -153,7 +153,7 @@
  completetime: 4
  materials:
    Steel: 150
-    Glass: 900
+    Glass: 500
    Gold: 50

 - type: latheRecipe
@@ -163,7 +163,7 @@
  completetime: 4
  materials:
    Steel: 150
-    Glass: 900
+    Glass: 500
    Gold: 50

 - type: latheRecipe
@@ -173,7 +173,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: CryoPodMachineCircuitboard
@@ -182,7 +182,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -192,7 +192,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: ChemDispenserMachineCircuitboard
@@ -201,7 +201,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -211,7 +211,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -221,7 +221,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -231,7 +231,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: AutolatheMachineCircuitboard
@@ -240,7 +240,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: ProtolatheMachineCircuitboard
@@ -249,7 +249,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: AutolatheHyperConvectionMachineCircuitboard
@@ -258,7 +258,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -268,7 +268,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -277,8 +277,19 @@
  category: Circuitry
  completetime: 4
  materials:
-     Steel: 100
-     Glass: 900
+    Steel: 100
+    Glass: 500
+
+- type: latheRecipe
+  id: CircuitImprinterHyperConvectionMachineCircuitboard
+  result: CircuitImprinterHyperConvectionMachineCircuitboard
+  category: Circuitry
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 900
+    Gold: 100
+

 - type: latheRecipe
  id: ExosuitFabricatorMachineCircuitboard
@@ -287,7 +298,7 @@
  completetime: 5
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: UniformPrinterMachineCircuitboard
@@ -296,7 +307,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: VaccinatorMachineCircuitboard
@@ -305,7 +316,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -315,7 +326,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -325,17 +336,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
-     Gold: 100
-
- type: latheRecipe
-  id: TraversalDistorterMachineCircuitboard
-  result: TraversalDistorterMachineCircuitboard
-  category: Circuitry
-  completetime: 4
-  materials:
-     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -345,7 +346,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -355,7 +356,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: AnomalyVesselExperimentalCircuitboard
@@ -364,7 +365,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -384,7 +385,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: ReagentGrinderMachineCircuitboard
@@ -393,7 +394,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: HotplateMachineCircuitboard
@@ -402,7 +403,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: AnalysisComputerCircuitboard
@@ -411,7 +412,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -421,7 +422,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -431,7 +432,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -441,7 +442,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: DawInstrumentMachineCircuitboard
@@ -450,7 +451,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: StasisBedMachineCircuitboard
@@ -459,7 +460,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -469,7 +470,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: CentrifugeMachineCircuitboard
@@ -478,7 +479,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: MaterialReclaimerMachineCircuitboard
@@ -487,7 +488,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: OreProcessorMachineCircuitboard
@@ -496,7 +497,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: OreProcessorIndustrialMachineCircuitboard
@@ -505,7 +506,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -515,7 +516,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -525,7 +526,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -535,7 +536,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Bananium: 100

 - type: latheRecipe
@@ -545,7 +546,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Bananium: 100

 - type: latheRecipe
@@ -555,7 +556,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Bananium: 100

 - type: latheRecipe
@@ -565,7 +566,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -575,7 +576,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 # Power
@@ -604,7 +605,7 @@
  completetime: 4
  materials:
     Steel: 50
-     Glass: 350
+     Glass: 450

 - type: latheRecipe
  id: SMESMachineCircuitboard
@@ -613,7 +614,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: PortableGeneratorPacmanMachineCircuitboard
@@ -667,7 +668,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: SolarTrackerElectronics
@@ -685,7 +686,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: CloningConsoleComputerCircuitboard
@@ -694,7 +695,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: MicrowaveMachineCircuitboard
@@ -703,7 +704,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: ElectricGrillMachineCircuitboard
@@ -712,7 +713,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: FatExtractorMachineCircuitboard
@@ -721,7 +722,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: FlatpackerMachineCircuitboard
@@ -730,7 +731,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -740,7 +741,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: SurveillanceCameraRouterCircuitboard
@@ -749,7 +750,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: SurveillanceCameraWirelessRouterCircuitboard
@@ -758,7 +759,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: SurveillanceWirelessCameraAnchoredCircuitboard
@@ -767,7 +768,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: SurveillanceWirelessCameraMovableCircuitboard
@@ -776,7 +777,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: SurveillanceCameraMonitorCircuitboard
@@ -785,7 +786,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: SurveillanceWirelessCameraMonitorCircuitboard
@@ -794,7 +795,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: ComputerTelevisionCircuitboard
@@ -803,7 +804,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: EmitterCircuitboard
@@ -812,7 +813,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: ThrusterMachineCircuitboard
@@ -821,7 +822,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: GyroscopeMachineCircuitboard
@@ -830,7 +831,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: GasRecyclerMachineCircuitboard
@@ -839,7 +840,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: SeedExtractorMachineCircuitboard
@@ -848,7 +849,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500

 - type: latheRecipe
  id: BoozeDispenserMachineCircuitboard
@@ -857,7 +858,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: CargoTelepadMachineCircuitboard
@@ -866,7 +867,7 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
    Gold: 100

 - type: latheRecipe
@@ -876,7 +877,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: TelecomServerCircuitboard
@@ -885,7 +886,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: MassMediaCircuitboard
@@ -894,7 +895,7 @@
  completetime: 4
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: MiniGravityGeneratorCircuitboard
@@ -903,7 +904,7 @@
  completetime: 6
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -912,7 +913,7 @@
  completetime: 6
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: ShuttleGunSvalinnMachineGunCircuitboard
@@ -920,7 +921,8 @@
  completetime: 6
  materials:
     Steel: 100
-     Glass: 900
+
+     Glass: 500

 - type: latheRecipe
  id: ShuttleGunPerforatorCircuitboard
@@ -928,7 +930,7 @@
  completetime: 10
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -937,7 +939,7 @@
  completetime: 6
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500

 - type: latheRecipe
  id: ShuttleGunFriendshipCircuitboard
@@ -945,7 +947,7 @@
  completetime: 8
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 50

 - type: latheRecipe
@@ -954,7 +956,7 @@
  completetime: 12
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100

 - type: latheRecipe
@@ -963,7 +965,7 @@
  completetime: 5
  materials:
     Steel: 100
-     Glass: 900
+     Glass: 500
     Gold: 100
 
 - type: latheRecipe
@@ -972,4 +974,4 @@
  completetime: 4
  materials:
    Steel: 100
-    Glass: 900
+    Glass: 500
--- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml
+++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
@@ -18,7 +18,7 @@
  result: Bucket
  completetime: 2
  materials:
-    Steel: 100
+    Plastic: 100

 - type: latheRecipe
  id: WetFloorSign
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -126,7 +126,7 @@
  result: ClothingMaskSterile
  completetime: 2
  materials:
-    Plastic: 100
+    Plastic: 50

 - type: latheRecipe
  id: DiseaseSwab
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -30,6 +30,15 @@
    Steel: 300
    Plastic: 300

+- type: latheRecipe
+  id: CombatKnife
+  result: CombatKnife
+  category: Weapons
+  completetime: 2
+  materials:
+    Steel: 250
+    Plastic: 100
+    
 - type: latheRecipe
  id: WeaponLaserCarbine
  result: WeaponLaserCarbine
@@ -639,6 +648,17 @@
     Plastic: 100
     Glass: 20

+- type: latheRecipe
+  id: PortableRecharger
+  result: PortableRecharger
+  completetime: 15
+  materials:
+    Steel: 2000
+    Uranium: 2000
+    Plastic: 1000
+    Plasma: 500
+    Glass: 500
+
 - type: latheRecipe
  id: ClothingHandsGlovesMagnetic
  result: ClothingHandsGlovesMagnetic
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -86,6 +86,16 @@
  products:
    B52: 3

+- type: reaction
+  id: BudgetInsulsDrink
+  reactants:
+    Tequila:
+      amount: 1
+    VodkaRedBool:
+      amount: 2
+  products:
+    BudgetInsulsDrink: 3
+
 - type: reaction
  id: BlueHawaiian
  reactants:
@@ -516,6 +526,16 @@
  products:
    IcedTea: 3

+- type: reaction
+  id: IrishBool
+  reactants:
+    EnergyDrink:
+      amount: 1
+    IrishCarBomb:
+      amount: 1
+  products:
+    IrishBool: 2
+
 - type: reaction
  id: IrishCarBomb
  reactants:
@@ -794,6 +814,18 @@
  products:
    RoyRogers: 3

+- type: reaction
+  id: Rubberneck
+  reactants:
+    EnergyDrink:
+      amount: 2
+    Moonshine:
+      amount: 1
+    Sugar:
+      amount: 1
+  products:
+    Rubberneck: 4
+
 - type: reaction
  id: Sbiten
  reactants:
@@ -943,6 +975,16 @@
  products:
    VodkaMartini: 3

+- type: reaction
+  id: VodkaRedBool
+  reactants:
+    Vodka:
+      amount: 1
+    EnergyDrink:
+      amount: 2
+  products:
+    VodkaRedBool: 3
+
 - type: reaction
  id: VodkaTonic
  reactants:
@@ -963,6 +1005,18 @@
  products:
    WhiskeyCola: 3

+- type: reaction
+  id: WatermelonWakeup
+  reactants:
+    JuiceWatermelon:
+      amount: 1
+    Whiskey:
+      amount: 1
+    EnergyDrink:
+      amount: 1
+  products:
+    WatermelonWakeup: 3
+
 - type: reaction
  id: WhiteRussian
  reactants:
@@ -983,6 +1037,16 @@
  products:
    WhiskeySoda: 3

+- type: reaction
+  id: XenoBasher
+  reactants:
+    ManlyDorf:
+      amount: 2
+    EnergyDrink:
+      amount: 1
+  products:
+    XenoBasher: 3
+
 - type: reaction
  id: HotRamen
  minTemp: 323.15
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -554,11 +554,21 @@
      amount: 1
    Silicon:
      amount: 1
-    Benzene:
-      amount: 1
  products:
    Insuzine: 3
-    Ash: 1
+
+- type: reaction
+  id: Opporozidone
+  minTemp: 400 #Maybe if a method of reducing reagent temp exists one day, this could be -50
+  reactants:
+    Cognizine: 
+      amount: 1
+    Plasma:
+      amount: 2
+    Doxarubixadone:
+      amount: 1
+  products:
+    Opporozidone: 3

 - type: reaction
  id: Necrosol
@@ -585,7 +595,7 @@
    Sigynate:
      amount: 2
  products:
-    Aloxadone: 4
+      Aloxadone: 4

 - type: reaction
  id: Synthflesh
--- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
+++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
@@ -31,6 +31,7 @@

 - type: reaction
  id: ChlorineTrifluoride
+  minTemp: 370
  priority: 20
  reactants:
    Chlorine:
@@ -38,7 +39,6 @@
    Fluorine:
      amount: 3
  effects:
-  # TODO solution temperature!!
  - !type:ExplosionReactionEffect
    explosionType: Default # 15 damage per intensity.
    maxIntensity: 200