diff --git a/Resources/Locale/en-US/_DV/chat/highlights.ftl b/Resources/Locale/en-US/_DV/chat/highlights.ftl index ad6e79e94cf..a6b26276362 100644 --- a/Resources/Locale/en-US/_DV/chat/highlights.ftl +++ b/Resources/Locale/en-US/_DV/chat/highlights.ftl @@ -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 diff --git a/Resources/Locale/en-US/_DV/datasets/figurines.ftl b/Resources/Locale/en-US/_DV/datasets/figurines.ftl index 928ff5fa53f..3779d6706a6 100644 --- a/Resources/Locale/en-US/_DV/datasets/figurines.ftl +++ b/Resources/Locale/en-US/_DV/datasets/figurines.ftl @@ -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. diff --git a/Resources/Locale/en-US/_DV/job/job-names.ftl b/Resources/Locale/en-US/_DV/job/job-names.ftl index 7730017c000..ab3aa6c9854 100644 --- a/Resources/Locale/en-US/_DV/job/job-names.ftl +++ b/Resources/Locale/en-US/_DV/job/job-names.ftl @@ -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 diff --git a/Resources/Locale/en-US/_DV/paper/stamp-component.ftl b/Resources/Locale/en-US/_DV/paper/stamp-component.ftl index 5ebc42d5467..5d38c56718a 100644 --- a/Resources/Locale/en-US/_DV/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/_DV/paper/stamp-component.ftl @@ -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! diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl index c7b210554b7..59220955f6b 100644 --- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl @@ -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 diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index 96223bd42c4..a0755084993 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -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 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 6487cdb0238..753ed5bcf93 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index a47757567ca..f31075b893c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 1c8a3d0d984..717f1bd399f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -127,6 +127,9 @@ ClothingUniformJumpsuitSuitBrownMob: 2 ClothingUniformJumpsuitSuitBlackMob: 2 ClothingUniformJumpsuitSuitWhiteMob: 2 + ClothingHeadHatSecretary: 2 + ClothingUniformJumpskirtSecretary: 2 + ClothingUniformJumpsuitSecretary: 2 ClothingUniformBrownSuit: 2 ClothingUniformBrownSuitSkirt: 2 ClothingShoesLeather: 2 diff --git a/Resources/Prototypes/Maps/arena.yml b/Resources/Prototypes/Maps/arena.yml index 49929c39eb0..d00aa52ae85 100644 --- a/Resources/Prototypes/Maps/arena.yml +++ b/Resources/Prototypes/Maps/arena.yml @@ -23,7 +23,6 @@ Passenger: [ -1, -1 ] Librarian: [ 1, 1 ] #command - AdministrativeAssistant: [ 1, 1 ] Captain: [ 1, 1 ] StationAi: [ 1, 1 ] #engineering diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml index bd7c0a3a10b..6d8d3b8abe9 100644 --- a/Resources/Prototypes/Maps/asterisk.yml +++ b/Resources/Prototypes/Maps/asterisk.yml @@ -17,7 +17,6 @@ prefixCreator: 'DV' - type: StationJobs availableJobs: - AdministrativeAssistant: [ 1, 1 ] Captain: [ 1, 1 ] StationAi: [ 1, 1 ] #service diff --git a/Resources/Prototypes/Maps/byoin.yml b/Resources/Prototypes/Maps/byoin.yml index 7537b82fa26..982581e3754 100644 --- a/Resources/Prototypes/Maps/byoin.yml +++ b/Resources/Prototypes/Maps/byoin.yml @@ -26,7 +26,6 @@ ChiefEngineer: [ 1, 1 ] Quartermaster: [ 1, 1 ] ResearchDirector: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] StationAi: [ 1, 1 ] #service Reporter: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml index 88382c5273e..9c774affa73 100644 --- a/Resources/Prototypes/Maps/edge.yml +++ b/Resources/Prototypes/Maps/edge.yml @@ -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 ] diff --git a/Resources/Prototypes/Maps/elegance.yml b/Resources/Prototypes/Maps/elegance.yml index f0971c06a70..8ff8a28a3a1 100644 --- a/Resources/Prototypes/Maps/elegance.yml +++ b/Resources/Prototypes/Maps/elegance.yml @@ -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 ] \ No newline at end of file + SalvageSpecialist: [ 4, 4 ] diff --git a/Resources/Prototypes/Maps/glacier.yml b/Resources/Prototypes/Maps/glacier.yml index a26e4de5db8..4b4912cc23d 100644 --- a/Resources/Prototypes/Maps/glacier.yml +++ b/Resources/Prototypes/Maps/glacier.yml @@ -23,7 +23,6 @@ - type: StationJobs availableJobs: Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] StationAi: [ 1, 1 ] #service HeadOfPersonnel: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml index 2cbb0cec015..cbf1fda14a7 100644 --- a/Resources/Prototypes/Maps/hive.yml +++ b/Resources/Prototypes/Maps/hive.yml @@ -21,7 +21,6 @@ Passenger: [ -1, -1 ] Librarian: [ 1, 1 ] #command - AdministrativeAssistant: [ 1, 1 ] Captain: [ 1, 1 ] StationAi: [ 1, 1 ] #engineering diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml index 12ae9173852..b04b9c8e270 100644 --- a/Resources/Prototypes/Maps/lighthouse.yml +++ b/Resources/Prototypes/Maps/lighthouse.yml @@ -21,7 +21,6 @@ availableJobs: #command Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] StationAi: [ 1, 1 ] #service HeadOfPersonnel: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/pebble.yml b/Resources/Prototypes/Maps/pebble.yml index e06d75a3e81..f2a5d89cbc2 100644 --- a/Resources/Prototypes/Maps/pebble.yml +++ b/Resources/Prototypes/Maps/pebble.yml @@ -20,7 +20,6 @@ #command Captain: [ 1, 1 ] StationAi: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] #service HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index 6c76b9ad9a5..0e6c563badc 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -19,7 +19,6 @@ availableJobs: #Command Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] #Service HeadOfPersonnel: [ 1, 1 ] Librarian: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml index 1d0292152b4..f0be3d093a7 100644 --- a/Resources/Prototypes/Maps/tortuga.yml +++ b/Resources/Prototypes/Maps/tortuga.yml @@ -22,7 +22,6 @@ Passenger: [ -1, -1 ] Librarian: [ 1, 1 ] #command - AdministrativeAssistant: [ 1, 1 ] Captain: [ 1, 1 ] StationAi: [ 1, 1 ] #engineering diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 7418858d6e5..dbb0d95feb7 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Catalog/Chat/highlights.yml b/Resources/Prototypes/_DV/Catalog/Chat/highlights.yml index 0c637f40152..32bf95ec47e 100644 --- a/Resources/Prototypes/_DV/Catalog/Chat/highlights.yml +++ b/Resources/Prototypes/_DV/Catalog/Chat/highlights.yml @@ -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: diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml deleted file mode 100644 index bca58ae24f1..00000000000 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/_DV/Datasets/figurines.yml b/Resources/Prototypes/_DV/Datasets/figurines.yml index 1d2deceb042..5109872e594 100644 --- a/Resources/Prototypes/_DV/Datasets/figurines.yml +++ b/Resources/Prototypes/_DV/Datasets/figurines.yml @@ -1,7 +1,7 @@ - type: localizedDataset - id: FigurinesAdminAssistant + id: FigurinesSecretary values: - prefix: figurines-adminassistant- + prefix: figurines-secretary- count: 4 - type: localizedDataset diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets.yml index 1966b808ce4..d293f0deaa1 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets_alt.yml index eae2ad92f2a..165a869c53b 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Ears/headsets_alt.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml index 6efd36d52c7..58ab306ea95 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml index 7880c398876..515639bc8f8 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index d6abbd40c2d..21ea6e4fa8f 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml index 6f0d568a268..ab8045d4ee0 100644 --- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml index d60853849f1..db430340957 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/_DV/Entities/Objects/Fun/figurines.yml index 24995a0cd82..f8eba2b7f19 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Fun/figurines.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml index 3f8efe2b10a..a694e6d6f01 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml index 5112a9e53e3..a7bfb2fd804 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index b1277f0ba1a..b0ae691d7ab 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml index 1303b7d5e6c..be7a22daa5d 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml @@ -230,7 +230,6 @@ contents: - id: RubberStampApproved - id: RubberStampDenied - - id: RubberStampAdminAssistant - id: RubberStampCaptain - id: RubberStampChaplain - id: RubberStampCE diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml deleted file mode 100644 index 0e5bdbc938b..00000000000 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 2f6913f4a4a..00e41b9827c 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index a4aa4896c72..8d180ff2fdb 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -124,18 +124,3 @@ - Survival - Trinkets - GroupSpeciesBreathTool - -# Command -- type: roleLoadout - id: JobAdministrativeAssistant - groups: - - AdminAssistantHead - - AdminAssistantJumpsuit - - AdminAssistantOuter - - AdminAssistantShoes - - AdminAssistantGloves - - CommonBackpack - - Glasses - - Survival - - Trinkets - - GroupSpeciesBreathTool diff --git a/Resources/Prototypes/_DV/QuickPhrases/jobs.yml b/Resources/Prototypes/_DV/QuickPhrases/jobs.yml index 59f77ce7147..d85a68c6618 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/jobs.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/jobs.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml index 27b9452e49b..0a98482297d 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml @@ -20,9 +20,6 @@ # HoP - ClothingUniformJumpsuitHoPFormal - ClothingUniformJumpskirtHoPFormal - # Administrative Assistant - - ClothingUniformJumpsuitAdminAssistant - - ClothingUniformJumpskirtAdminAssistant - type: latheRecipePack id: ClothingEpistemics diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml index 6e912e6de14..2bd03272175 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml @@ -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 diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml deleted file mode 100644 index 84c1ce806ec..00000000000 --- a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml index 0099be8c5b2..c7bd20722a3 100644 --- a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml @@ -25,8 +25,5 @@ - type: playTimeTracker id: JobCargoAssistant -- type: playTimeTracker - id: JobAdminAssistant - - type: playTimeTracker id: JobSurgeon diff --git a/Resources/Prototypes/_DV/StatusIcon/job.yml b/Resources/Prototypes/_DV/StatusIcon/job.yml index 2b052953c1b..14b9d921228 100644 --- a/Resources/Prototypes/_DV/StatusIcon/job.yml +++ b/Resources/Prototypes/_DV/StatusIcon/job.yml @@ -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 diff --git a/Resources/Prototypes/_Impstation/datasets.yml b/Resources/Prototypes/_Impstation/datasets.yml index f8410ef3298..e82d09af13a 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -213,7 +213,6 @@ # Begin DeltaV Additions - Mystagogue - Chief Justice - - Administrative Assistant # End DeltaV Additions - type: dataset diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/AdminAssistant.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/AdminAssistant.png deleted file mode 100644 index 1f45dff992a..00000000000 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/AdminAssistant.png and /dev/null differ diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json index 29e4638de61..082c7cf7e8d 100644 --- a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json @@ -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 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 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" }, diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/adminassistant.png b/Resources/Textures/_DV/Markers/jobs.rsi/adminassistant.png deleted file mode 100644 index cf335a8a10d..00000000000 Binary files a/Resources/Textures/_DV/Markers/jobs.rsi/adminassistant.png and /dev/null differ diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/meta.json b/Resources/Textures/_DV/Markers/jobs.rsi/meta.json index 95c8a400717..3faf7e70c95 100644 --- a/Resources/Textures/_DV/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/_DV/Markers/jobs.rsi/meta.json @@ -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 2024", + "copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV. cargoassistant made by Radezolid, surgeon made by Janet Blackquill 2024", "size": { "x": 32, "y": 32 @@ -52,9 +52,6 @@ { "name": "cargoassistant" }, - { - "name": "adminassistant" - }, { "name": "surgeon" }, diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_DV/Objects/Devices/pda.rsi/meta.json index 8ad49216623..6c34104d21e 100644 --- a/Resources/Textures/_DV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Devices/pda.rsi/meta.json @@ -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 , surgeon by Janet Blackquill 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 , surgeon by Janet Blackquill 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" }, diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-admin-assistant.png b/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-admin-assistant.png deleted file mode 100644 index 198b8cd6342..00000000000 Binary files a/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-admin-assistant.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/_DV/Objects/Fun/figurines.rsi/meta.json index 1bfc30c449a..2bd3e114593 100644 --- a/Resources/Textures/_DV/Objects/Fun/figurines.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Fun/figurines.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "adminassistant" + "name": "secretary" }, { "name": "cj" diff --git a/Resources/Textures/_DV/Objects/Fun/figurines.rsi/adminassistant.png b/Resources/Textures/_DV/Objects/Fun/figurines.rsi/secretary.png similarity index 100% rename from Resources/Textures/_DV/Objects/Fun/figurines.rsi/adminassistant.png rename to Resources/Textures/_DV/Objects/Fun/figurines.rsi/secretary.png diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idadminassistant.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idadminassistant.png deleted file mode 100644 index 0b51c9fac27..00000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idadminassistant.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json index 375e48054a2..f588c1ad199 100644 --- a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json @@ -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 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 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" },