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

Resources/Prototypes/Body/Mechanisms/human.yml

@@ -50,18 +50,30 @@
     compatibility: Biological
 
 - type: entity
-  id: OrganHumanHeart
+  id: OrganHumanTongue
   parent: BaseHumanOrgan
-  name: heart
-  description: "I feel bad for the heartless bastard who lost this."
+  name: tongue
+  description: "A fleshy muscle mostly used for lying."
   components:
   - type: Sprite
-    state: heart-on
+    state: tongue
+  - type: Mechanism
+    size: 1
+    compatibility: Biological
+
+- type: entity
+  id: OrganHumanAppendix
+  parent: BaseHumanOrgan
+  name: appendix
+  components:
+  - type: Sprite
+    layers:
+    - state: appendix
+    - state: appendix-inflamed
+      visible: false
   - type: Mechanism
     size: 1
     compatibility: Biological
-    behaviors:
-    - !type:HeartBehavior {}
 
 - type: entity
   id: OrganHumanEars
@@ -91,6 +103,105 @@
     behaviors:
     - !type:LungBehavior {}
 
+- type: entity
+  id: OrganHumanHeart
+  parent: BaseHumanOrgan
+  name: heart
+  description: "I feel bad for the heartless bastard who lost this."
+  components:
+  - type: Sprite
+    state: heart-on
+  - type: Mechanism
+    size: 1
+    compatibility: Biological
+    behaviors:
+    - !type:HeartBehavior {}
+  # The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs.
+  # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
+  # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
+  - type: Metabolizer
+    metabolisms:
+      Arithrazine:
+        effects:
+        - !type:HealthChange
+          damageClass: Toxin
+          healthChange: -1
+        - !type:HealthChange
+          damageClass: Brute
+          healthChange: 0.5
+      Bicaridine:
+        effects:
+        - !type:HealthChange
+          damageClass: Brute
+          healthChange: -2
+      Dermaline:
+        effects:
+        - !type:HealthChange
+          damageClass: Burn
+          healthChange: -3
+      Dexalin:
+        effects:
+        - !type:HealthChange
+          damageClass: Airloss
+          healthChange: -1
+      DexalinPlus:
+        effects:
+        - !type:HealthChange
+          damageClass: Airloss
+          healthChange: -3
+      Dylovene:
+        effects:
+          - !type:HealthChange
+            damageClass: Toxin
+            healthChange: -1
+      Ephedrine:
+        effects:
+          - !type:MovespeedModifier
+            walkSpeedModifier: 1.2
+            sprintSpeedModifier: 1.2
+      HeartbreakerToxin:
+        effects:
+        - !type:HealthChange
+          damageClass: Airloss
+          healthChange: 4
+      Kelotane:
+        effects:
+          - !type:HealthChange
+            damageClass: Burn
+            healthChange: -1
+      Lexorin:
+        effects:
+        - !type:HealthChange
+          damageClass: Airloss
+          healthChange: 7
+      Meth:
+        effects:
+          - !type:HealthChange
+            healthChange: 2.5
+            damageClass: Toxin
+          - !type:MovespeedModifier
+            walkSpeedModifier: 1.3
+            sprintSpeedModifier: 1.3
+      Omnizine:
+        effects:
+        - !type:HealthChange
+          healthChange: -2
+          damageClass: Burn
+        - !type:HealthChange
+          healthChange: -2
+          damageClass: Toxin
+        - !type:HealthChange
+          healthChange: -2
+          damageClass: Airloss
+        - !type:HealthChange
+          healthChange: -2
+          damageClass: Brute
+      Synaptizine:
+        effects:
+          - !type:HealthChange
+            damageClass: Toxin
+            healthChange: 0.5
+
 - type: entity
   id: OrganHumanStomach
   parent: BaseHumanOrgan
@@ -108,6 +219,93 @@
       digestionDelay: 20
   - type: SolutionContainer
     maxVol: 250
+  # The stomach metabolizes stuff like foods and drinks.
+  # TODO: Have it work off of the ent's solution container, and move this
+  # to intestines instead.
+  - type: Metabolizer # Release me from this hell called 1 reagent for every drink
+    # TODO please make every drink their own base thing
+    metabolisms:
+      Flour:
+        effects:
+        - !type:SatiateHunger
+      JuiceApple:
+        effects:
+        - !type:SatiateThirst
+      JuiceBerry:
+        effects:
+        - !type:SatiateThirst
+      JuiceBanana:
+        effects:
+        - !type:SatiateThirst
+      JuiceCarrot:
+        effects:
+        - !type:SatiateThirst
+      JuiceLime:
+        effects:
+        - !type:SatiateThirst
+      JuiceLemon:
+        effects:
+        - !type:SatiateThirst
+      JuiceGrape:
+        effects:
+        - !type:SatiateThirst
+      JuiceOrange:
+        effects:
+        - !type:SatiateThirst
+      JuiceTomato:
+        effects:
+        - !type:SatiateThirst
+      JuiceBerryPoison:
+        effects:
+        - !type:SatiateThirst
+        - !type:HealthChange
+          damageClass: Toxin
+          healthChange: 1
+      JuiceWatermelon:
+        effects:
+        - !type:SatiateThirst
+      JuicePineapple:
+        effects:
+        - !type:SatiateThirst
+      Nutriment:
+        effects:
+        - !type:SatiateHunger
+      Water:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 2
+      Coffee:
+        effects:
+        - !type:SatiateThirst
+      Tea:
+        effects:
+        - !type:SatiateThirst
+      Milk:
+        effects:
+        - !type:SatiateThirst
+      SpoiledMilk:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: -2
+      MilkSoy:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 2 # soyboys stay winning
+      MilkOat:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 2 # oatboys stay winning
+      Cola:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 0.5 # sodaboys stay losing
+      ThirteenLoko:
+        effects:
+        - !type:SatiateThirst
+          hydrationFactor: 2
+        - !type:HealthChange
+          damageClass: Toxin
+          healthChange: 1
 
 - type: entity
   id: OrganHumanLiver
