Remove the Administrative Assistant (#3857)

* Killing * Fix two texture issues * Remove from maps prototype * Forgot to remove the pda * More expensive to pass the test * More migrations * Killed the highlights
2026-09-29 23:57:29 +00:00 · 2025-06-10 16:53:06 -04:00
parent 92c86a1147
commit e85fe513af
56 changed files with 46 additions and 329 deletions
@@ -100,10 +100,6 @@ highlight-mystagogue-4 = Epistemics
 highlight-mystagogue-5 = "Epi"
 highlight-mystagogue-6 = Command

-highlight-administrative-assistant-1 = Administrative Assistant
-highlight-administrative-assistant-2 = "AA"
-highlight-administrative-assistant-3 = Command
-

 ###### Security
 highlight-detective-1 = Detective
@@ -1,7 +1,7 @@
-figurines-adminassistant-1 = One soy latté, coming up.
-figurines-adminassistant-2 = Captain a tider needs to talk to you.
-figurines-adminassistant-3 = Wait I have a job?
-figurines-adminassistant-4 = wait why do you want me to set it to code red again?
+figurines-secretary-1 = One soy latté, coming up.
+figurines-secretary-2 = Who was I meant to send a fax again?
+figurines-secretary-3 = Wait I have a job?
+figurines-secretary-4 = Wait what did you want me to write?

 figurines-cj-1 = Prisoners must be provided with food, water, clothing, free movement within the brig, adequate medical care, access to the Common and Prison radio channels, and moral, spiritual, or legal counseling if requested and available.
 figurines-cj-2 = Hos, demote the Warden.
@@ -7,7 +7,6 @@ job-name-lawyer = Attorney
 job-name-courier = Courier
 job-name-cargo-assistant = Cargo Assistant
 job-name-security-borg = Security Cyborg
-job-name-admin-assistant = Administrative Assistant
 # Used by the Agent ID
 job-name-senior-physician = Senior Physician
 job-name-senior-researcher = Senior Researcher
@@ -75,4 +74,3 @@ JobProsecutor = Prosecutor
 JobSecurityBorg = Security Cyborg
 JobRoboticist = Roboticist
 JobCargoAssistant = Cargo Assistant
-JobAdminAssistant = Administrative Assistant
@@ -1,5 +1,4 @@
 stamp-component-stamped-name-notary = NOTARY
 stamp-component-stamped-name-chiefjustice = Chief Justice
 stamp-component-stamped-name-prosec = Prosecutor
-stamp-component-stamped-name-admin-assistant = Administrative Assistant
 stamp-component-stamped-name-hate-paperwork = I HATE PAPERWORK!
@@ -9,12 +9,6 @@ loadout-group-captain-shoes = Captain shoes
 loadout-group-hop-gloves = Head of Personnel gloves
 loadout-group-hop-shoes = Head of Personnel shoes

-loadout-group-admin-assistant-head = Administrative Assistant head
-loadout-group-admin-assistant-jumpsuit = Administrative Assistant jumpsuit
-loadout-group-admin-assistant-outerclothing = Administrative Assistant outer clothing
-loadout-group-admin-assistant-shoes = Administrative Assistant shoes
-loadout-group-admin-assistant-gloves = Administrative Assistant gloves
-
 # Civilian
 loadout-group-librarian-neck = Librarian neck

@@ -173,3 +173,12 @@ SignBath: null
 # these were never ported
 SpawnMobReindeerBuck: null
 SpawnMobReindeerDoe: null
+
+# 2025-05-28
+SpawnPointAdminAssistant: null
+LockerAdministrativeAssistantFilled: null
+RubberStampAdminAssistant: null
+ClothingHeadHatAdministrasive: ClothingHeadHatSecretary
+ClothingUniformJumpsuitAdminAssistant: ClothingUniformJumpsuitSecretary
+ClothingUniformJumpskirtAdminAssistant: ClothingUniformJumpskirtSecretary
+ToyFigurineAdminAssistant: ToyFigurineSecretary
@@ -32,7 +32,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockClothesFilled
-  cost: 3900 # DeltaV
+  cost: 3970 # DeltaV
  category: cargoproduct-category-name-service
  group: market

@@ -124,7 +124,7 @@
    children:
    - !type:NestedSelector # DeltaV
      tableId: LockerFillHeadOfPersonnelDeltaV
-    #- id: AccessConfigurator # DeltaV - They don't really need it, moved to the administrative assistant starting gear.
+    - id: AccessConfigurator
    - id: BoxEncryptionKeyPassenger
    - id: BoxEncryptionKeyService
    - id: BoxHeadset
@@ -127,6 +127,9 @@
    ClothingUniformJumpsuitSuitBrownMob: 2
    ClothingUniformJumpsuitSuitBlackMob: 2
    ClothingUniformJumpsuitSuitWhiteMob: 2
+    ClothingHeadHatSecretary: 2
+    ClothingUniformJumpskirtSecretary: 2
+    ClothingUniformJumpsuitSecretary: 2
    ClothingUniformBrownSuit: 2
    ClothingUniformBrownSuitSkirt: 2
    ClothingShoesLeather: 2
@@ -23,7 +23,6 @@
            Passenger: [ -1, -1 ]
            Librarian: [ 1, 1 ]
          #command
-            AdministrativeAssistant: [ 1, 1 ]
            Captain: [ 1, 1 ]
            StationAi: [ 1, 1 ]
          #engineering
@@ -17,7 +17,6 @@
            prefixCreator: 'DV'
        - type: StationJobs
          availableJobs:
-            AdministrativeAssistant: [ 1, 1 ]
            Captain: [ 1, 1 ]
            StationAi: [ 1, 1 ]
          #service
@@ -26,7 +26,6 @@
            ChiefEngineer: [ 1, 1 ]
            Quartermaster: [ 1, 1 ]
            ResearchDirector: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
            StationAi: [ 1, 1 ]
          #service
            Reporter: [ 1, 1 ]
@@ -20,7 +20,6 @@
          #command
            Captain: [ 1, 1 ]
            StationAi: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
          #service
            HeadOfPersonnel: [ 1, 1 ]
            Bartender: [ 2, 3 ]
@@ -76,5 +75,5 @@
            ChiefJustice: [ 1, 1 ]
            Lawyer: [ 1, 1 ]
            Prosecutor: [ 1, 1 ]
-            Clerk: [ 1, 1 ] 
+            Clerk: [ 1, 1 ]

@@ -30,7 +30,6 @@
            ResearchDirector: [ 1, 1 ]
            Quartermaster: [ 1, 1 ]
            StationAi: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
          #engineering
            AtmosphericTechnician: [ 3, 3 ]
            StationEngineer: [ 4, 5 ]
@@ -75,4 +74,4 @@
            CargoTechnician: [ 2, 4 ]
            CargoAssistant: [ 2 , 2 ]
            Courier: [ 2, 2 ]
-            SalvageSpecialist: [ 4, 4 ]
+            SalvageSpecialist: [ 4, 4 ]
@@ -23,7 +23,6 @@
      - type: StationJobs
        availableJobs:
          Captain: [ 1, 1 ]
-          AdministrativeAssistant: [ 1, 1 ]
          StationAi: [ 1, 1 ]
        #service
          HeadOfPersonnel: [ 1, 1 ]
@@ -21,7 +21,6 @@
            Passenger: [ -1, -1 ]
            Librarian: [ 1, 1 ]
          #command
-            AdministrativeAssistant: [ 1, 1 ]
            Captain: [ 1, 1 ]
            StationAi: [ 1, 1 ]
          #engineering
@@ -21,7 +21,6 @@
        availableJobs:
        #command
          Captain: [ 1, 1 ]
-          AdministrativeAssistant: [ 1, 1 ]
          StationAi: [ 1, 1 ]
        #service
          HeadOfPersonnel: [ 1, 1 ]
@@ -20,7 +20,6 @@
          #command
            Captain: [ 1, 1 ]
            StationAi: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
          #service
            HeadOfPersonnel: [ 1, 1 ]
            Bartender: [ 1, 1 ]
@@ -19,7 +19,6 @@
          availableJobs:
          #Command
            Captain: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
          #Service
            HeadOfPersonnel: [ 1, 1 ]
            Librarian: [ 1, 1 ]
@@ -22,7 +22,6 @@
            Passenger: [ -1, -1 ]
            Librarian: [ 1, 1 ]
          #command
-            AdministrativeAssistant: [ 1, 1 ]
            Captain: [ 1, 1 ]
            StationAi: [ 1, 1 ]
          #engineering
@@ -80,7 +80,6 @@
  - ERTEngineer
  - DeathSquad
  - StationAi # DeltaV - added for playtime trackers
-  - AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml
  primary: false
  weight: 100

@@ -2,11 +2,6 @@
 # the Prefixes are generated job IDs
 # The corresponding strings are located in Resources/Locale/en-US/_DV/chat/highlights.ftl

- type: localizedDataset
-  id: ChatHighlightAdministrativeAssistant
-  values:
-    prefix: highlight-administrative-assistant-
-    count: 3
 - type: localizedDataset
  id: ChatHighlightAtmosphericTechnician
  values:
@@ -1,20 +0,0 @@
- type: entityTable
-  id: AdministrativeAssistantLockerFill
-  table: !type:AllSelector
-    children:
-    - id: DrinkCoffeeJug # Gotta keep command awake during the greenshifts
-    - id: BoxFolderBlue
-    - id: ClothingUniformJumpsuitAdminAssistant
-    - id: ClothingUniformJumpskirtAdminAssistant
-    - id: ClothingHeadsetAltAdminAssistant
-    - id: AdminAssistantIDCard
-
- type: entity
-  parent: LockerAdministrativeAssistant
-  id: LockerAdministrativeAssistantFilled
-  suffix: Filled
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage: !type:NestedSelector
-        tableId: AdministrativeAssistantLockerFill
@@ -1,7 +1,7 @@
 - type: localizedDataset
-  id: FigurinesAdminAssistant
+  id: FigurinesSecretary
  values:
-    prefix: figurines-adminassistant-
+    prefix: figurines-secretary-
    count: 4

 - type: localizedDataset
@@ -51,22 +51,6 @@
  name: guard headset
  description: Headset used by prison guards.

- type: entity
-  parent: ClothingHeadset
-  id: ClothingHeadsetAdminAssistant
-  name: adminstrative assistant headset
-  description: A headset used by the administrative assistant.
-  components:
-  - type: ContainerFill
-    containers:
-      key_slots:
-      - EncryptionKeyCommand
-      - EncryptionKeyCommon
-  - type: Sprite
-    sprite: _DV/Clothing/Ears/Headsets/adminassistant.rsi
-  - type: Clothing
-    sprite: _DV/Clothing/Ears/Headsets/adminassistant.rsi
-
 - type: entity
  parent: ClothingHeadsetGrey
  id: ClothingHeadsetGreySyndicate
@@ -33,16 +33,6 @@
  - type: Clothing
    sprite: _DV/Clothing/Ears/Headsets/justice.rsi

- type: entity
-  parent: ClothingHeadsetAdminAssistant
-  id: ClothingHeadsetAltAdminAssistant
-  name: adminstrative assistant over-ear headset
-  components:
-  - type: Sprite
-    state: icon_alt
-  - type: Clothing
-    equippedPrefix: alt
-
 - type: entity
  parent: ClothingHeadsetAltSyndicate
  id: ClothingHeadsetAltSyndicateListening
@@ -1,8 +1,8 @@
 - type: entity
  parent: ClothingHeadBase
-  id: ClothingHeadHatAdministrasive
-  name: administrative hat
-  description: A hat for those dedicated to assisting Command.
+  id: ClothingHeadHatSecretary
+  name: secretary hat
+  description: A hat for those dedicated to serve coffe and take notes.
  components:
  - type: Sprite
    sprite: _DV/Clothing/Head/Hats/admin_hat.rsi
@@ -349,9 +349,9 @@

 - type: entity
  parent: ClothingUniformBase
-  id: ClothingUniformJumpskirtAdminAssistant
-  name: administrative assistant's jumpskirt
-  description: A suit worn by the Administrative Assistant. Smells of burnt coffee.
+  id: ClothingUniformJumpskirtSecretary
+  name: secretary's jumpskirt
+  description: A suit worn by secretary personnel. Smells of burnt coffee.
  components:
  - type: Sprite
    sprite: _DV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi
@@ -454,9 +454,9 @@

 - type: entity
  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitAdminAssistant
-  name: administrative assistant's jumpsuit
-  description: A suit worn by the Administrative Assistant. Smells of burnt coffee.
+  id: ClothingUniformJumpsuitSecretary
+  name: secretary's jumpsuit
+  description: A suit worn by secretary personnel. Smells of burnt coffee.
  components:
  - type: Sprite
    sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi
@@ -106,19 +106,6 @@
    - sprite: _DV/Markers/jobs.rsi
      state: cargoassistant

- type: entity
-  parent: SpawnPointJobBase
-  id: SpawnPointAdminAssistant
-  name: administrative assistant
-  components:
-  - type: SpawnPoint
-    job_id: AdministrativeAssistant
-  - type: Sprite
-    layers:
-    - state: green
-    - sprite: _DV/Markers/jobs.rsi
-      state: adminassistant
-
 - type: entity
  parent: SpawnPointJobBase
  id: SpawnPointSurgeon
@@ -240,28 +240,6 @@
  - type: Pda
    id: ForensicMantisIDCard

-# Command
-
- type: entity
-  parent: BasePDA
-  id: AdminAssistantPDA
-  name: administrative assistant PDA
-  description: Theres pen scribbles all over the edges, and a few sticky notes stuck on it.
-  components:
-  - type: Pda
-    id: AdminAssistantIDCard
-    penSlot:
-      startingItem: LuxuryPen
-      priority: -1
-      whitelist:
-        tags:
-        - Write
-  - type: Appearance
-    appearanceDataInit:
-      enum.PdaVisuals.PdaType: !type:String
-        pda-admin-assistant
-  - type: Icon
-    state: pda-admin-assistant

 ## Alternate Job Titles

@@ -10,14 +10,14 @@

 - type: entity
  parent: BaseFigurineDeltaV
-  id: ToyFigurineAdminAssistant
-  name: administrative assistant figure
-  description: A figurine depicting the administrative assistant, on their way to fetch coffee for the Captain.
+  id: ToyFigurineSecretary
+  name: secretary figure
+  description: A figurine depicting a secretary, on their way to fetch coffee.
  components:
  - type: Sprite
-    state: adminassistant
+    state: secretary
  - type: SpeakOnTrigger
-    pack: FigurinesAdminAssistant
+    pack: FigurinesSecretary

 - type: entity
  parent: BaseFigurineDeltaV
@@ -143,21 +143,6 @@
  - type: PresetIdCard
    job: CargoAssistant

- type: entity
-  parent: IDCardStandard
-  id: AdminAssistantIDCard
-  name: administrative assistant ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: silver
-    - sprite: _DV/Objects/Misc/id_cards.rsi
-      state: idadminassistant
-  - type: Item
-    heldPrefix: silver
-  - type: PresetIdCard
-    job: AdministrativeAssistant
-
 ## Alternate Job Titles

 # Passenger
@@ -44,20 +44,6 @@
    sprite: _DV/Objects/Misc/stamps.rsi
    state: stamp-prosec

- type: entity
-  parent: RubberStampBase
-  id: RubberStampAdminAssistant
-  name: administrative assistant rubber stamp
-  suffix: DO NOT MAP
-  components:
-  - type: Stamp
-    stampedName: stamp-component-stamped-name-admin-assistant
-    stampedColor: "#4191f2"
-    stampState: "paper_stamp-admin-assistant"
-  - type: Sprite
-    sprite: _DV/Objects/Misc/stamps.rsi
-    state: stamp-admin-assistant
-
 - type: entity
  parent: RubberStampBase
  id: RubberStampHatePaperwork
@@ -75,18 +75,6 @@
  - type: AccessReader
    access: [ [ "Surgery" ] ]

- type: entity
-  parent: CommandLockerBaseSecureDeltaV
-  id: LockerAdministrativeAssistant
-  name: administrative assistant's locker
-  components:
-  - type: EntityStorageVisuals
-    stateBaseClosed: admin_assist
-    stateDoorOpen: admin_assist_open
-    stateDoorClosed: admin_assist_door
-  - type: AccessReader
-    access: [["Command"]]
-
 - type: entity
  parent: LockerBaseSecureDeltaV
  id: LockerKitchen
@@ -230,7 +230,6 @@
    contents:
    - id: RubberStampApproved
    - id: RubberStampDenied
-    - id: RubberStampAdminAssistant
    - id: RubberStampCaptain
    - id: RubberStampChaplain
    - id: RubberStampCE
@@ -1,22 +0,0 @@
-# Jumpsuit
- type: loadout
-  id: AdminAssistantJumpsuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitAdminAssistant
-
- type: loadout
-  id: AdminAssistantJumpskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtAdminAssistant
-
-# Head
- type: loadout
-  id: AdminAssistanthat
-  equipment:
-    head: ClothingHeadHatAdministrasive
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobAdminAssistant
-      time: 180000 #50 hrs
@@ -695,46 +695,6 @@
  - ScienceWinterBoots

 # Command
-## Administrative Assistant
- type: loadoutGroup
-  id: AdminAssistantJumpsuit
-  name: loadout-group-admin-assistant-jumpsuit
-  loadouts:
-  - AdminAssistantJumpsuit
-  - AdminAssistantJumpskirt
-
- type: loadoutGroup
-  id: AdminAssistantHead
-  name: loadout-group-admin-assistant-head
-  minLimit: 0
-  loadouts:
-  - AdminAssistanthat
-
- type: loadoutGroup
-  id: AdminAssistantShoes
-  name: loadout-group-admin-assistant-shoes
-  loadouts:
-  - BrownLeatherShoes
-  - WhiteLeatherShoes
-  - LaceupShoes
-
- type: loadoutGroup
-  id: AdminAssistantOuter
-  name: loadout-group-admin-assistant-outerclothing
-  loadouts:
-  - BartenderVest
-  - WinterCoatBlack
-  - WinterCoatBrown
-  - CorporateJacket
-
- type: loadoutGroup
-  id: AdminAssistantGloves
-  name: loadout-group-admin-assistant-gloves
-  minLimit: 0
-  loadouts:
-  - HoPGloves
-  - InspectionGloves
-
 ## Captain
 - type: loadoutGroup
  id: CaptainGloves
@@ -124,18 +124,3 @@
  - Survival
  - Trinkets
  - GroupSpeciesBreathTool
-
-# Command
- type: roleLoadout
-  id: JobAdministrativeAssistant
-  groups:
-  - AdminAssistantHead
-  - AdminAssistantJumpsuit
-  - AdminAssistantOuter
-  - AdminAssistantShoes
-  - AdminAssistantGloves
-  - CommonBackpack
-  - Glasses
-  - Survival
-  - Trinkets
-  - GroupSpeciesBreathTool
@@ -67,11 +67,6 @@
  id: CentralCommandOfficialPhrase
  text: job-name-centcomoff

- type: quickPhrase
-  parent: BaseCommandJobPhrase
-  id: AdminAssistantPhrase
-  text: job-name-admin-assistant
-
 - type: quickPhrase
  parent: BaseCommandJobPhrase
  id: StationAIPhrase
@@ -20,9 +20,6 @@
  # HoP
  - ClothingUniformJumpsuitHoPFormal
  - ClothingUniformJumpskirtHoPFormal
-  # Administrative Assistant
-  - ClothingUniformJumpsuitAdminAssistant
-  - ClothingUniformJumpskirtAdminAssistant

 - type: latheRecipePack
  id: ClothingEpistemics
@@ -194,17 +194,17 @@
  id: ClothingUniformJumpskirtSalvageSpecialist
  result: ClothingUniformJumpskirtSalvageSpecialist

-# Administrative Assistant
+# Secretary

 - type: latheRecipe
  parent: BaseCommandJumpsuitRecipe
-  id: ClothingUniformJumpsuitAdminAssistant
-  result: ClothingUniformJumpsuitAdminAssistant
+  id: ClothingUniformJumpsuitSecretary
+  result: ClothingUniformJumpsuitSecretary

 - type: latheRecipe
  parent: BaseCommandJumpsuitRecipe
-  id: ClothingUniformJumpskirtAdminAssistant
-  result: ClothingUniformJumpskirtAdminAssistant
+  id: ClothingUniformJumpskirtSecretary
+  result: ClothingUniformJumpskirtSecretary

 # Command Hats

@@ -1,34 +0,0 @@
- type: job
-  id: AdministrativeAssistant
-  name: job-name-admin-assistant
-  description: job-description-admin-assistant
-  playTimeTracker: JobAdminAssistant
-  requirements:
-  - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
-    time: 90000 # 25 hours
-  startingGear: AdminAssistantGear
-  icon: "JobIconAdminAssitant"
-  supervisors: job-supervisors-command
-  canBeAntag: false
-  access:
-  - Command
-  - Maintenance
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-    - type: CommandStaff
-
- type: startingGear
-  id: AdminAssistantGear
-  equipment:
-    eyes: ClothingEyesHudCommand
-    belt: ClothingBeltPaperworkFilled
-    id: AdminAssistantPDA
-    pocket1: RubberStampAdminAssistant
-    pocket2: AccessConfigurator # To assist with secure closets access configurations / airlock configs should a head need it.
-    ears: ClothingHeadsetAdminAssistant
-  storage:
-    back:
-    - Flash
@@ -25,8 +25,5 @@
 - type: playTimeTracker
  id: JobCargoAssistant

- type: playTimeTracker
-  id: JobAdminAssistant
-
 - type: playTimeTracker
  id: JobSurgeon
@@ -54,13 +54,6 @@
    state: CargoAssistant
  jobName: job-name-cargo-assistant

- type: jobIcon
-  parent: JobIcon
-  id: JobIconAdminAssitant
-  icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
-    state: AdminAssistant
-
 - type: jobIcon
  parent: JobIcon
  id: JobIconSurgeon
@@ -213,7 +213,6 @@
    # Begin DeltaV Additions
    - Mystagogue
    - Chief Justice
-    - Administrative Assistant 
    # End DeltaV Additions

 - type: dataset
@@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security cards modified by TJohnson. nyanoMantis Prisoner and Prosecutor made by BoxfulOfSoup (Github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, Surgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security cards modified by TJohnson. nyanoMantis Prisoner and Prosecutor made by BoxfulOfSoup (Github)",
    "size": {
        "x": 8,
        "y": 8
@@ -46,9 +46,6 @@
        {
            "name": "CargoAssistant"
        },
-        {
-            "name": "AdminAssistant"
-        },
        {
            "name": "Surgeon"
        },
@@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV. cargoassistant made by Radezolid, adminassistant made by noctyrnal (github), surgeon made by Janet Blackquill <uhhadd@gmail.com> 2024",
+    "copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV. cargoassistant made by Radezolid, surgeon made by Janet Blackquill <uhhadd@gmail.com> 2024",
    "size": {
        "x": 32,
        "y": 32
@@ -52,9 +52,6 @@
        {
            "name": "cargoassistant"
        },
-        {
-            "name": "adminassistant"
-        },
        {
            "name": "surgeon"
        },
@@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician, modified interntech, added admin assistant and added the cargo assistant by Radezolid, added Psychiatrist, Therapist, and Social Worker versions by alterae <chell@alterae.online>, surgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security PDAs modified by TJohnson. Cryogenics Specialist PDA by willow_de_luna. Wizard PDA by Exile152 (github).",
+    "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician, modified interntech, added the cargo assistant by Radezolid, added Psychiatrist, Therapist, and Social Worker versions by alterae <chell@alterae.online>, surgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security PDAs modified by TJohnson. Cryogenics Specialist PDA by willow_de_luna. Wizard PDA by Exile152 (github).",
    "size": {
        "x": 32,
        "y": 32
@@ -38,9 +38,6 @@
        {
            "name": "pda-atmos"
        },
-        {
-            "name": "pda-admin-assistant"
-        },
        {
            "name": "pda-bartender"
        },
@@ -8,7 +8,7 @@
    },
    "states": [
        {
-            "name": "adminassistant"
+            "name": "secretary"
        },
        {
            "name": "cj"
@@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idsecurityofficer, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security sprites modified by TJohnson. idprosecutor nyanomantis and nyanoprisoner icons made by BoxfulOfSoup (Github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idsecurityofficer, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idsurgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security sprites modified by TJohnson. idprosecutor nyanomantis and nyanoprisoner icons made by BoxfulOfSoup (Github)",
    "size": {
        "x": 32,
        "y": 32
@@ -43,9 +43,6 @@
        {
            "name": "idcargoassistant"
        },
-        {
-            "name": "idadminassistant"
-        },
        {
            "name": "idsurgeon"
        },