i dunno

Content.Client/CrewManifest/CrewManifestSystem.cs

@@ -40,6 +40,7 @@ private void BuildDepartmentLookup()
     {
         _jobDepartmentLookup.Clear();
         _departments.Clear();
+
         foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
         {
             _departments.Add(department.ID);
@@ -52,25 +53,9 @@ private void BuildDepartmentLookup()
                     _jobDepartmentLookup.Add(department.Roles[i - 1], departments);
                 }
 
-                departments.Add(department.ID, i);
+                if (department.Roles.Count == i)
+                    departments.Add(department.ID, i);
             }
         }
     }
-
-    public int GetDepartmentOrder(string department, string jobPrototype)
-    {
-        if (!Departments.Contains(department))
-        {
-            return -1;
-        }
-
-        if (!_jobDepartmentLookup.TryGetValue(jobPrototype, out var departments))
-        {
-            return -1;
-        }
-
-        return departments.TryGetValue(department, out var order)
-            ? order
-            : -1;
-    }
 }

Content.Shared/VendingMachines/VendingMachineComponent.cs

@@ -87,7 +87,7 @@ public sealed partial class VendingMachineComponent : Component
         /// </summary>
         [DataField("soundVend")]
         // Grabbed from: https://github.com/discordia-space/CEV-Eris/blob/f702afa271136d093ddeb415423240a2ceb212f0/sound/machines/vending_drop.ogg
