From 84265e5e2b6fcd8d7b65c712f15cada2826934d1 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Tue, 17 Dec 2024 16:15:23 -0300 Subject: [PATCH 1/2] Remove from upstream files --- .../Structures/Storage/closet.rsi/cj.png | Bin .../Structures/Storage/closet.rsi/cj_door.png | Bin .../Structures/Storage/closet.rsi/cj_open.png | Bin .../Structures/Storage/closet.rsi/clerk.png | Bin .../Storage/closet.rsi/clerk_door.png | Bin .../Storage/closet.rsi/clerk_open.png | Bin .../Structures/Storage/closet.rsi/meta.json | 20 +++++++++++++++++- .../Structures/Storage/closet.rsi/meta.json | 20 +----------------- 8 files changed, 20 insertions(+), 20 deletions(-) rename Resources/Textures/{ => DeltaV}/Structures/Storage/closet.rsi/cj.png (100%) rename Resources/Textures/{ => DeltaV}/Structures/Storage/closet.rsi/cj_door.png (100%) rename Resources/Textures/{ => DeltaV}/Structures/Storage/closet.rsi/cj_open.png (100%) rename Resources/Textures/{ => DeltaV}/Structures/Storage/closet.rsi/clerk.png (100%) rename Resources/Textures/{ => DeltaV}/Structures/Storage/closet.rsi/clerk_door.png (100%) rename Resources/Textures/{ => DeltaV}/Structures/Storage/closet.rsi/clerk_open.png (100%) diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj.png b/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/cj.png similarity index 100% rename from Resources/Textures/Structures/Storage/closet.rsi/cj.png rename to Resources/Textures/DeltaV/Structures/Storage/closet.rsi/cj.png diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png b/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/cj_door.png similarity index 100% rename from Resources/Textures/Structures/Storage/closet.rsi/cj_door.png rename to Resources/Textures/DeltaV/Structures/Storage/closet.rsi/cj_door.png diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png b/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/cj_open.png similarity index 100% rename from Resources/Textures/Structures/Storage/closet.rsi/cj_open.png rename to Resources/Textures/DeltaV/Structures/Storage/closet.rsi/cj_open.png diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk.png b/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/clerk.png similarity index 100% rename from Resources/Textures/Structures/Storage/closet.rsi/clerk.png rename to Resources/Textures/DeltaV/Structures/Storage/closet.rsi/clerk.png diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png b/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/clerk_door.png similarity index 100% rename from Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png rename to Resources/Textures/DeltaV/Structures/Storage/closet.rsi/clerk_door.png diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png b/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/clerk_open.png similarity index 100% rename from Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png rename to Resources/Textures/DeltaV/Structures/Storage/closet.rsi/clerk_open.png diff --git a/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/meta.json index 3f969bf17f7..98a03e8e481 100644 --- a/Resources/Textures/DeltaV/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/DeltaV/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", + "copyright": "Taken from tgstation, added psych locker based on medical locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord)", "license": "CC-BY-SA-3.0", "states": [ { @@ -36,6 +36,24 @@ }, { "name": "generic_icon" + }, + { + "name": "cj" + }, + { + "name": "cj_door" + }, + { + "name": "cj_open" + }, + { + "name": "clerk" + }, + { + "name": "clerk_door" + }, + { + "name": "clerk_open" } ] } diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index d26d0c6545d..5600268fde3 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites | CJ and Clerk lockers edited by Timemaster99 (Discord)", + "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites", "license": "CC-BY-SA-3.0", "states": [ { @@ -163,24 +163,6 @@ { "name": "chemical_door" }, - { - "name": "cj" - }, - { - "name": "cj_door" - }, - { - "name": "cj_open" - }, - { - "name": "clerk" - }, - { - "name": "clerk_door" - }, - { - "name": "clerk_open" - }, { "name": "cmo" }, From 8c3391019c0db379f2b9d9d263f7d1c179e0a9f4 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Tue, 17 Dec 2024 18:38:30 -0300 Subject: [PATCH 2/2] Create base lockers --- .../Storage/Closets/Lockers/lockers.yml | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index d442b0cf3f5..bb388fe66d4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -1,19 +1,30 @@ +- type: entity + parent: LockerBase + id: LockerBaseDeltaV + components: + - type: Sprite + sprite: DeltaV/Structures/Storage/closet.rsi + +- type: entity + parent: [ LockerBaseDeltaV, LockerBaseSecure ] + id: LockerBaseSecureDeltaV + - type: entity id: LockerChiefJustice - parent: LockerBaseSecure + parent: LockerBaseSecureDeltaV name: chief justice's locker components: - type: Appearance - type: EntityStorageVisuals - stateBaseClosed: cj + stateBaseClosed: cj stateDoorOpen: cj_open stateDoorClosed: cj_door - type: AccessReader access: [["ChiefJustice"]] - + - type: entity id: LockerClerk - parent: LockerBaseSecure + parent: LockerBaseSecureDeltaV name: clerk's locker components: - type: Appearance @@ -25,12 +36,10 @@ access: [["Clerk"]] - type: entity - parent: LockerBaseSecure + parent: LockerBaseSecureDeltaV id: LockerPsychologist name: psychologist's locker components: - - type: Sprite - sprite: DeltaV/Structures/Storage/closet.rsi - type: EntityStorageVisuals stateBaseClosed: psych stateDoorOpen: psych_open