@@ -120,12 +318,17 @@
   - type: Mechanism
     size: 1
     compatibility: Biological
-    behaviors:
-    - !type:LiverBehavior
-      alcoholLethality: 0.005
-      alcoholExponent: 1.6
-      toxinTolerance: 3
-      toxinLethality: 0.01
+  - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
+    metabolisms: # TODO add the rest of alcohol
+      CreamyDelight:
+        effects:
+        - !type:SatiateThirst
+      Lean:
+        effects:
+        - !type:SatiateThirst
+      LeanShine: # who added this?
+        effects:
+        - !type:SatiateThirst
 
 - type: entity
   id: OrganHumanKidneys
@@ -141,28 +344,4 @@
     size: 1
     compatibility: Biological
 
-- type: entity
-  id: OrganHumanTongue
-  parent: BaseHumanOrgan
-  name: tongue
-  description: "A fleshy muscle mostly used for lying."
-  components:
-  - type: Sprite
-    state: tongue
-  - type: Mechanism
-    size: 1
-    compatibility: Biological
 
-- type: entity
-  id: OrganHumanAppendix
-  parent: BaseHumanOrgan
-  name: appendix
-  components:
-  - type: Sprite
-    layers:
-      - state: appendix
-      - state: appendix-inflamed
-        visible: false
-  - type: Mechanism
-    size: 1
-    compatibility: Biological

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -131,6 +131,10 @@
         prob: 1
       - id: ClothingMaskSterile
         prob: 1
+      - id: ClothingHeadHelmetHardsuitMedical
+        prob: 1
+      - id: ClothingOuterHardsuitMedical
+        prob: 1
 
 - type: entity
   id: LockerResearchDirectorFilled

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -32,3 +32,37 @@
           prob: 0.6
         - id: ClothingOuterSuitFire
           prob: 0.75
+
+- type: entity
+  id: ClosetMaintenanceFilledRandom
+  suffix: Filled, Random
+  parent: ClosetMaintenance
+  components:
+    - type: StorageFill
+      contents:
+        - id: lantern
+          prob: 0.66
+        - id: Wirecutter
+          prob: 0.44
+        - id: Screwdriver
+          prob: 0.44
+        - id: Wrench
+          prob: 0.44
+        - id: Crowbar
+          prob: 0.44
+        - id: Welder
+          prob: 0.44
+        - id: Multitool
+          prob: 0.44
+        - id: Soap
+          prob: 0.44
+        - id: PlushieCarp
+          prob: 0.2
+        - id: PlushieSlime
+          prob: 0.2
+        - id: PlushieSnake
+          prob: 0.2
+        - id: ClothingHandsGlovesColorYellow
+          prob: 0.33
+        - id: ClothingBeltUtility
+          prob: 0.33

Resources/Prototypes/Catalog/Fills/Lockers/service.yml

@@ -84,3 +84,7 @@
         prob: 0.8
       - id: TomatoSeeds
         prob: 1
+      - id: ClothingUniformOveralls
+        prob: 1
+      - id: ClothingHeadHatTrucker
+        prob: 0.1

Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml

@@ -9,6 +9,7 @@
   - Fluorine
   - Glucose
   - Hydrogen
+  - Iodine
   - Iron
   - Lithium
   - Mercury
@@ -25,3 +26,4 @@
   - SulfuricAcid
   - Uranium
   - Water
+

Resources/Prototypes/Catalog/Research/technologies.yml

@@ -241,6 +241,8 @@
     - FirelockElectronics
     - DoorElectronics
     - APCElectronics
+    - CloningPodMachineCircuitboard
+    - MedicalScannerMachineCircuitboard
 
 # Bluespace Theory Technology Tree
 

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -23,7 +23,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretEngineering
-  name: engineering beret 
+  name: engineering beret
   description: A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety.
   components:
   - type: Sprite
@@ -360,3 +360,14 @@
     sprite: Clothing/Head/Hats/xmascrown.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/xmascrown.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatTrucker
+  name: truckers hat
+  description: Formerly Chucks, this hat is yours now.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/truckershat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/truckershat.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -571,3 +571,14 @@
     sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformOveralls
+  name: overalls
+  description: Great for working outdoors.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/overalls.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/overalls.rsi

Resources/Prototypes/Entities/Markers/clientsideclone.yml

@@ -4,5 +4,4 @@
   abstract: true
   components:
   - type: Sprite
-  - type: Physics
   - type: AnimationPlayer

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -68,7 +68,7 @@
     currentTemperature: 310.15
     specificHeat: 42
     tempDamageCoefficient: 0.1
-  - type: Metabolism
+  - type: Respirator
     metabolismHeat: 5000
     radiatedHeat: 400
     implicitHeatRegulation: 5000

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -38,7 +38,7 @@
       0: !type:NormalMobState {}
       150: !type:CriticalMobState {}
       200: !type:DeadMobState {}
-  - type: Metabolism
+  - type: Respirator
   - type: UnarmedCombat
     range: 1.5
     arcwidth: 0

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -168,7 +168,7 @@
     preset: HumanPreset
   - type: Damageable
     damageContainer: biologicalDamageContainer
-  - type: Metabolism
+  - type: Respirator
     metabolismHeat: 5000
     radiatedHeat: 400
     implicitHeatRegulation: 5000

Resources/Prototypes/Entities/Mobs/Species/vox.yml

@@ -84,7 +84,7 @@
   - type: Body
     template: HumanoidTemplate
     preset: VoxPreset
-  - type: Metabolism
+  - type: Respirator
     needsGases:
       Nitrogen: 0.00060763888
     producesGases:

Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml

@@ -11,7 +11,6 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 20
-    trash: BowlBigTrash
   - type: Sprite
     sprite: Objects/Consumable/Food/bowl.rsi
     netsync: false

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -28,3 +28,32 @@
           Amount: 2
           DefaultPrototype: Beaker
           ExamineName: Glass Beaker
