From c70307b01acaa54b447512b45310eb50bbd0cc29 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 11:35:44 -0300 Subject: [PATCH] Add an optional administrative assistant locker for mappers (#2578) * Added locker * Add the fill * Switch ID for coffee jug --- .../_DV/Catalog/Fills/Lockers/command.yml | 20 ++++++++++++++++++ .../Storage/Closets/Lockers/lockers.yml | 12 +++++++++++ .../Storage/closet.rsi/admin_assist.png | Bin 0 -> 231 bytes .../Storage/closet.rsi/admin_assist_door.png | Bin 0 -> 257 bytes .../Storage/closet.rsi/admin_assist_open.png | Bin 0 -> 203 bytes .../Structures/Storage/closet.rsi/meta.json | 11 +++++++++- 6 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/admin_assist_open.png 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 0000000000000000000000000000000000000000..ec586c528bad30bd935d40803200b40a51b40433 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy#sNMdu0UEs#aKqmTE)m$%`!mC zK2pmeQqL{PF0{$sS}v$|{j5HZ(|Z#d8X8WXJh^)H>N#`fEc^b;45&@8B*-tA;XfJ> z5Or7xlnnB8aSXBOO-@jdGf-q)^GQZV=8sH3gDfLAIN#3s#o`O=s|Q L^>bP0l+XkKJ3vwJ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..53711c74bdf78068a1c691afd8fd042a4974d63b GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy#sNMdu0R?H*f_XE<#p671N7XI zjQw)$LYwTZ<(yJ`>&t9r^?97$o3MKI>f^_chlYk$R8*`#tDp$fBUlpT7tHV<4G4%j zECfpCc)B=-SoFS~V9nRyz~K_k%G0{~yZzdlYsVO-Mg7oto+`9#>wIbL;`DZ>#!j;$ zi@boww~yF_53Ccom%l-LYQTgI{j!hPro`~fNNDqU;ooHHpeNBiiSs(&4DNl-iZu%l kda@j0W?!iACNiLa=}sZri+H|z0gz8TUHx3vIVCg!0HKp#UjP6A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..72517c9835dccc632777cd419bd42048d1c466f3 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyq5(c3t{_@oM@Gw9%`!mGEy*sl zDX4b+O|=EvfD-H_L4Lsu|G{8s{j%Rcp*T+$#}JF&rf>!z&Skr(I1Id9Su#wmdKI;Vst06P6iw*UYD literal 0 HcmV?d00001 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" } ] }