Merge branch 'master' into 2020-04-28-tool-component

Resources/Prototypes/Entities/Buildings/gravity_generator.yml

@@ -0,0 +1,36 @@
+- type: entity
+  id: GravityGenerator
+  name: Gravity Generator
+  description: It's what keeps you to the floor.
+  components:
+    - type: Sprite
+      sprite: Buildings/gravity_generator.rsi
+      layers:
+        - state: on
+        - sprite: Buildings/gravity_generator_core.rsi
+          state: activated
+          shader: unshaded
+    - type: Icon
+      sprite: Buildings/gravity_generator.rsi
+      state: on
+    - type: SnapGrid
+      offset: Center
+    - type: PowerDevice
+      load: 500
+    - type: Collidable
+      shapes:
+        - !type:PhysShapeAabb
+          bounds: "-1.5,-1.5,1.5,1.5"
+          layer: 15
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Damageable
+    - type: Breakable
+      threshold: 150
+    - type: GravityGenerator
+    - type: UserInterface
+      interfaces:
+        - key: enum.GravityGeneratorUiKey.Key
+          type: GravityGeneratorBoundUserInterface
+  placement:
+    mode: AlignTileAny

Resources/Prototypes/Entities/Buildings/medical_scanner.yml

@@ -36,7 +36,6 @@
   - type: Appearance
     visuals:
     - type: MedicalScannerVisualizer2D
-  - type: PowerDevice
   - type: UserInterface
     interfaces:
     - key: enum.MedicalScannerUiKey.Key

Resources/Prototypes/Entities/Items/Clothing/belts.yml

@@ -21,6 +21,7 @@
     state: utilitybelt
   - type: Clothing
     Size: 50
+    QuickEquip: false
     sprite: Clothing/belt_utility.rsi
   - type: Storage
     Capacity: 40 # Full tool loadout is 35, plus an extra

Resources/Prototypes/Entities/Items/Consumables/food.yml

@@ -90,7 +90,7 @@
 #  name: Ambrosia vulgar is crushed
 #  parent: FoodBase
 #  id: FoodAmbrosiaVulgarIsCrushed
-#  description: 
+#  description:
 #  components:
 #  - type: Food
 #    uses: 1
@@ -137,7 +137,7 @@
 #  name: Bacon
 #  parent: FoodBase
 #  id: FoodBacon
-#  description: 
+#  description:
 #  components:
 #  - type: Food
 #    uses: 1
@@ -182,7 +182,7 @@
   name: Bread (slice)
   parent: FoodBase
   id: FoodBreadSlice
-  description: 
+  description:
   components:
   - type: Food
     contents:
@@ -199,7 +199,7 @@
   name: Banana bread (slice)
   parent: FoodBase
   id: FoodBananaBreadSlice
-  description: 
+  description:
   components:
   - type: Food
     contents:
@@ -233,7 +233,7 @@
 #  name: Bear meat
 #  parent: FoodBase
 #  id: FoodBearMeat
-#  description: 
+#  description:
 #  components:
 #  - type: Food
 #    uses: 1
@@ -612,7 +612,7 @@
 #  name: Cocoa
 #  parent: FoodBase
 #  id: FoodCocoa
-#  description: 
+#  description:
 #  components:
 #  - type: Food
 #    uses: 1
@@ -1482,19 +1482,21 @@
   - type: Icon
     sprite: Objects/Food/loadedbakedpotato.rsi
 
-#- type: entity
-#  parent: FoodBase
-#  id: FoodMeat
-#  name: Meat
-#  description: ''
-#  components:
-#  - type: Food
-#    uses: 1
-#    restore_amount: 1
-#  - type: Sprite
-#    sprite: Objects/Food/meat.rsi
-#  - type: Icon
-#    sprite: Objects/Food/meat.rsi
+- type: entity
+  parent: FoodBase
+  id: FoodMeat
+  name: Meat
+  description: A slab of meat.
+  components:
+  - type: Food
+    contents:
+      reagents:
+      - ReagentId: chem.Nutriment
+        Quantity: 5
+  - type: Sprite
+    sprite: Objects/Food/meat.rsi
+  - type: Icon
+    sprite: Objects/Food/meat.rsi
 
 - type: entity
   parent: FoodBase
@@ -2835,19 +2837,21 @@
   - type: Icon
     sprite: Objects/Food/xenobreadslice.rsi
 