-        public SoundSpecifier SoundVend = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg")
+        public SoundSpecifier SoundVend = new SoundPathSpecifier("/Audio/SimpleStation14/Machines/machine_vend.ogg")
         {
             Params = new AudioParams
             {

Resources/Locale/en-US/cartridge-loader/cartridges.ftl

@@ -20,6 +20,11 @@ log-probe-label-time = Time
 log-probe-label-accessor = Accessed by
 log-probe-label-number = #
 
+glimmer-monitor-program-name = Glimmer Monitor
+glimmer-monitor-current-glimmer = Current Glimmer: {$glimmer}Ψ
+glimmer-monitor-interval = Interval
+glimmer-monitor-sync = Sync
+
 astro-nav-program-name = AstroNav
 
 med-tek-program-name = MedTek

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -166,46 +166,30 @@
   suffix: Filled, Hardsuit
   parent: LockerChiefMedicalOfficer
   components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage: !type:AllSelector
-        children:
-        - !type:NestedSelector
-          tableId: LockerFillChiefEngineerNoHardsuit
-        - !type:NestedSelector
-          tableId: FillChiefEngineerHardsuit
-
-# No hardsuit table
-- type: entityTable
-  id: LockerFillChiefMedicalOfficerNoHardsuit
-  table: !type:AllSelector
-    children:
-    - id: BoxEncryptionKeyMedical
-    - id: ClothingBackpackDuffelSurgeryFilled
-    - id: ClothingCloakCmo
-    - id: ClothingEyesHudMedical
-    - id: ClothingHandsGlovesNitrile
-    - id: ClothingHeadHatBeretCmo
-    - id: ClothingHeadsetAltMedical
-    - id: ClothingMaskSterile
-    - id: DoorRemoteMedical
-    - id: HandheldCrewMonitor
-    - id: Hypospray
-    - id: MedicalTechFabCircuitboard
-    - id: MedkitFilled
-    - id: MedTekCartridge
-    - id: RubberStampCMO
-
-# Hardsuit table, used for suit storage as well
-- type: entityTable
-  id: FillChiefMedicalOfficerHardsuit
-  table: !type:AllSelector
-    children:
-    - id: ClothingMaskBreathMedical
-    - id: ClothingOuterHardsuitMedical
-    - id: OxygenTankFilled
+  - type: StorageFill
+    contents:
+      - id: MedkitFilled
+      - id: ClothingHandsGlovesNitrile
+      - id: ClothingEyesHudMedical
+      - id: ClothingHeadsetAltMedical
+      - id: ClothingBackpackDuffelSurgeryFilled
+      - id: ClothingMaskSterile
+      - id: ClothingHeadHatBeretCmo
+      - id: ClothingOuterHardsuitMedical
+      - id: Hypospray
+      - id: HandheldCrewMonitor
+      - id: DoorRemoteMedical
+      - id: RubberStampCMO
+      - id: RubberStampPsychologist # DeltaV
+      - id: MedicalTechFabCircuitboard
+      - id: MedicalBiofabMachineBoard
+      - id: BoxEncryptionKeyMedical
+      - id: BoxPDAMedical # Delta-V
+      - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
+      - id: CMOIDCard # Delta-V
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
-# No hardsuit locker
 - type: entity
   id: LockerChiefMedicalOfficerFilled
   suffix: Filled
@@ -228,6 +212,7 @@
       - id: BoxPDAMedical # Delta-V
       - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
       - id: CMOIDCard # Delta-V
+      - id: MedTekCartridge # Delta-v
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
 

Resources/Prototypes/DeltaV/Catalog/Fills/Items/Backpacks/duffelbag.yml

@@ -7,7 +7,6 @@
   - type: StorageFill
     contents:
     - id: ClothingEyesGlassesMeson
-    - id: MineralScanner
     - id: OreBag
     - id: ClothingUniformJumpsuitSalvageSpecialist
     - id: EncryptionKeyCargo

Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml

@@ -33,8 +33,6 @@
     cost: 750
   - id: WeaponProtoKineticAccelerator
     cost: 750
-  - id: AdvancedMineralScanner
-    cost: 800
   # TODO: resonator for 800
   - id: Fulton
     cost: 1000

Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml

@@ -200,4 +200,10 @@
         - Write
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
-    state: pda-admin-assistant
+    state: pda-admin-assistant
+  - type: CartridgeLoader
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - NanoChatCartridge

Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml

@@ -6,25 +6,25 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Logistics
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Civilian
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Justice
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
     - !type:DepartmentTimeRequirement
       department: Epistemics
-      time: 10800 # 3 hours
+      min: 10800 # 3 hours
   startingGear: AdminAssistantGear
   icon: "JobIconAdminAssitant"
   supervisors: job-supervisors-command

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

@@ -111,8 +111,6 @@
     understands:
     - TauCetiBasic
     - RobotTalk
-  - type: VendingMachine
-    soundVend: /Audio/SimpleStation14/Machines/machine_vend.ogg
 
 - type: entity
   parent: VendingMachine

Resources/Prototypes/Recipes/Lathes/sheet.yml

@@ -2,7 +2,6 @@
   id: SheetSteel
   result: SheetSteel1
   applyMaterialDiscount: false
-  completetime: 2
   miningPoints: 1
   completetime: 0
   materials:
@@ -21,7 +20,6 @@
   id: SheetGlass1
   result: SheetGlass1
   applyMaterialDiscount: false
-  completetime: 2
   miningPoints: 1
   completetime: 0
   materials:
@@ -38,7 +36,6 @@
   id: SheetRGlass
   result: SheetRGlass1
   applyMaterialDiscount: false
-  completetime: 2
   miningPoints: 1
   completetime: 0
   materials:

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -58,7 +58,6 @@
   - ERTSecurity
   - ERTEngineer
   - DeathSquad
-  - StationAi # DeltaV - added for playtime trackers
   - AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
   primary: false
   weight: 100

Resources/Prototypes/Wires/layouts.yml

@@ -150,10 +150,10 @@
     - !type:ProceedWireAction
     - !type:BoomWireAction
 
+# TODO: AI
 - type: wireLayout
   id: ShopVendor
   wires:
-  - !type:AiInteractWireAction
+# - !type:AiInteractWireAction
   - !type:PowerWireAction
-  - !type:AccessWireAction
-  - !type:LogWireAction
+  - !type:AccessWireAction

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

@@ -49,21 +49,12 @@
     {
       "name": "cart-lib"
     },
-    {
-      "name": "cart-log"
-    },
     {
       "name": "cart-m"
     },
-    {
-      "name": "cart-med"
-    },
     {
       "name": "cart-mi"
     },
-    {
-      "name": "cart-nav"
-    },
     {
       "name": "cart-q"
     },
@@ -73,9 +64,6 @@
     {
       "name": "cart-s"
     },
-    {
-      "name": "cart-sec"
-    },
     {
       "name": "cart-tear"
     },
@@ -87,6 +75,12 @@
     },
     {
       "name": "cart-log"
+    },
+    {
+      "name": "cart-nav"
+    },
+    {
+      "name": "cart-med"
     }
   ]
-}
+}