+
+- type: entity
+  id: CloningPodMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: Cloning Pod (Machine Board)
+  components:
+    - type: MachineBoard
+      prototype: CloningPod
+      requirements:
+        ScanningModule: 2
+        Manipulator: 2
+      materialRequirements:
+        Glass: 1
+        Cable: 1
+
+- type: entity
+  id: MedicalScannerMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: Medical Scanner (Machine Board)
+  components:
+    - type: MachineBoard
+      prototype: MedicalScanner
+      requirements:
+        ScanningModule: 1
+        Manipulator: 1
+        Laser: 1
+      materialRequirements:
+        Glass: 1
+        Cable: 1

Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml

@@ -92,6 +92,16 @@
       - plasma
       - plasma_2
       - plasma_3
+  - type: SolutionContainer
+    caps: 1
+    contents:
+      reagents:
+      - ReagentId: Plasma
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Grindable
+    - Sheet
 
 - type: entity
   parent: SheetPlasma

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml

@@ -38,16 +38,16 @@
       - SmallImpassable
   - type: Door
     board: DoorElectronics
+    openSound:
+      path: /Audio/Machines/airlock_open.ogg
+    closeSound:
+      path: /Audio/Machines/airlock_close.ogg
+    denySound:
+      path: /Audio/Machines/airlock_deny.ogg
   - type: Airlock
   - type: Appearance
     visuals:
     - type: AirlockVisualizer
-      open_sound:
-        path: /Audio/Machines/airlock_open.ogg
-      close_sound:
-        path: /Audio/Machines/airlock_close.ogg
-      deny_sound:
-        path: /Audio/Machines/airlock_deny.ogg
     - type: WiresVisualizer
   - type: ApcPowerReceiver
   - type: Wires

Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml

@@ -2,19 +2,19 @@
   parent: Airlock
   id: AirlockExternal
   suffix: External
-  description: "It opens, it closes, it might crush you, and there might be only space behind it.\nHas to be manually activated."
+  description: It opens, it closes, it might crush you, and there might be only space behind it. Has to be manually activated.
   components:
   - type: Door
     bumpOpen: false
+    openSound:
+      path: /Audio/Machines/airlock_ext_open.ogg
+    closeSound:
+      path: /Audio/Machines/airlock_ext_close.ogg
+    denySound:
+      path: /Audio/Machines/airlock_deny.ogg
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/external.rsi
   - type: Appearance
     visuals:
     - type: AirlockVisualizer
-      open_sound: 
-        path: /Audio/Machines/airlock_ext_open.ogg
-      close_sound:
-        path: /Audio/Machines/airlock_ext_close.ogg
-      deny_sound:
-        path: /Audio/Machines/airlock_deny.ogg
     - type: WiresVisualizer

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -54,17 +54,17 @@
       startOpen: true
       bumpOpen: false
       inhibitCrush: false
+      openSound:
+        path: /Audio/Machines/airlock_open.ogg
+      closeSound:
+        path: /Audio/Machines/airlock_close.ogg
+      denySound:
+        path: /Audio/Machines/airlock_deny.ogg
     - type: Firelock
     - type: Appearance
       visuals:
         - type: AirlockVisualizer
-          open_sound:
-            path: /Audio/Machines/airlock_open.ogg
-          close_sound:
-            path: /Audio/Machines/airlock_close.ogg
-          deny_sound:
-            path: /Audio/Machines/airlock_deny.ogg
-          animation_time: 0.6
+          animationTime: 0.6
         - type: WiresVisualizer
     - type: Wires
       BoardName: "Firelock Control"
@@ -113,7 +113,7 @@
       fixtures:
       - shape:
           !type:PhysShapeRect
-          bounds: "0.49,-0.49,-0.49,-0.2" # don't want this colliding with walls or they won't close
+          bounds: "-0.2,-0.49,-0.49,0.49" # don't want this colliding with walls or they won't close
         mask:
           - MobImpassable
         layer:

Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml

@@ -0,0 +1,76 @@
+- type: entity
+  id: WindoorAssembly
+  name: windoor assembly
+  description: It opens, it closes, and you can see through it!
+  parent: BaseStructure
+  components:
+  - type: InteractionOutline
+  - type: Sprite
+    netsync: false
+    drawdepth: FloorObjects
+    sprite: Structures/Doors/Windoors/windoor.rsi
+    layers:
+    - state: assembly
+  - type: Physics
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.2,-0.49,-0.49,0.49"
+      mass: 30
+      mask:
+      - Impassable
+      - VaultImpassable
+  - type: Anchorable
+  - type: Pullable
+  - type: Rotatable
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 3
+  - type: Construction
+    graph: windoor
+    node: assembly
+  placement:
+    mode: SnapgridCenter
+
+- type: entity
+  id: WindoorAssemblySecure
+  name: secure windoor assembly
+  description: It opens, it closes, and you can see through it! This one looks tough.
+  parent: WindoorAssembly
+  components:
+  - type: Sprite
+    netsync: false
+    drawdepth: Mobs
+    sprite: Structures/Doors/Windoors/windoor.rsi
+    layers:
+    - state: secure_underlay
+    - state: assembly
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 600
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 1
+            max: 2
+  - type: Construction
+    graph: windoor
+    node: assemblySecure
+

Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml

