Merge branch 'master' into pharmacology

Resources/Changelog/DeltaVChangelog.yml

@@ -1,16 +1,4 @@
 Entries:
-- author: FluffiestFloof
-  changes:
-  - message: Science is now Epistemics.
-    type: Tweak
-  id: 26
-  time: '2023-09-28T22:32:46.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-  - message: Added a new steal objective for the Head of Logistics.
-    type: Add
-  id: 27
-  time: '2023-09-29T13:28:43.0000000+00:00'
 - author: FluffiestFloof
   changes:
   - message: Added fake wizard robes and sandals.
@@ -3532,7 +3520,7 @@
   url: https://github.com/DeltaV-Station/Delta-v/pull/1754
 - author: flyingkarii
   changes:
-  - message: Lowered command age requirement to 18.
+  - message: Removed command age requirement.
     type: Tweak
   id: 522
   time: '2024-09-07T04:38:34.0000000+00:00'
@@ -3560,3 +3548,18 @@
   id: 525
   time: '2024-09-07T15:10:04.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1489
+- author: Velcroboy
+  changes:
+  - message: Department specific shelves no longer restrict the items that can be
+      placed in them.
+    type: Tweak
+  id: 526
+  time: '2024-09-07T17:46:02.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1763
+- author: deltanedas
+  changes:
+  - message: Bookshelves can now fit any kind of item, not just books.
+    type: Tweak
+  id: 527
+  time: '2024-09-07T22:05:05.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1765

Resources/Maps/Shuttles/DeltaV/synthesis_ship.yml

@@ -411,17 +411,13 @@ entities:
     - type: Transform
       pos: 1.5,1.5
       parent: 1
-- proto: APCHighCapacity
+- proto: APCHyperCapacity
   entities:
-  - uid: 76
+  - uid: 75
     components:
     - type: Transform
       pos: 4.5,5.5
       parent: 1
-    - type: Apc
-      hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
 - proto: AtmosDeviceFanTiny
   entities:
   - uid: 211
@@ -1696,21 +1692,13 @@ entities:
     - type: Transform
       pos: 3.5,2.5
       parent: 1
-  - uid: 280
-    components:
-    - type: Transform
-      pos: 3.5,7.5
-      parent: 1
 - proto: SubstationBasic
   entities:
-  - uid: 75
+  - uid: 76
     components:
     - type: Transform
       pos: 5.5,-2.5
       parent: 1
-    - type: Battery
-      startingCharge: 5000000
-      maxCharge: 5000000
 - proto: SuitStorageEVASyndicate
   entities:
   - uid: 217

Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml

@@ -48,15 +48,9 @@
   - type: Occluder
   - type: Storage
     grid:
-    - 0,0,15,3
-    maxItemSize: Normal
-    whitelist:
-      tags:
-        - Document
-        - Folder
-        - Write
-        - Book
-        - Spellbook
+    - 0,0,5,1 # DeltaV, make it 2 rows of 6 instead of a giant block
+    - 0,3,5,4
+    #maxItemSize: Normal # DeltaV: removed whitelist and max item size
   - type: UserInterface
     interfaces:
       enum.StorageUiKey.Key:

Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml

@@ -323,12 +323,6 @@
     - 0,0,5,1
     - 0,3,5,4
     maxItemSize: Normal
-    whitelist:
-      tags:
-        - DrinkGlass
-        - DrinkBottle
-        - DrinkCan
-        - Beer
   - type: Construction
     graph: Shelf
     node: ShelfBar
@@ -377,24 +371,6 @@
     - 0,0,5,1
     - 0,3,5,4
     maxItemSize: Normal
-    whitelist:
-      tags:
-        - DrinkBottle
-        - DrinkCan
-        - DrinkCup
-        - DrinkGlass
-        - BoxCardboard
-        - MonkeyCube
-        - Enzyme
-        - Mayo
-        - Packet
-        - Cleaver
-        - Knife
-        - KitchenKnife
-        - RollingPin
-        - Ingredient
-        - Trash
-        - Plastic
   - type: Construction
     graph: Shelf
     node: ShelfKitchen
@@ -449,11 +425,6 @@
     - 0,0,5,1
     - 0,3,5,4
     maxItemSize: Normal
-    whitelist:
-      tags:
-        - ChemDispensable
-        - GlassBeaker
-        - Bottle
   - type: Construction
     graph: Shelf
     node: ShelfChemistry