Merge branch 'master' into air-alarm-fixup

2022-08-23 13:21:05 -07:00
parent a8eb929d3c c4d0cddeda
commit f00a5cb17a
498 changed files with 21068 additions and 52226 deletions
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -314,7 +314,7 @@
  startNode: start
  targetNode: toilet
  category: construction-category-furniture
-  description: A human excrement flushing apparatus
+  description: A human excrement flushing apparatus.
  icon:
    sprite: Structures/Furniture/toilet.rsi
    state: closed_toilet_seat_up
--- a/Resources/Prototypes/Recipes/Construction/machines.yml
+++ b/Resources/Prototypes/Recipes/Construction/machines.yml
@@ -5,6 +5,7 @@
  startNode: start
  targetNode: computer
  category: construction-category-machines
+  description: A frame used to construct anything with a computer circuitboard.
  placementMode: SnapgridCenter
  canBuildInImpassable: false
  icon:
@@ -13,6 +14,7 @@

 - type: construction
  name: machine frame
+  description: A machine under construction. Needs more parts.
  id: MachineFrame
  graph: Machine
  startNode: start
--- a/Resources/Prototypes/Recipes/Construction/materials.yml
+++ b/Resources/Prototypes/Recipes/Construction/materials.yml
@@ -11,6 +11,7 @@

 - type: construction
  name: reinforced glass
+  description: A reinforced sheet of glass.
  id: SheetRGlass
  graph: Glass
  startNode: start
@@ -21,6 +22,7 @@

 - type: construction
  name: plasma glass
+  description: A sheet of translucent plasma.
  id: SheetPGlass
  graph: Glass
  startNode: start
@@ -31,6 +33,7 @@

 - type: construction
  name: reinforced plasma glass
+  description: A reinforced sheet of translucent plasma.
  id: SheetRPGlass
  graph: Glass
  startNode: start
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -82,7 +82,7 @@
  startNode: start
  targetNode: substation
  category: construction-category-utilities
-  description: "A wallmount substation for compact spaces. Make sure to place cable under before building the wall."
+  description: "A wallmount substation for compact spaces. Make sure to place cable underneath before building the wall."
  icon:
    sprite: Structures/Power/substation.rsi
    state: substation_wall
@@ -97,7 +97,7 @@
  startNode: start
  targetNode: generator
  category: construction-category-utilities
-  description: "A wallmount generator for compact spaces. Make sure to place cable under before building the wall."
+  description: "A wallmount generator for compact spaces. Make sure to place cable underneath before building the wall."
  icon:
    sprite: Structures/Power/Generation/wallmount_generator.rsi
    state: panel
@@ -112,7 +112,7 @@
  startNode: start
  targetNode: APU
  category: construction-category-utilities
-  description: "A wallmount APU for compact shuttles. Make sure to place cable under before building the wall."
+  description: "A wallmount APU for compact shuttles. Make sure to place cable underneath before building the wall."
  icon:
    sprite: Structures/Power/Generation/wallmount_generator.rsi
    state: panel
@@ -123,6 +123,7 @@
 # DISPOSALS
 - type: construction
  name: disposal unit
+  description: A pneumatic waste disposal unit.
  id: DisposalUnit
  graph: DisposalMachine
  startNode: start
@@ -136,11 +137,12 @@

 - type: construction
  name: mailing unit
+  description: A pneumatic mail delivery unit.
  id: MailingUnit
  graph: DisposalMachine
  startNode: start
  targetNode: mailing_unit
-  category: Utilities
+  category: construction-category-utilities
  placementMode: SnapgridCenter
  canBuildInImpassable: false
  icon:
@@ -150,6 +152,7 @@
 - type: construction
  name: disposal pipe
  id: DisposalPipe
+  description: A huge pipe segment used for constructing disposal systems.
  graph: DisposalPipe
  startNode: start
  targetNode: pipe
