Merge branch 'master' into kitchen

Resources/Prototypes/Entities/Buildings/airlock_types.yml

@@ -117,3 +117,26 @@
 
   - type: Icon
     sprite: Buildings/Doors/airlock_command_glass.rsi
+
+
+- type: entity
+  parent: Airlock
+  id: AirlockSecurity
+  name: Security Airlock
+  components:
+  - type: Sprite
+    sprite: Buildings/Doors/airlock_security.rsi
+
+  - type: Icon
+    sprite: Buildings/Doors/airlock_security.rsi
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockSecurityGlass
+  name: Glass Security Airlock
+  components:
+  - type: Sprite
+    sprite: Buildings/Doors/airlock_security_glass.rsi
+
+  - type: Icon
+    sprite: Buildings/Doors/airlock_security_glass.rsi

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/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/LatheRecipes/tools.yml

@@ -8,7 +8,9 @@
 
 - type: latheRecipe
   id: Screwdriver
-  icon: Objects/Tools/screwdriver.png
+  icon:
+    sprite: Objects/Tools/screwdriver.rsi
+    state: screwdriver
   result: Screwdriver
   completetime: 500
   materials:
@@ -16,7 +18,9 @@
 
 - type: latheRecipe
   id: Welder
-  icon: Objects/Tools/autolathe_welder.png
+  icon:
+    sprite: Objects/Tools/welder.rsi
+    state: welder
   result: Welder
   completetime: 500
   materials:
@@ -51,7 +55,9 @@
 
 - type: latheRecipe
   id: Multitool
-  icon: Objects/Tools/multitool.png
+  icon:
+    sprite: Objects/Tools/multitool.rsi
+    state: multitool
   result: Multitool
   completetime: 500
   materials: