Merge branch 'master' into Arsenal-Tech-Overhaul

Resources/Changelog/DeltaVChangelog.yml

@@ -1,10 +1,4 @@
 Entries:
-- author: Colin-Tel
-  changes:
-  - message: Head of Personnel now has the access that lawyers have.
-    type: Fix
-  id: 144
-  time: '2023-11-17T23:56:56.0000000+00:00'
 - author: Colin-Tel
   changes:
   - message: Adjusted Asterisk and Shoukou's min/max population to 0/60.
@@ -3701,3 +3695,10 @@
   id: 643
   time: '2024-11-03T18:02:03.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2055
+- author: Monotheonist
+  changes:
+  - message: Changed Delta-V cartridges to tapes.
+    type: Tweak
+  id: 644
+  time: '2024-11-04T02:03:38.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2108

Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/cartridges.yml

@@ -5,10 +5,10 @@
   description: A cartridge that keeps track of glimmer.
   components:
   - type: Sprite
-    sprite: Nyanotrasen/Objects/Devices/cartridge.rsi
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
     state: cart-psi
   - type: Icon
-    sprite: Nyanotrasen/Objects/Devices/cartridge.rsi
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
     state: cart-psi
   - type: UIFragment
     ui: !type:GlimmerMonitorUi

Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Timfa, plus edits by portfiend",
+    "copyright": "Monotheonist (github), edited from cart-log, cart-nav & cart-med cartridges; cart-log made by Skarletto (github), cart-nav, cart-med made by ArchRBX (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -12,6 +12,9 @@
         },
         {
             "name": "cart-mail"
+        },
+        {
+            "name": "cart-psi"
         }
     ]
 }