@@ -162,6 +165,7 @@

 - type: construction
  name: disposal tagger
+  description: A pipe that tags entities for routing.
  id: DisposalTagger
  graph: DisposalPipe
  startNode: start
@@ -175,6 +179,7 @@

 - type: construction
  name: disposal trunk
+  description: A pipe trunk used as an entry point for disposal systems.
  id: DisposalTrunk
  graph: DisposalPipe
  startNode: start
@@ -188,6 +193,7 @@

 - type: construction
  name: disposal router
+  description: A three-way router. Entities with matching tags get routed to the side.
  id: DisposalRouter
  graph: DisposalPipe
  startNode: start
@@ -201,6 +207,7 @@

 - type: construction
  name: disposal junction
+  description: A three-way junction. The arrow indicates where items exit.
  id: DisposalJunction
  graph: DisposalPipe
  startNode: start
@@ -214,6 +221,7 @@

 - type: construction
  name: disposal Y junction
+  description: A three-way junction with another exit point.
  id: DisposalYJunction
  graph: DisposalPipe
  startNode: start
@@ -227,6 +235,7 @@

 - type: construction
  name: disposal bend
+  description: A tube bent at a 90 degree angle.
  id: DisposalBend
  graph: DisposalPipe
  startNode: start
@@ -294,6 +303,7 @@
 - type: construction
  name: gas pipe half
  id: GasPipeHalf
+  description: Half of a gas pipe. No skateboards.
  graph: GasPipe
  startNode: start
  targetNode: half
@@ -307,6 +317,7 @@
 - type: construction
  name: gas pipe straight
  id: GasPipeStraight
+  description: A straight pipe segment.
  graph: GasPipe
  startNode: start
  targetNode: straight
@@ -320,6 +331,7 @@
 - type: construction
  name: gas pipe bend
  id: GasPipeBend
+  description: A pipe segment bent at a 90 degree angle.
  graph: GasPipe
  startNode: start
  targetNode: bend
@@ -333,6 +345,7 @@
 - type: construction
  name: gas pipe T junction
  id: GasPipeTJunction
+  description: A pipe segment with a T junction.
  graph: GasPipe
  startNode: start
  targetNode: tjunction
@@ -346,6 +359,7 @@
 - type: construction
  name: gas pipe fourway
  id: GasPipeFourway
+  description: A pipe segment with a fourway junction.
  graph: GasPipe
  startNode: start
  targetNode: fourway
@@ -359,6 +373,7 @@
 # ATMOS UNARY
 - type: construction
  name: air vent
+  description: Pumps gas into the room.
  id: GasVentPump
  graph: GasUnary
  startNode: start
@@ -374,6 +389,7 @@

 - type: construction
  name: passive vent
+  description: Unpowered vent that equalises gases on both sides.
  id: GasPassiveVent
  graph: GasUnary
  startNode: start
@@ -389,6 +405,7 @@

 - type: construction
  name: air scrubber
+  description: Sucks gas into connected pipes.
  id: GasVentScrubber
  graph: GasUnary
  startNode: start
@@ -404,6 +421,7 @@

 - type: construction
  name: air injector
+  description: Injects air into the atmosphere.
  id: GasOutletInjector
  graph: GasUnary
  startNode: start
@@ -421,6 +439,7 @@
 - type: construction
  name: gas pump
  id: GasPressurePump
+  description: A pump that moves gas by pressure.
  graph: GasBinary
  startNode: start
  targetNode: pressurepump
@@ -435,6 +454,7 @@

 - type: construction
  name: volumetric gas pump
+  description: A pump that moves gas by volume.
  id: GasVolumePump
  graph: GasBinary
  startNode: start
@@ -451,6 +471,7 @@
 - type: construction
  id: GasPassiveGate
  name: passive gate
+  description: A one-way air valve that does not require power.
  graph: GasBinary
  startNode: start
  targetNode: passivegate
