Merge branch 'master' into 2020-03-03-g-g-g-g-g-g-g-g-ghooooosts

Resources/Prototypes/Entities/buildings/chem_dispenser.yml

@@ -10,6 +10,7 @@
     texture: Buildings/chemicals.rsi/industrial_dispenser.png
   - type: ReagentDispenser
     pack: ChemDispenserStandardInventory
+  - type: PowerDevice
 
 - type: reagentDispenserInventory
   id: ChemDispenserStandardInventory

Resources/Prototypes/Entities/buildings/instruments.yml

@@ -1,70 +1,70 @@
-# - type: entity
-#   name: BaseInstrument
-#   id: BaseInstrument
-#   abstract: true
-#   components:
-#   - type: Instrument
-#     handheld: false
-#
-#   - type: Clickable
-#   - type: InteractionOutline
-#
-#   - type: Collidable
-#     shapes:
-#     - !type:PhysShapeAabb
-#       layer: 31
-#
-#   - type: SnapGrid
-#     offset: Center
-#
-#   - type: Damageable
-#   - type: Destructible
-#     thresholdvalue: 50
-#
-#   - type: UserInterface
-#     interfaces:
-#     - key: enum.InstrumentUiKey.Key
-#       type: InstrumentBoundUserInterface
-#
-# - type: entity
-#   name: Piano
-#   parent: BaseInstrument
-#   id: PianoInstrument
-#   description: Play Needles Piano Now.
-#   components:
-#   - type: Instrument
-#     program: 1
-#   - type: Sprite
-#     sprite: Objects/Instruments/musician.rsi
-#     state: piano
-#   - type: Icon
-#     sprite: Objects/Instruments/musician.rsi
-#     state: piano
-#
-# - type: entity
-#   name: Minimoog
-#   parent: BaseInstrument
-#   id: MinimoogInstrument
-#   components:
-#   - type: Instrument
-#     program: 7
-#   - type: Sprite
-#     sprite: Objects/Instruments/musician.rsi
-#     state: minimoog
-#   - type: Icon
-#     sprite: Objects/Instruments/musician.rsi
-#     state: minimoog
-#
-# - type: entity
-#   name: Xylophone
-#   parent: BaseInstrument
-#   id: XylophoneInstrument
-#   components:
-#   - type: Instrument
-#     program: 13
-#   - type: Sprite
-#     sprite: Objects/Instruments/musician.rsi
-#     state: xylophone
-#   - type: Icon
-#     sprite: Objects/Instruments/musician.rsi
-#     state: xylophone
+ - type: entity
+   name: BaseInstrument
+   id: BaseInstrument
+   abstract: true
+   components:
+   - type: Instrument
+     handheld: false
+
+   - type: Clickable
+   - type: InteractionOutline
+
+   - type: Collidable
+     shapes:
+     - !type:PhysShapeAabb
+       layer: 31
+
+   - type: SnapGrid
+     offset: Center
+
+   - type: Damageable
+   - type: Destructible
+     thresholdvalue: 50
+
+   - type: UserInterface
+     interfaces:
+     - key: enum.InstrumentUiKey.Key
+       type: InstrumentBoundUserInterface
+
+ - type: entity
+   name: Piano
+   parent: BaseInstrument
+   id: PianoInstrument
+   description: Play Needles Piano Now.
+   components:
+   - type: Instrument
+     program: 1
+   - type: Sprite
+     sprite: Objects/Instruments/musician.rsi
+     state: piano
+   - type: Icon
+     sprite: Objects/Instruments/musician.rsi
+     state: piano
+
+ - type: entity
+   name: Minimoog
+   parent: BaseInstrument
+   id: MinimoogInstrument
+   components:
+   - type: Instrument
+     program: 7
+   - type: Sprite
+     sprite: Objects/Instruments/musician.rsi
+     state: minimoog
+   - type: Icon
+     sprite: Objects/Instruments/musician.rsi
+     state: minimoog
+
+ - type: entity
+   name: Xylophone
+   parent: BaseInstrument
+   id: XylophoneInstrument
+   components:
+   - type: Instrument
+     program: 13
+   - type: Sprite
+     sprite: Objects/Instruments/musician.rsi
+     state: xylophone
+   - type: Icon
+     sprite: Objects/Instruments/musician.rsi
+     state: xylophone

Resources/Prototypes/Entities/buildings/medical_scanner.yml

@@ -11,7 +11,7 @@
       map: ["enum.MedicalScannerVisualLayers.Machine"]
     - state: scanner_terminal_blue
       map: ["enum.MedicalScannerVisualLayers.Terminal"]
-
+  - type: PowerDevice
   - type: Icon
     sprite: Buildings/medical_scanner.rsi
     state: scanner_open