diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml index 760401ef1611..357c0d719025 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml @@ -21,3 +21,100 @@ containers: entity_storage: !type:NestedSelector tableId: PsychologistLockerFill + +- type: entityTable + id: SurgeonOutfit + table: !type:GroupSelector + children: + - !type:AllSelector + weight: 10 + children: + - id: ClothingHeadHatSurgcapPurple + - id: UniformScrubsColorPurple + - !type:AllSelector + weight: 10 + children: + - id: ClothingHeadHatSurgcapGreen + - id: UniformScrubsColorGreen + - !type:AllSelector + weight: 10 + children: + - id: ClothingHeadHatSurgcapBlue + - id: UniformScrubsColorBlue + - !type:AllSelector + weight: 10 + children: + - id: ClothingHeadHatSurgcapCyan + - id: UniformScrubsColorCyan + - !type:AllSelector + weight: 5 + children: + - id: ClothingHeadHatSurgcapBlack + - id: UniformScrubsColorBlack + - !type:AllSelector + weight: 5 + children: + - id: ClothingHeadHatSurgcapPink + - id: UniformScrubsColorPink + - !type:AllSelector + weight: 5 + children: + - id: ClothingHeadHatSurgcapRainbow + - id: UniformScrubsColorRainbow + - !type:AllSelector + weight: 10 + children: + - id: ClothingHeadHatSurgcapWhite + - id: UniformScrubsColorWhite + - !type:AllSelector + weight: 1 + children: + - id: ClothingHeadHatSurgcapCybersun + - id: UniformScrubsColorCybersun + +- type: entityTable + id: SurgeonSanitzation + table: !type:GroupSelector + children: + - id: BoxNitrileGloves + - id: BoxSterileMask + +- type: entityTable + id: SurgeonGloves + table: !type:GroupSelector + children: + - id: ClothingHandsGlovesNitrile + - id: ClothingHandsGlovesLatex + +- type: entityTable + id: SurgeonLockerFill + table: !type:AllSelector + children: + - !type:NestedSelector + tableId: SurgeonOutfit + - !type:NestedSelector + tableId: SurgeonSanitzation + - !type:NestedSelector + tableId: SurgeonGloves + - id: ClothingHeadsetMedical + - id: ClothingEyesHudMedical + - id: ClothingBackpackDuffelSurgeryFilled + - id: ClothingOuterVestTank + - id: LunchboxMedicalFilledRandom + prob: 0.3 + - id: BoxSyringe + prob: 0.3 + - id: HandheldHealthAnalyzer + prob: 0.6 + - id: ClothingHeadMirror + prob: 0.4 + +- type: entity + parent: LockerSurgeon + id: LockerSurgeonFilled + suffix: Filled + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: SurgeonLockerFill 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 9024e23551e9..10126317fc02 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -47,6 +47,18 @@ - type: AccessReader access: [["Psychologist"]] +- type: entity + parent: LockerBaseSecureDeltaV + id: LockerSurgeon + name: surgeon's locker + components: + - type: EntityStorageVisuals + stateBaseClosed: surgeon + stateDoorOpen: surgeon_open + stateDoorClosed: surgeon_door + - type: AccessReader + access: [ [ "Surgery" ] ] + - type: entity parent: LockerBaseSecureDeltaV id: LockerAdministrativeAssistant diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json index 30bc6b6194c3..6012dc65ceed 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 and admin assist based on captain's 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). Surgeon's locker by Janet Blackquill 2024", "license": "CC-BY-SA-3.0", "states": [ { @@ -16,6 +16,15 @@ { "name": "psych_open" }, + { + "name": "surgeon" + }, + { + "name": "surgeon_door" + }, + { + "name": "surgeon_open" + }, { "name": "locked" }, diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon.png new file mode 100644 index 000000000000..0ea69624743a Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_door.png new file mode 100644 index 000000000000..631e2a03985d Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_door.png differ diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_open.png new file mode 100644 index 000000000000..ca629c4fcc29 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_open.png differ