-#- type: entity
-#  parent: FoodBase
-#  id: FoodXenomeat
-#  name: Xenomeat
-#  description: ''
-#  components:
-#  - type: Food
-#    uses: 1
-#    restore_amount: 1
-#  - type: Sprite
-#    sprite: Objects/Food/xenomeat.rsi
-#  - type: Icon
-#    sprite: Objects/Food/xenomeat.rsi
+- type: entity
+  parent: FoodBase
+  id: FoodXenomeat
+  name: Xenomeat
+  description: Yum.
+  components:
+  - type: Food
+    contents:
+      reagents:
+      - ReagentId: chem.Nutriment
+        Quantity: 20
+  - type: Sprite
+    sprite: Objects/Food/xenomeat.rsi
+  - type: Icon
+    sprite: Objects/Food/xenomeat.rsi
 
 - type: entity
   parent: FoodBase
@@ -2865,3 +2869,20 @@
     sprite: Objects/Food/xenomeatpie.rsi
   - type: Icon
     sprite: Objects/Food/xenomeatpie.rsi
+
+- type: entity
+  parent: FoodBase
+  id: DisgustingSweptSoup
+  name: Salty Sweet Miso Cola Soup
+  description: Jesus christ.
+  components:
+  - type: Food
+    contents:
+      reagents:
+      - ReagentId: chem.Bleach
+        Quantity: 15
+    spawn_on_finish: TrashSnackBowl
+  - type: Sprite
+    sprite: Objects/Food/stew.rsi
+  - type: Icon
+    sprite: Objects/Food/stew.rsi

Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml

@@ -0,0 +1,22 @@
+- type: entity
+  parent: BaseItem
+  id: ReagentContainerFlour
+  name: Flour
+  description: Not to be confused with flower.
+  components:
+  - type: Solution
+    maxVol: 50
+    contents:
+      reagents:
+      - ReagentId: chem.Flour
+        Quantity: 50
+  - type: Pourable
+    transferAmount: 5
+  - type: Drink
+    despawn_empty: true
+  - type: Sprite
+    sprite: Objects/Food/flour.rsi
+    state: icon
+  - type: Icon
+    sprite: Objects/Food/flour.rsi
+    state: icon

Resources/Prototypes/Entities/Items/Instruments.yml

@@ -23,6 +23,18 @@
   - type: Icon
     texture: Objects/Instruments/musician.rsi/h_synthesizer.png
 
+- type: entity
+  name: Acoustic Guitar
+  parent: BaseHandheldInstrument
+  id: AcousticGuitarInstrument
+  components:
+  - type: Instrument
+    program: 25
+  - type: Sprite
+    texture: Objects/Instruments/musician.rsi/guitar.png
+  - type: Icon
+    texture: Objects/Instruments/musician.rsi/guitar.png
+
 - type: entity
   name: Violin
   parent: BaseHandheldInstrument

Resources/Prototypes/Entities/Items/bike_horn.yml

@@ -20,6 +20,7 @@
   - type: Sound
   - type: EmitSoundOnUse
     sound: /Audio/items/bikehorn.ogg
+    variation: 0.2
 
   - type: UseDelay
     delay: 0.5

Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml

@@ -42,6 +42,3 @@
   - type: Item
     Size: 24
     sprite: Objects/Guns/SMGs/c20r.rsi
-  - type: Item
-    Size: 24
-    sprite: Objects/Guns/SMGs/wt550.rsi

Resources/Prototypes/Entities/janitor.yml

@@ -34,7 +34,6 @@
     drawdepth: Objects
   - type: Icon
     texture: Objects/Janitorial/mopbucket.png
-  - type: Clickable
   - type: InteractionOutline
   - type: Bucket
   - type: Sound
@@ -51,7 +50,6 @@
   - type: Physics
     mass: 5
     Anchored: false
-  - type: Sound
 
 - type: entity
   parent: BaseItem

Resources/Prototypes/Entities/kitchen.yml

@@ -0,0 +1,40 @@
+- type: entity
+  id: KitchenMicrowave
+  name: Microwave
+  description: It's magic.
+  components:
+  - type: Microwave
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Solution
+    maxVol: 100
+    caps: 1
+  - type: Appearance
+    visuals:
+    - type: MicrowaveVisualizer
+  - type: Sound
+  - type: UserInterface
+    interfaces:
+    - key: enum.MicrowaveUiKey.Key
+      type: MicrowaveBoundUserInterface
+
+
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.25,-0.4,0.25,0.4"
+      layer: 15
+    IsScrapingFloor: true
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Kitchen/microwave.rsi
+    layers:
+    - state: mw0
+      map: ["enum.MicrowaveVisualizerLayers.Base"]
+    - state: mw_unlit
+      shader: unshaded
+      map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
+  - type: PowerDevice
+  - type: Icon
+    sprite: Objects/Kitchen/microwave.rsi
+    state: mw0