@@ -0,0 +1,135 @@
+- type: entity
+  id: BaseWindoor
+  parent: BaseStructure
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: InteractionOutline
+  - type: Physics
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.2,-0.49,-0.49,0.49"
+      mass: 50
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      mask:
+      - VaultImpassable
+  - type: Sprite
+    netsync: false
+    drawdepth: FloorObjects
+    sprite: Structures/Doors/Windoors/windoor.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+    - state: closed_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseUnlit"]
+    - state: welded
+      map: ["enum.DoorVisualLayers.BaseWelded"]
+    - state: bolted_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseBolted"]
+    - state: panel_open
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: ApcPowerReceiver
+  - type: Damageable
+    resistances: glassResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 2
+          SheetSteel1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: AccessReader
+  - type: Airlock
+    openPanelVisible: true
+  - type: Door
+    weldable: false
+    openSound:
+      path: /Audio/Machines/windoor_open.ogg
+    closeSound:
+      path: /Audio/Machines/windoor_open.ogg
+    denySound:
+      path: /Audio/Machines/airlock_deny.ogg
+  - type: Wires
+    BoardName: "Windoor Control"
+    LayoutId: Airlock
+  - type: UserInterface
+    interfaces:
+    - key: enum.WiresUiKey.Key
+      type: WiresBoundUserInterface
+  - type: Appearance
+    visuals:
+      - type: AirlockVisualizer
+        animationTime: 0.9
+        denyAnimationTime: 0.4
+        animatedPanel: false
+        openUnlitVisible: true
+      - type: WiresVisualizer
+  - type: Construction
+    graph: windoor
+    node: windoor
+
+- type: entity
+  id: BaseSecureWindoor
+  parent: BaseWindoor
+  abstract: true
+  components:
+  - type: Airtight
+    fixVacuum: true
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+  - type: Sprite
+    netsync: false
+    drawdepth: FloorObjects
+    sprite: Structures/Doors/Windoors/windoor.rsi
+    layers:
+    - state: secure_underlay
+    - state: closed
+      map: [ "enum.DoorVisualLayers.Base" ]
+    - state: closed_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+    - state: welded
+      map: [ "enum.DoorVisualLayers.BaseWelded" ]
+    - state: bolted_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseBolted" ]
+    - state: panel_open
+      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 400
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 2
+          SheetPlasteel1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: windoor
+    node: windoorSecure

Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml

@@ -0,0 +1,66 @@
+- type: entity
+  id: Windoor
+  parent: BaseWindoor
+  name: windoor
+  description: It's a window and a sliding door. Wow!
+
+- type: entity
+  id: WindoorSecure
+  parent: BaseSecureWindoor
+  name: secure windoor
+  description: It's a sturdy window and a sliding door. Wow!
+
+# TODO remove these with parameterized prototypes/whatever we end up doing
+# Bar windoor
+- type: entity
+  parent: Windoor
+  id: WindoorBarLocked
+  suffix: Bar, Locked
+  components:
+  - type: AccessReader
+    access: [["Bar"]]
+
+# Chemistry windoor
+- type: entity
+  parent: WindoorSecure
+  id: WindoorMedicalLocked
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    access: [["Medical"]]
+
+# Science windoor
+- type: entity
+  parent: WindoorSecure
+  id: WindoorScienceLocked
+  suffix: Science, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"]]
+
+# HOP's office windoor
+- type: entity
+  parent: WindoorSecure
+  id: WindoorCommandLocked
+  suffix: Command, Locked
+  components:
+  - type: AccessReader
+    access: [["Command"]]
+
+# Cargo windoor
+- type: entity
+  parent: Windoor
+  id: WindoorCargoLocked
+  suffix: Cargo, Locked
+  components:
+  - type: AccessReader
+    access: [["Cargo"]]
+
+# Security windoor
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecurityLocked
+  suffix: Security, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"]]

Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml

@@ -23,6 +23,25 @@
       - Opaque
       mask:
       - MobMask
+  - type: Construction
+    graph: machine
+    node: machine
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:ChangeConstructionNodeBehavior
+        node: machineFrame
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Machine
+    board: CloningPodMachineCircuitboard
+  - type: MaterialStorage
+  - type: Wires
+    BoardName: "CloningPod"
+    LayoutId: CloningPod
   - type: Appearance
     visuals:
       - type: CloningPodVisualizer

Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml

@@ -25,6 +25,9 @@
     - shape:
         !type:PhysShapeAabb
           bounds: "-1.5,-1.5,1.5,1.5"
+      mass: 500
+      mask:
+      - Impassable
       layer:
       - Opaque
       - Impassable

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -166,6 +166,8 @@
       - FirelockElectronics
       - DoorElectronics
       - APCElectronics
+      - CloningPodMachineCircuitboard
+      - MedicalScannerMachineCircuitboard
       - Bucket
       - MopItem
       - SprayBottle

Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml

@@ -14,6 +14,25 @@
       map: ["enum.MedicalScannerVisualLayers.Machine"]
     - state: idle_unlit
       map: ["enum.MedicalScannerVisualLayers.Terminal"]
+  - type: Construction
+    graph: machine
+    node: machine
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:ChangeConstructionNodeBehavior
+        node: machineFrame
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Machine
+    board: MedicalScannerMachineCircuitboard
+  - type: MaterialStorage
+  - type: Wires
+    BoardName: "MedicalScanner"
+    LayoutId: MedicalScanner
   - type: Appearance
     visuals:
     - type: MedicalScannerVisualizer

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml

@@ -33,11 +33,14 @@
       state: pipeStraight
       map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
     - state: pumpPressure
+      map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.PressurePumpVisualizer+Layers.Enabled" ]
   - type: Appearance
     visuals:
+    - type: SubFloorShowLayerVisualizer
     - type: PipeConnectorVisualizer
     - type: PipeColorVisualizer
     - type: PressurePumpVisualizer
+      disabledState: pumpPressure
       enabledState: pumpPressureOn
   - type: GasPressurePump
 
@@ -57,6 +60,12 @@
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpVolume
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasVolumePump
 
 - type: entity
@@ -75,6 +84,12 @@
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpPassiveGate
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasPassiveGate
 
 - type: entity
@@ -94,6 +109,12 @@
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpPassiveGate
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasValve
     - type: NodeContainer
       nodes:
@@ -118,6 +139,12 @@
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasCanisterPort
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasPort
     - type: NodeContainer
       nodes:
