Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream

# Conflicts:
#	Content.Server/Atmos/Components/FlammableComponent.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -90,6 +90,7 @@
   - type: InventorySlots
   - type: Loadout
     prototypes: [ MobAghostGear ]
+  - type: BypassInteractionChecks
 
 - type: entity
   id: ActionAGhostShowSolar

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

@@ -1647,6 +1647,9 @@
       reagents:
       - ReagentId: JuiceWatermelon
         Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: grapes

Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml

@@ -29,7 +29,7 @@
   components:
   - type: Instrument
   - type: ActivatableUI
-    allowSpectator: false # otherwise they can play client-side music
+    blockSpectators: true # otherwise they can play client-side music
     inHandsOnly: false
     singleUser: true
     requireHands: true

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

@@ -108,6 +108,8 @@
     - type: DoorBolt
     - type: AccessReader
       access: [ [ "Engineering" ] ]
+    - type: PryUnpowered
+      pryModifier: 0.5
 
 - type: entity
   id: Firelock

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

@@ -15,7 +15,9 @@
         mask:
         - TabletopMachineMask
         layer:
-        - TabletopMachineLayer
+        - Impassable
+        - MidImpassable
+        - LowImpassable
         hard: false
   - type: ApcPowerReceiver
     powerLoad: 300

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

@@ -58,7 +58,6 @@
         - TabletopMachineMask
         layer:
         - TabletopMachineLayer
-        hard: false
   - type: Sprite
     sprite: Structures/Machines/microwave.rsi
     drawdepth: SmallObjects

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

@@ -32,7 +32,6 @@
         - TabletopMachineMask
         layer:
         - TabletopMachineLayer
-        hard: false
   - type: Sprite
     sprite: Structures/Machines/juicer.rsi
     drawdepth: SmallObjects