diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml new file mode 100644 index 00000000000..bca58ae24f1 --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml @@ -0,0 +1,20 @@ +- 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/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index a0a3d53248f..9024e23551e 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -46,3 +46,15 @@ stateDoorClosed: psych_door - type: AccessReader access: [["Psychologist"]] + +- type: entity + parent: LockerBaseSecureDeltaV + 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"]] diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist.png new file mode 100644 index 00000000000..ec586c528ba Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist_door.png new file mode 100644 index 00000000000..53711c74bdf Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist_open.png new file mode 100644 index 00000000000..72517c9835d Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist_open.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json index 98a03e8e481..30bc6b6194c 100644 --- a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, added psych locker based on medical locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord)", + "copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord)", "license": "CC-BY-SA-3.0", "states": [ { @@ -54,6 +54,15 @@ }, { "name": "clerk_open" + }, + { + "name": "admin_assist" + }, + { + "name": "admin_assist_door" + }, + { + "name": "admin_assist_open" } ] }