@@ -142,9 +169,10 @@
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
-          map: ["enum.VentVisualLayers.Vent"]
+          map: [ "enum.VentVisualLayers.Vent", "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
     - type: Appearance
       visuals:
+        - type: SubFloorShowLayerVisualizer
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
         - type: VentPumpVisualizer

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml

@@ -33,6 +33,7 @@
   - type: NodeContainer
   - type: AtmosUnsafeUnanchor
   - type: AtmosPipeColor
+  - type: SubFloorHide
 
 #Note: The PipeDirection of the PipeNode should be the south-facing version, because the entity starts at an angle of 0 (south)
 

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml

@@ -38,6 +38,15 @@
           state: pipeTJunction
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasFilter
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.GasFilterVisualizer+Layers.Enabled" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
+        - type: GasFilterVisualizer
+          disabledState: gasFilter
+          enabledState: gasFilterOn
     - type: GasFilter
 
 - type: entity
@@ -57,6 +66,12 @@
           state: pipeTJunction
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasFilter
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasMixer
       inletOne: inlet
       inletTwo: filter

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml

@@ -29,9 +29,10 @@
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
-          map: ["enum.VentVisualLayers.Vent"]
+          map: [ "enum.VentVisualLayers.Vent", "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
     - type: Appearance
       visuals:
+        - type: SubFloorShowLayerVisualizer
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
         - type: VentPumpVisualizer
@@ -54,8 +55,10 @@
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
+          map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
     - type: Appearance
       visuals:
+        - type: SubFloorShowLayerVisualizer
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
     - type: GasPassiveVent
@@ -76,9 +79,10 @@
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: scrub_off
-          map: ["enum.ScrubberVisualLayers.Scrubber"]
+          map: [ "enum.ScrubberVisualLayers.Scrubber", "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
     - type: Appearance
       visuals:
+        - type: SubFloorShowLayerVisualizer
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
         - type: ScrubberVisualizer
@@ -93,18 +97,24 @@
   placement:
     mode: SnapgridCenter
   components:
-    - type: GasOutletInjector
+
     # TODO ATMOS: Actual sprite for this.
     - type: Sprite
       netsync: false
       layers:
         - state: pipeHalf
           sprite: Structures/Piping/Atmospherics/pipe.rsi
-          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe", "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
+    - type: Appearance
+      visuals:
+        - type: SubFloorShowLayerVisualizer
+        - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
+    - type: GasOutletInjector
 
 - type: entity
-  parent: GasUnaryBase
-  id: GasThermoMachineBase
+  parent: BaseMachinePowered
+  id: BaseGasThermoMachine
   name: thermomachine
   description: Heats or cools gas in connected pipes.
   abstract: true
@@ -117,10 +127,19 @@
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
     - type: GasThermoMachine
+    - type: AtmosPipeColor
+    - type: AtmosDevice
+    - type: NodeContainer
+      nodes:
+        pipe:
+          !type:PipeNode
+          nodeGroupID: Pipe
+          pipeDirection: South
 
 - type: entity
-  parent: GasThermoMachineBase
+  parent: BaseGasThermoMachine
   id: GasThermoMachineFreezer
   name: freezer
   placement:
@@ -129,18 +148,22 @@
     - type: Sprite
       layers:
         - state: freezer_off
+          map: [ "enum.ThermoMachineVisualizer+Layers.Enabled" ]
         - state: pipe
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
         - type: ThermoMachineVisualizer
+          disabledState: freezer_off
           enabledState: freezer_on
     - type: GasThermoMachine
       mode: Freezer
       minTemperature: 73.15
 
 - type: entity
-  parent: GasThermoMachineBase
+  parent: BaseGasThermoMachine
   id: GasThermoMachineHeater
   name: heater
   placement:
@@ -149,11 +172,15 @@
     - type: Sprite
       layers:
         - state: heater_off
+          map: [ "enum.ThermoMachineVisualizer+Layers.Enabled" ]
         - state: pipe
+          map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
+        - type: PipeColorVisualizer
         - type: ThermoMachineVisualizer
+          disabledState: heater_off
           enabledState: heater_on
     - type: GasThermoMachine
       mode: Heater

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: ContainmentFieldGenerator
   name: containment field generator
-  description: A machine that generates a containment field when powered by an emitter.\nKeeps the Singularity docile.
+  description: A machine that generates a containment field when powered by an emitter. Keeps the Singularity docile.
   placement:
     mode: SnapgridCenter
   components:

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: Singularity
   name: gravitational singularity
-  description: A mesmerizing swirl of darkness that sucks in everything.\nIf it's moving towards you, run.
+  description: A mesmerizing swirl of darkness that sucks in everything. If it's moving towards you, run.
   components:
   - type: Clickable
   - type: Physics

Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml

@@ -1,73 +0,0 @@
-- type: entity
-  abstract: true
-  id: GasCanister
-  name: gas canister
-  description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench.
-  parent: BaseStructureDynamic
-  components:
-  - type: InteractionOutline
-  - type: Sprite
-    netsync: false
-    sprite: Structures/Storage/canister.rsi
-    state: grey
-  - type: Appearance
-    visuals:
-      - type: GasPortableVisualizer
-        stateConnected: can-connector
-      - type: GasCanisterVisualizer
-        insertedTankState: can-open
-        pressureStates:
-          - can-o0
-          - can-o1
-          - can-o2
-          - can-o3
-  - type: UserInterface
-    interfaces:
-      - key: enum.GasCanisterUiKey.Key
-        type: GasCanisterBoundUserInterface
-  - type: Destructible
-    thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 300
-        behaviors:
-          - !type:PlaySoundBehavior
-            sound:
-              path: /Audio/Effects/metalbreak.ogg
-          - !type:SpawnEntitiesBehavior
-            spawn:
-              GasCanisterBrokenBase:
-                min: 1
-                max: 1
-          - !type:DoActsBehavior
-            acts: [ "Destruction" ]
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Physics
-    bodyType: Dynamic
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-      mass: 25
-      mask:
-        - MobImpassable
-      layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
-        - VaultImpassable
-  - type: AtmosDevice
-    requireAnchored: false
-  - type: ContainerContainer
-    containers:
-      GasCanisterTankHolder: !type:ContainerSlot {}
-  - type: NodeContainer
-    nodes:
-      port:
-        !type:PortablePipeNode
-        nodeGroupID: Pipe
-        rotationsEnabled: false
-        volume: 1
-  - type: GasPortable
-  - type: GasCanister

Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml

@@ -1,3 +1,77 @@
+- type: entity
+  abstract: true
+  id: GasCanister
+  name: gas canister
+  description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench.
+  parent: BaseStructureDynamic
+  components:
+    - type: InteractionOutline
+    - type: Sprite
+      netsync: false
+      sprite: Structures/Storage/canister.rsi
+      state: grey
+    - type: Appearance
+      visuals:
+        - type: GasPortableVisualizer
+          stateConnected: can-connector
+        - type: GasCanisterVisualizer
+          insertedTankState: can-open
+          pressureStates:
+            - can-o0
+            - can-o1
+            - can-o2
+            - can-o3
+    - type: UserInterface
+      interfaces:
+        - key: enum.GasCanisterUiKey.Key
+          type: GasCanisterBoundUserInterface
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 300
+          behaviors:
+            - !type:PlaySoundBehavior
+              sound: /Audio/Effects/metalbreak.ogg
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                GasCanisterBrokenBase:
+                  min: 1
+                  max: 1
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+    - type: Damageable
+      resistances: metallicResistances
+    - type: Physics
+      bodyType: Dynamic
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+            bounds: "-0.25,-0.25,0.25,0.25"
+          mass: 25
+          mask:
+            - MobImpassable
+          layer:
+            - Opaque
+            - MobImpassable
+            - SmallImpassable
+            - VaultImpassable
+    - type: AtmosDevice
+      requireAnchored: false
+      joinSystem: true
+    - type: ContainerContainer
+      containers:
+        GasCanisterTankHolder: !type:ContainerSlot {}
+    - type: NodeContainer
+      nodes:
+        port:
+          !type:PortablePipeNode
+          nodeGroupID: Pipe
+          rotationsEnabled: false
+          volume: 1
+    - type: GasPortable
+    - type: GasCanister
+
 - type: entity
   parent: GasCanister
   id: StorageCanister

Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml

@@ -103,3 +103,16 @@
     visuals:
     - type: StorageVisualizer
       state: bio_jan
+
+# Maintenance closet
+- type: entity
+  id: ClosetMaintenance
+  name: maintenance closet 
+  parent: ClosetBase
+  description: It's a storage unit.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state_open: generic_open
+      state_closed: generic_door

Resources/Prototypes/Entities/Structures/Storage/morgue.yml

@@ -56,6 +56,18 @@
   name: morgue tray
   description: If you lay down to have a rest on this, you'll soon have a problem.
   components:
+  - type: Physics
+    bodyType: Static
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
+        mass: 25
+        mask:
+          - Impassable
+          - MobImpassable
+          - VaultImpassable
+          - SmallImpassable
   - type: Sprite
     netsync: false
     sprite: Structures/Storage/morgue.rsi

Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml

@@ -183,9 +183,6 @@
   desc: A combination of cream, wine and moonshine. Why would you do this?
   physicalDesc: foul
   color: "#a6969a"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: Lean
@@ -193,9 +190,6 @@
   desc: Turn up for days.
   physicalDesc: bubbly
   color: "#9400D3"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: LeanShine
@@ -203,8 +197,3 @@
   desc: Lean mixed with moonshine. Turn up for months.
   physicalDesc: bubbly
   color: "#9d5fb8"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
-
-  

Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml

@@ -4,9 +4,6 @@
   desc: A drink made from brewed coffee beans. Contains a moderate amount of caffeine.
   physicalDesc: aromatic
   color: "#664300"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: Tea
@@ -14,9 +11,6 @@
   desc: A drink made by boiling leaves of the tea tree, Camellia sinensis.
   physicalDesc: aromatic
   color: "#8a5a3a"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: Cream
@@ -24,9 +18,6 @@
   desc: The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?
   physicalDesc: creamy
   color: "#DFD7AF"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: Milk
@@ -34,9 +25,6 @@
   desc: An opaque white liquid produced by the mammary glands of mammals.
   physicalDesc: opaque
   color: "#DFDFDF"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
   plantMetabolism:
     - !type:AdjustNutrition
       amount: 0.1
@@ -49,9 +37,6 @@
   desc: This milk has gone rancid.
   physicalDesc: putrid
   color: "#faffba"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: MilkSoy
@@ -59,9 +44,6 @@
   desc: Surprisingly tasty.
   physicalDesc: refreshing
   color: "#302000"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: MilkOat
@@ -69,6 +51,3 @@
   desc: Surprisingly tasty.
   physicalDesc: refreshing
   color: "#302000"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1

Resources/Prototypes/Reagents/Consumable/Drink/juice.yml

@@ -4,9 +4,6 @@
   desc: It's a little piece of Eden.
   physicalDesc: crisp
   color: "#FDAD01"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceBerry
@@ -14,9 +11,6 @@
   desc: A delicious blend of several different kinds of berries.
   physicalDesc: sweet
   color: "#660099"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceBanana
@@ -24,9 +18,6 @@
   desc: The raw essence of a banana. HONK.
   physicalDesc: crisp
   color: "#FFE777"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 #TODO: port on_mob_life: restore eyesight
 #if(..())
@@ -45,9 +36,6 @@
   desc: It's like a carrot, but less crunchy.
   physicalDesc: crisp
   color: "#FF8820"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceLime
@@ -55,9 +43,6 @@
   desc: The sweet-sour juice of limes.
   physicalDesc: citric
   color: "#99bb43"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceLemon
@@ -65,9 +50,6 @@
   desc: This juice is VERY sour.
   physicalDesc: citric
   color: "#fff690"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceGrape
@@ -75,9 +57,6 @@
   desc: Freshly squeezed juice from red grapes. Quite sweet.
   physicalDesc: crisp
   color: "#512284"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 # /datum/reagent/drink/orangejuice/on_mob_life(var/mob/living/M)
 
@@ -93,9 +72,6 @@
   desc: Both delicious AND rich in Vitamin C. What more do you need?
   physicalDesc: citric
   color: "#E78108"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceTomato
@@ -103,9 +79,6 @@
   desc: Tomatoes made into juice. What a waste of good tomatoes, huh?
   physicalDesc: saucey
   color: "#731008"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 # /datum/reagent/drink/poisonberryjuice/on_mob_life(var/mob/living/M)
 
@@ -120,9 +93,6 @@
   desc: A surprisingly tasty juice blended from various kinds of very deadly and toxic berries.
   physicalDesc: aromatic #maybe should be 'sickly'?
   color: "#6600CC"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuiceWatermelon
@@ -130,9 +100,6 @@
   desc: The delicious juice of a watermelon.
   physicalDesc: sweet
   color: "#EF3520"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 - type: reagent
   id: JuicePineapple
@@ -140,9 +107,6 @@
   desc: The delicious juice of a pineapple.
   physicalDesc: tropical
   color: yellow
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
 
 # - type: reagent
 #   id: PotatoJuice
@@ -150,6 +114,3 @@
 #   desc: Juice of the potato. Bleh.
 #   physicalDesc: starchy
 #   color: "#302000"
-#   metabolism:
-#     - !type:DefaultDrink
-#       rate: 1

Resources/Prototypes/Reagents/Consumable/Drink/soda.yml

@@ -4,9 +4,6 @@
   desc: A sweet, carbonated soft drink. Caffeine free.
   physicalDesc: fizzy
   color: "#422912"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
   plantMetabolism:
     - !type:AdjustNutrition
       amount: 0.1
@@ -21,12 +18,6 @@
   desc: A highly processed liquid substance barely-passing intergalatic health standarts for a soft drink.
   physicalDesc: fizzy
   color: "#deb928"
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
-    - !type:HealthChangeMetabolism 
-      healthChange: 2
-      damageClass: Toxin
   plantMetabolism:
     - !type:AdjustNutrition
       amount: 0.1

Resources/Prototypes/Reagents/Consumable/Food/condiments.yml

@@ -4,9 +4,6 @@
   desc: The sweetness of a thousand sugars but none of the calories.
 #  physicalDesc:
   color: aquamarine
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: BbqSauce
@@ -14,9 +11,6 @@
   desc: Hand wipes not included.
   physicalDesc: Gloopy.
   color: darkred
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Cornoil
@@ -24,9 +18,6 @@
   desc: Corn oil, A delicious oil used in cooking. Made from corn.
 #  physicalDesc:
   color: yellow
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Frostoil
@@ -34,9 +25,6 @@
   desc: Leaves the tongue numb in its passage.
 #  physicalDesc:
   color: skyblue
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: HorseradishSauce
@@ -44,9 +32,6 @@
   desc: Smelly horseradish sauce.
   physicalDesc: Overpowering.
   color: gray
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Hotsauce
@@ -54,9 +39,6 @@
   desc: Burns so good.
 #  physicalDesc:
   color: red
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Ketchup
@@ -64,9 +46,6 @@
   desc: Made from pureed tomatoes and flavored with spices.
 #  physicalDesc:
   color: red
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Soysauce
@@ -74,6 +53,3 @@
   desc: A salty soy-based flavoring.
 #  physicalDesc:
   color: saddlebrown
-  metabolism:
-    - !type:DefaultFood
-      rate: 1

Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml

@@ -4,9 +4,6 @@
   desc: Used for baking.
   physicalDesc: powdery
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Oats
@@ -14,18 +11,12 @@
   desc: Used for a variety of tasty purposes.
   physicalDesc: coarse
   color: tan
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Enzyme
   name: universal enzyme
   desc: Used in cooking various dishes.
   color: "#009900"
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Egg
@@ -33,9 +24,6 @@
   desc: Used for baking.
   physicalDesc: mucus-like
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Sugar
@@ -43,9 +31,6 @@
   desc: Tasty spacey sugar!
   physicalDesc:
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Salt
@@ -53,9 +38,6 @@
   desc: Salt. From space oceans, presumably.
   physicalDesc: Coarse.
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Blackpepper
@@ -63,33 +45,21 @@
   desc: Often used to flavor food or make people sneeze.
   physicalDesc: Grainy.
   color: black
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Vinegar
   name: vinegar
   desc: Often used to flavor food.
   color: tan
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: Rice
   name: rice
   desc: Hard, small white grains.
   color: white
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
 
 - type: reagent
   id: OilOlive
   name: olive oil
   desc: Viscous and fragrant.
   color: olive
-  metabolism:
-    - !type:DefaultFood
-      rate: 1

Resources/Prototypes/Reagents/chemicals.yml

@@ -89,9 +89,6 @@
   desc: All the vitamins, minerals, and carbohydrates the body needs in pure form.
   physicalDesc: opaque
   color: "#664330"
-  metabolism:
-    - !type:DefaultFood
-      rate: 1
   plantMetabolism:
     - !type:AdjustNutrition
       amount: 1
@@ -180,7 +177,7 @@
       amount: 10
     - !type:AdjustHealth
       amount: -5
-      
+
 - type: reagent
   id: SulfuricAcid
   name: sulfuric acid
@@ -218,9 +215,6 @@
   color: "#c0e0ff20"
   boilingPoint: 100.0
   meltingPoint: 0.0
-  metabolism:
-    - !type:DefaultDrink
-      rate: 1
   tileReactions:
     - !type:ExtinguishTileReaction {}
     - !type:SpillIfPuddlePresentTileReaction {}
@@ -228,13 +222,40 @@
     - !type:AdjustWater
       amount: 1
 
+- type: reagent
+  id: Meth
+  name: meth
+  desc: Methamphetamine, more commonly know as meth, is a potent stimulant, with dangerous side-effects if too much is consumed.
+  physicalDesc: translucent
+  color: "#FAFAFA"
+  boilingPoint: 212.0 #Meth vape when?
+  meltingPoint: 170.0
+
+- type: reagent
+  id: Iodine
+  name: iodine
+  desc: Commonly added to table salt as a nutrient. On its own it tastes far less pleasing.
+  physicalDesc: Dark Brown
+  color: "#BC8A00"
+  boilingPoint: 184.3
+  meltingPoint: 113.7
+
+- type: reagent
+  id: Ephedrine
+  name: ephedrine
+  desc: Increases stun resistance and movement speed, giving you hand cramps. Overdose deals toxin damage and inhibits breathing
+  physicalDesc: Bone white
+  color: "#D2FFFA"
+  boilingPoint: 255.0
+  meltingPoint: 36.0
+
 - type: reagent
   id: Oil
   name: oil
   desc: Used by chefs to cook.
   physicalDesc: oily
   color: "#b67823"
-  boilingPoint: 300.0 
+  boilingPoint: 300.0
   meltingPoint: -16.0
   tileReactions:
     - !type:FlammableTileReaction {}

Resources/Prototypes/Reagents/medicine.yml

@@ -18,10 +18,6 @@
   desc: A broad-spectrum anti-toxin, which treats toxin damage in the blood stream. Overdosing will cause vomiting, dizzyness and pain.
   physicalDesc: translucent
   color: "#3a1d8a"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -1
-      damageClass: Toxin
   plantMetabolism:
     - !type:AdjustToxins
       amount: -10
@@ -34,13 +30,6 @@
   desc: A slightly unstable medication used for the most extreme any serious case of radiation poisoning. Lowers radiation level at over twice the rate Hyronalin does and will heal toxin damage at the same time. Deals very minor brute damage to the patient over time, but the patient's body will typically out-regenerate it easily.
   physicalDesc: cloudy
   color: "#bd5902"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -1
-      damageClass: Toxin #I think you need multiple of these components for different types of damage so I'll maybe change it to work better in the future 
-    - !type:HealthChangeMetabolism 
-      healthChange: 0.5
-      damageClass: Brute
 
 - type: reagent
   id: Bicaridine
@@ -48,10 +37,6 @@
   desc: An analgesic which is highly effective at treating brute damage. It is useful for stabilizing people who have been severely beaten, as well as treating less life-threatening injuries. In the case of bleeding (internal or external), bicaridine will slow down the bleeding heavily. If the dosage exceeds the overdose limit, it'll stop it outright.
   physicalDesc: opaque
   color: "#ffaa00"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Brute
 
 - type: reagent
   id: Cryoxadone
@@ -90,10 +75,6 @@
   desc: An advanced chemical that is more effective at treating burn damage than Kelotane.
   physicalDesc: translucent
   color: "#215263"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -3
-      damageClass: Burn
 
 - type: reagent
   id: Dexalin
@@ -101,21 +82,13 @@
   desc: Used for treating oxygen deprivation. In most cases where it is likely to be needed, the strength of Dexalin Plus will probably be more useful (Results in 1 unit instead of 2).
   physicalDesc: opaque
   color: "#0041a8"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -1
-      damageClass: Airloss #this may be asphyxiation
-      
+
 - type: reagent
   id: DexalinPlus
   name: dexalin plus
   desc: Used in treatment of extreme cases of oxygen deprivation. Even a single unit immediately counters all oxygen loss, which is hugely useful in many circumstances. Any dose beyond this will continue to counter oxygen loss until it is metabolized, essentially removing the need to breathe.
   physicalDesc: cloudy
   color: "#4da0bd"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -3
-      damageClass: Airloss
 
 - type: reagent
   id: Ethylredoxrazine
@@ -165,10 +138,6 @@
   desc: Treats burn damage and prevents infection.
   physicalDesc: strong-smelling
   color: "#bf3d19"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -1
-      damageClass: Burn
 
 - type: reagent
   id: Leporazine
@@ -201,7 +170,7 @@
 - type: reagent
   id: Paroxetine
   name: paroxetine
-  desc: Prevents hallucination, but has a 10% chance of causing intense hallucinations.  
+  desc: Prevents hallucination, but has a 10% chance of causing intense hallucinations.
   physicalDesc: acrid
   color: "#fffbad"
 
@@ -225,11 +194,6 @@
   desc: Toxic, but treats hallucinations, drowsiness & halves the duration of paralysis, stuns and knockdowns. It is metabolized very slowly. One unit is enough to treat hallucinations; two units is deadly.
   physicalDesc: pungent
   color: "#d49a2f"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: 0.67
-      damageClass: Toxin
-      rate: 0.2 
 
 - type: reagent
   id: Tramadol
@@ -289,10 +253,6 @@
   plantMetabolism:
     - !type:AdjustToxins
       amount: 10
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: 1
-      damageClass: Airloss
 
 - type: reagent
   id: Impedrezene
@@ -307,10 +267,6 @@
   desc: Temporarily stops respiration and causes tissue damage. Large doses are fatal, and will cause people to pass out very quickly. Dexalin and Dexalin Plus will both remove it, however.
   physicalDesc: pungent
   color: "#6b0007"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: 7
-      damageClass: Airloss
 
 - type: reagent
   id: Lipozine
@@ -356,24 +312,10 @@
   desc: Pure THC oil, extracted from the leaves of the cannabis plant. Much stronger than in it's natural form and can be used to numb chronic pain in patients.
   physicalDesc: skunky
   color: "#DAA520"
-  
+
 - type: reagent
   id: Omnizine
   name: Omnizine
   desc: A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that it's origins remain a mystery because knowing the secrets of its production would render most commercial pharmaceuticals obsolete.
   physicalDesc: soothing
   color: "#fcf7f9"
-  metabolism:
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Burn
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Toxin
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Airloss
-    - !type:HealthChangeMetabolism 
-      healthChange: -2
-      damageClass: Brute
-

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