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

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/lathe.yml

@@ -25,9 +25,10 @@
     sprite: Buildings/autolathe.rsi
     layers:
     - state: autolathe
+      map: ["enum.AutolatheVisualLayers.Base"]
     - state: autolathe_unlit
       shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      map: ["enum.AutolatheVisualLayers.BaseUnlit"]
   - type: Icon
     sprite: Buildings/autolathe.rsi
     state: autolathe
@@ -56,7 +57,7 @@
       - Multitool
   - type: Appearance
     visuals:
-    - type: PowerDeviceVisualizer2D
+    - type: AutolatheVisualizer2D
 
 - type: entity
   parent: BaseLathe
@@ -67,9 +68,12 @@
     sprite: Buildings/research.rsi
     layers:
     - state: protolathe
+      map: ["enum.ProtolatheVisualLayers.Base"]
     - state: protolathe_unlit
       shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      map: ["enum.ProtolatheVisualLayers.BaseUnlit"]
+    - state: protolathe
+      map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
   - type: Icon
     sprite: Buildings/research.rsi
     state: protolathe
@@ -104,4 +108,4 @@
       type: ResearchClientBoundUserInterface
   - type: Appearance
     visuals:
-    - type: PowerDeviceVisualizer2D
+    - type: ProtolatheVisualizer2D

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

Resources/Prototypes/Entities/items/item_base.yml

@@ -11,7 +11,7 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.25,0.25,0.25"
-      mask: 26
+      mask: 0
       layer: 32
     IsScrapingFloor: true
   - type: Physics

Resources/Prototypes/Entities/mobs/human.yml

@@ -26,7 +26,7 @@
   - type: InteractionOutline
   - type: Sprite
     netsync: false
-
+    drawdepth: Mobs
     layers:
     - map: ["enum.HumanoidVisualLayers.Chest"]
       color: "#e8b59b"

Resources/Textures/Buildings/autolathe.rsi/meta.json

@@ -28,15 +28,15 @@
             "directions": 1,
             "delays": [
                 [
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055
                 ]
             ]
         },
@@ -45,20 +45,37 @@
             "directions": 1,
             "delays": [
                 [
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055
                 ]
             ]
         },
         {
-            "name": "autolathe_inserting",
+            "name": "autolathe_inserting_metal_plate",
+            "directions": 1,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "autolathe_inserting_glass_plate",
             "directions": 1,
             "delays": [
                 [
@@ -99,23 +116,6 @@
                     1.0
                 ]
             ]
-        },
-        {
-            "name": "autolathe_r",
-            "directions": 1,
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
         }
     ]
-}
+}

Resources/Textures/Buildings/research.rsi/meta.json

@@ -259,7 +259,7 @@
             ]
         },
         {
-            "name": "protolathe_n",
+            "name": "protolathe_building",
             "directions": 1,
             "delays": [
                 [
@@ -314,7 +314,7 @@
             ]
         },
         {
-            "name": "protolathe_t",
+            "name": "protolathe_open",
             "directions": 1,
             "delays": [
                 [