@@ -466,6 +487,7 @@
 - type: construction
  id: GasValve
  name: manual valve
+  description: A pipe with a valve that can be used to disable the flow of gas through it.
  graph: GasBinary
  startNode: start
  targetNode: valve
@@ -481,6 +503,7 @@
 - type: construction
  id: GasPort
  name: connector port
+  description: For connecting portable devices related to atmospherics control.
  graph: GasBinary
  startNode: start
  targetNode: port
@@ -496,6 +519,7 @@
 - type: construction
  id: GasDualPortVentPump
  name: dual-port air vent
+  description: Has a valve and a pump attached to it. There are two ports, one is an input for releasing air, the other is an output when siphoning.
  graph: GasBinary
  startNode: start
  targetNode: dualportventpump
@@ -512,6 +536,7 @@
 - type: construction
  id: GasFilter
  name: gas filter
+  description: Very useful for filtering gases.
  graph: GasTrinary
  startNode: start
  targetNode: filter
@@ -527,6 +552,7 @@
 - type: construction
  id: GasMixer
  name: gas mixer
+  description: Very useful for mixing gases.
  graph: GasTrinary
  startNode: start
  targetNode: mixer
@@ -542,6 +568,7 @@
 - type: construction
  id: PressureControlledValve
  name: pneumatic valve
+  description: Valve controlled by pressure.
  graph: GasTrinary
  startNode: start
  targetNode: pneumaticvalve
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -364,9 +364,9 @@
  time: 10
  reagents:
    Water: 10
+    Egg: 6
  solids:
    Nettle: 1
-    FoodEgg: 1
    FoodPotato: 1

 - type: microwaveMealRecipe
--- a/Resources/Prototypes/Recipes/Crafting/crates.yml
+++ b/Resources/Prototypes/Recipes/Crafting/crates.yml
@@ -5,7 +5,7 @@
  startNode: start
  targetNode: cratelivestock
  category: construction-category-storage
-  description: "A wooden crate for holding livestock"
+  description: A wooden crate for holding livestock.
  icon: Structures/Storage/Crates/livestock.rsi/livestockcrate.png
  objectType: Structure

@@ -16,7 +16,7 @@
  startNode: start
  targetNode: crategenericsteel
  category: construction-category-storage
-  description: "A metal crate for storing things"
+  description: A metal crate for storing things.
  icon: Structures/Storage/Crates/generic.rsi/crate_icon.png
  objectType: Structure

@@ -27,6 +27,6 @@
  startNode: start
  targetNode: crateplastic
  category: construction-category-storage
-  description: "A plastic crate for storing things"
+  description: A plastic crate for storing things.
  icon: Structures/Storage/Crates/plastic.rsi/plasticcrate_icon.png
  objectType: Structure
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -67,7 +67,7 @@
  graph: flowercrown
  startNode: start
  targetNode: flowercrown
-  category: Misc
+  category: construction-category-misc
  description: "A coronet of fresh and fragrant flowers."
  icon:
    sprite: Clothing/Head/Misc/flower-crown.rsi
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -629,3 +629,35 @@
    Cloth: 300
    Durathread: 300

+- type: latheRecipe
+  id: ClothingOuterWinterMusician
+  icon:
+    sprite: Clothing/OuterClothing/WinterCoats/coatnomi.rsi
+    state: icon
+  result: ClothingOuterWinterMusician
+  completetime: 3.2
+  materials:
+    Cloth: 300
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterWinterClown
+  icon:
+    sprite: Clothing/OuterClothing/WinterCoats/coatclown.rsi
+    state: icon
+  result: ClothingOuterWinterClown
+  completetime: 3.2
+  materials:
+    Cloth: 300
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterWinterMime
+  icon:
+    sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi
+    state: icon
+  result: ClothingOuterWinterMime
+  completetime: 3.2
+  materials:
+    Cloth: 300
+    Durathread: 300