Merge branch 'master' into replace-sounds-with-sound-specifier

Resources/Prototypes/Recipes/Construction/Graphs/windoor.yml

@@ -0,0 +1,221 @@
+- type: constructionGraph
+  id: windoor
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: assembly
+      completed:
+      - !type:SetAnchor
+        value: false
+      steps:
+      - material: Steel
+        amount: 4
+        doAfter: 2
+    - to: assemblySecure
+      completed:
+      - !type:SetAnchor
+        value: false
+      steps:
+      - material: Plasteel
+        amount: 4
+        doAfter: 2
+
+  - node: assembly
+    entity: WindoorAssembly
+    actions:
+    - !type:SnapToGrid {}
+    - !type:SetAnchor {}
+    edges:
+    - to: glass
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: Glass
+        amount: 5
+        doAfter: 1
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 4
+      - !type:DeleteEntity {}
+      steps:
+      - tool: Welding
+        doAfter: 2
+
+  - node: glass
+    entity: WindoorAssembly
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+    - to: assembly
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetGlass1
+        amount: 5
+      - !type:DeleteEntity { }
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: wired
+    entity: WindoorAssembly
+    edges:
+    - to: electronics
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 1
+    - to: glass
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 1
+
+  - node: electronics
+    entity: WindoorAssembly
+    edges:
+    - to: windoor
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: windoor
+    entity: Windoor
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:AirlockBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:ContainerNotEmpty # TODO ShadowCommander: Remove when map gets updated
+        container: board
+      completed:
+      - !type:EmptyAllContainers {}
+      steps:
+      - tool: Prying
+        doAfter: 1
+
+  - node: assemblySecure
+    entity: WindoorAssemblySecure
+    actions:
+    - !type:SnapToGrid { }
+    - !type:SetAnchor { }
+    edges:
+    - to: glassSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: ReinforcedGlass
+        amount: 5
+        doAfter: 1
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetPlasteel1
+        amount: 4
+      - !type:DeleteEntity { }
+      steps:
+      - tool: Welding
+        doAfter: 10
+
+  - node: glassSecure
+    entity: WindoorAssemblySecure
+    edges:
+    - to: wiredSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+    - to: assemblySecure
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetRGlass1
+        amount: 5
+      - !type:DeleteEntity { }
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+
+  - node: wiredSecure
+    entity: WindoorAssemblySecure
+    edges:
+    - to: electronicsSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 1
+    - to: glassSecure
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 3
+
+  - node: electronicsSecure
+    entity: WindoorAssemblySecure
+    edges:
+    - to: windoorSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+  - node: windoorSecure
+    entity: WindoorSecure
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:AirlockBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:ContainerNotEmpty # TODO ShadowCommander: Remove when map gets updated
+        container: board
+      completed:
+      - !type:EmptyAllContainers {}
+      steps:
+      - tool: Prying
+        doAfter: 4

Resources/Prototypes/Recipes/Construction/structures.yml

@@ -125,7 +125,7 @@
   canRotate: false
 
 - type: construction
-  name: Firelock
+  name: firelock
   id: Firelock
   graph: Firelock
   startNode: start
@@ -142,7 +142,7 @@
     - !type:TileNotBlocked {}
 
 - type: construction
-  name: Catwalk
+  name: catwalk
   id: Catwalk
   graph: Catwalk
   startNode: start
@@ -164,7 +164,7 @@
   canBuildInImpassable: false
 
 - type: construction
-  name: Wooden Barricade
+  name: wooden barricade
   id: Barricade
   graph: barricade
   startNode: start
@@ -181,7 +181,7 @@
     - !type:TileNotBlocked {}
 
 - type: construction
-  name: Airlock
+  name: airlock
   id: airlock
   graph: airlock
   startNode: start
@@ -196,3 +196,37 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked {}
+
+- type: construction
+  name: windoor
+  id: windoor
+  graph: windoor
+  startNode: start
+  targetNode: windoor
+  category: Structures
+  description: It opens, it closes, and you can see through it!
+  icon:
+    sprite: Structures/Doors/Windoors/windoor.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked {}
+
+- type: construction
+  name: secure windoor
+  id: secureWindoor
+  graph: windoor
+  startNode: start
+  targetNode: windoorSecure
+  category: Structures
+  description: It opens, it closes, and you can see through it! This one looks tough.
+  icon:
+    sprite: Structures/Doors/Windoors/windoor.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked {}

Resources/Prototypes/Recipes/Lathes/electronics.yml

@@ -24,3 +24,21 @@
   materials:
      Steel: 50
      Glass: 50
+
+- type: latheRecipe
+  id: CloningPodMachineCircuitboard
+  icon: Objects/Misc/module.rsi/id_mod.png
+  result: CloningPodMachineCircuitboard
+  completetime: 1000
+  materials:
+     Steel: 100
+     Glass: 100
+
+- type: latheRecipe
+  id: MedicalScannerMachineCircuitboard
+  icon: Objects/Misc/module.rsi/id_mod.png
+  result: MedicalScannerMachineCircuitboard
+  completetime: 1000
+  materials:
+     Steel: 100
+     Glass: 100

Resources/Prototypes/Recipes/Reactions/chemicals.yml

@@ -227,3 +227,31 @@
       amount: 1
   products:
     Fluorosurfactant: 5
+    
+- type: reaction
+  id: Meth
+  reactants:
+    Ephedrine:
+      amount: 1
+    Carbon:
+      amount: 1
+    Iodine:
+      amount: 1
+    Phosphorus:
+     amount: 1
+  products:
+    Meth: 4 #I kinda remember having to heat this up, and if you heated it up too much, it went boom, I can't remember the specific values tho.
+    
+- type: reaction
+  id: Ephedrine
+  reactants:
+    Oil:
+      amount: 1
+    Hydrogen:
+      amount: 1
+    Sugar:
+      amount: 1
+    Diethylamine:
+     amount: 1
+  products:
+    Ephedrine: 4