From 3ac8bc71f10e9ae538ad0517e25ff5d0d86ae708 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Wed, 23 Apr 2025 09:31:42 +0300 Subject: [PATCH] Cleanup: Move folders out of bureaucracy.rsi and paper.yml (#35108) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- .../Markers/Spawners/Random/folders.yml | 2 +- .../Entities/Objects/Misc/folders.yml | 313 +++++++++++++++++ .../Entities/Objects/Misc/paper.yml | 316 +----------------- Resources/Prototypes/Objectives/traitor.yml | 2 +- .../Objects/Misc/bureaucracy.rsi/meta.json | 21 -- .../folder-base.png | Bin .../folder-centcom.png | Bin .../folder-colormap.png | Bin .../folder-overlay-paper.png | Bin .../folder-sec-doc.png | Bin .../folder-stamp-inverse.png | Bin .../folder-white.png | Bin .../Objects/Misc/folders.rsi/meta.json | 32 ++ 13 files changed, 348 insertions(+), 338 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Misc/folders.yml rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => folders.rsi}/folder-base.png (100%) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => folders.rsi}/folder-centcom.png (100%) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => folders.rsi}/folder-colormap.png (100%) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => folders.rsi}/folder-overlay-paper.png (100%) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => folders.rsi}/folder-sec-doc.png (100%) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => folders.rsi}/folder-stamp-inverse.png (100%) rename Resources/Textures/Objects/Misc/{bureaucracy.rsi => folders.rsi}/folder-white.png (100%) create mode 100644 Resources/Textures/Objects/Misc/folders.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml index 3ca5731bd8..7631d43316 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml @@ -8,7 +8,7 @@ - type: Transform anchored: false - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi + sprite: Objects/Misc/folders.rsi layers: - state: folder-base - state: folder-colormap diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml new file mode 100644 index 0000000000..f72d4c3abc --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml @@ -0,0 +1,313 @@ +- type: entity + id: BoxFolderNuclearCodes + parent: BaseItem + name: nuclear code folder + components: + - type: Sprite + sprite: Objects/Misc/folders.rsi + layers: + - state: folder-colormap + color: "#cc2323" + - state: folder-base + - state: folder-stamp-inverse + color: "#1dff00" + - type: SpawnItemsOnUse + items: + - id: NukeCodePaper + sound: + path: /Audio/Effects/packetrip.ogg + - type: Appearance + +- type: entity + id: BoxFolderBase + parent: BoxBase + name: folder + description: A folder filled with top secret paperwork. + components: + - type: Sprite + sprite: Objects/Misc/folders.rsi + layers: + - state: folder-colormap + - state: folder-base +# RandomSpriteColor requires netsync which is currently incompatible with ItemMapper +# - type: RandomSpriteColor +# sprite: Objects/Misc/folders.rsi +# state: folder-colormap +# colors: +# red: "#cc2323" +# blue: "#355d99" +# yellow: "#b38e3c" +# white: "#e6e6e6" +# grey: "#999999" +# black: "#3f3f3f" +# green: "#43bc38" + - type: Item + sprite: Objects/Misc/folders.rsi + size: Small + shape: null + - type: Storage + maxItemSize: Small + grid: + - 0,0,4,3 + whitelist: + tags: + - Document + - type: ItemMapper + mapLayers: + folder-overlay-paper: + whitelist: + tags: + - Document + - type: Appearance + - type: Tag + tags: + - Folder + - type: StorageFill + contents: + - id: Paper + prob: 0.5 + - id: PaperOffice + prob: 0.4 + - id: Paper + prob: 0.3 + - id: PaperOffice + prob: 0.2 + - id: Paper + prob: 0.2 + +- type: entity + id: BoxFolderRed + parent: BoxFolderBase + suffix: Red + components: + - type: Sprite + layers: + - state: folder-colormap + color: "#cc2323" + - state: folder-base + +- type: entity + id: BoxFolderBlue + parent: BoxFolderBase + suffix: Blue + components: + - type: Sprite + layers: + - state: folder-colormap + color: "#355d99" + - state: folder-base + +- type: entity + id: BoxFolderYellow + parent: BoxFolderBase + suffix: Yellow + components: + - type: Sprite + layers: + - state: folder-colormap + color: "#b38e3c" + - state: folder-base + +- type: entity + id: BoxFolderWhite + parent: BoxFolderBase + suffix: White + components: + - type: Sprite + layers: + - state: folder-white + - state: folder-base + +- type: entity + id: BoxFolderGrey + parent: BoxFolderBase + suffix: Grey + components: + - type: Sprite + layers: + - state: folder-colormap + color: "#999999" + - state: folder-base + +- type: entity + id: BoxFolderBlack + parent: BoxFolderBase + suffix: Black + components: + - type: Sprite + layers: + - state: folder-colormap + color: "#3f3f3f" + - state: folder-base + +- type: entity + id: BoxFolderGreen + parent: BoxFolderBase + suffix: Green + components: + - type: Sprite + layers: + - state: folder-colormap + color: "#43bc38" + - state: folder-base + +- type: entity + id: BoxFolderCentCom + name: CentComm folder + parent: BoxFolderBase + categories: [ DoNotMap ] + description: CentComm's miserable little pile of secrets! + components: + - type: Sprite + layers: + - state: folder-centcom + - state: folder-base + +- type: entity + id: BoxFolderClipboard + parent: BoxFolderBase + name: clipboard + description: The weapon of choice for those on the front lines of bureaucracy. + components: + - type: Sprite + sprite: Objects/Misc/clipboard.rsi + layers: + - state: clipboard + - state: clipboard_paper + map: ["clipboard_paper"] + visible: false + - state: clipboard_pen + map: ["clipboard_pen"] + visible: false + - state: clipboard_over + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + pen_slot: !type:ContainerSlot {} + - type: ItemSlots + slots: + pen_slot: + name: clipboard-slot-component-slot-name-pen + whitelist: + tags: + - Write + insertOnInteract: false + - type: Item + sprite: Objects/Misc/clipboard.rsi + size: Small + - type: Clothing + slots: [belt] + quickEquip: false + sprite: Objects/Misc/clipboard.rsi + - type: Storage + grid: + - 0,0,5,3 + whitelist: + tags: + - Document + - type: ItemMapper + mapLayers: + clipboard_paper: + whitelist: + tags: + - Document + clipboard_pen: + whitelist: + tags: + - Write + - type: MeleeWeapon + wideAnimationRotation: 180 + damage: + types: + Blunt: 6 + +- type: entity + id: BoxFolderCentComClipboard + parent: BoxFolderClipboard + name: CentComm clipboard + description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentComm officials, seldom seen actually used. + components: + - type: Sprite + sprite: Objects/Misc/cc-clipboard.rsi + layers: + - state: clipboard + - state: clipboard_paper + map: ["clipboard_paper"] + visible: false + - state: clipboard_pen + map: ["clipboard_pen"] + visible: false + - state: clipboard_over + - type: Item + sprite: Objects/Misc/cc-clipboard.rsi + - type: Clothing + sprite: Objects/Misc/cc-clipboard.rsi + +- type: entity + id: BoxFolderQmClipboard + parent: [BoxFolderClipboard, BaseGrandTheftContraband] + name: requisition digi-board + description: A bulky electric clipboard, filled with shipping orders and financing details. With so many compromising documents, you ought to keep this safe. + components: + - type: Sprite + sprite: Objects/Misc/qm_clipboard.rsi + layers: + - state: qm_clipboard + - state: qm_clipboard_paper + map: ["qm_clipboard_paper"] + visible: false + - state: qm_clipboard_pen + map: ["qm_clipboard_pen"] + visible: false + - state: qm_clipboard_over + - type: ItemSlots + slots: + pen_slot: + name: clipboard-slot-component-slot-name-pen + whitelist: + tags: + - Write + insertOnInteract: true + - type: Item + sprite: Objects/Misc/qm_clipboard.rsi + size: Normal + - type: Clothing + sprite: Objects/Misc/qm_clipboard.rsi + - type: Storage + grid: + - 0,0,4,3 + quickInsert: true + - type: StorageFill + contents: [] #to override base clipboard fill + - type: ItemMapper + mapLayers: + qm_clipboard_paper: + whitelist: + tags: + - Document + qm_clipboard_pen: + whitelist: + tags: + - Write + - type: CargoOrderConsole + removeLimitAccess: [ "Quartermaster" ] + - type: ActivatableUI + verbText: qm-clipboard-computer-verb-text + key: enum.CargoConsoleUiKey.Orders + - type: UserInterface + interfaces: + enum.CargoConsoleUiKey.Orders: + type: CargoOrderConsoleBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: MeleeWeapon + damage: + types: + Blunt: 10 + - type: Tag + tags: + - Folder + - HighRiskItem + - type: StealTarget + stealGroup: BoxFolderQmClipboard diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index c6f7e0e405..ae7ab0f442 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -50,7 +50,7 @@ - type: Item size: Tiny - type: PhysicalComposition - + - type: entity name: paper parent: BasePaper @@ -307,320 +307,6 @@ components: - type: NukeCodePaper -- type: entity - id: BoxFolderNuclearCodes - parent: BaseItem - name: nuclear code folder - components: - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - layers: - - state: folder-colormap - color: "#cc2323" - - state: folder-base - - state: folder-stamp-inverse - color: "#1dff00" - - type: SpawnItemsOnUse - items: - - id: NukeCodePaper - sound: - path: /Audio/Effects/packetrip.ogg - - type: Appearance - -- type: entity - id: BoxFolderBase - parent: BoxBase - name: folder - description: A folder filled with top secret paperwork. - components: - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - layers: - - state: folder-colormap - - state: folder-base -# RandomSpriteColor requires netsync which is currently incompatible with ItemMapper -# - type: RandomSpriteColor -# sprite: Objects/Misc/bureaucracy.rsi -# state: folder-colormap -# colors: -# red: "#cc2323" -# blue: "#355d99" -# yellow: "#b38e3c" -# white: "#e6e6e6" -# grey: "#999999" -# black: "#3f3f3f" -# green: "#43bc38" - - type: Item - sprite: Objects/Misc/bureaucracy.rsi - size: Small - shape: null - - type: Storage - maxItemSize: Small - grid: - - 0,0,4,3 - whitelist: - tags: - - Document - - type: ItemMapper - mapLayers: - folder-overlay-paper: - whitelist: - tags: - - Document - - type: Appearance - - type: Tag - tags: - - Folder - - type: StorageFill - contents: - - id: Paper - prob: 0.5 - - id: PaperOffice - prob: 0.4 - - id: Paper - prob: 0.3 - - id: PaperOffice - prob: 0.2 - - id: Paper - prob: 0.2 - -- type: entity - id: BoxFolderRed - parent: BoxFolderBase - suffix: Red - components: - - type: Sprite - layers: - - state: folder-colormap - color: "#cc2323" - - state: folder-base - -- type: entity - id: BoxFolderBlue - parent: BoxFolderBase - suffix: Blue - components: - - type: Sprite - layers: - - state: folder-colormap - color: "#355d99" - - state: folder-base - -- type: entity - id: BoxFolderYellow - parent: BoxFolderBase - suffix: Yellow - components: - - type: Sprite - layers: - - state: folder-colormap - color: "#b38e3c" - - state: folder-base - -- type: entity - id: BoxFolderWhite - parent: BoxFolderBase - suffix: White - components: - - type: Sprite - layers: - - state: folder-white - - state: folder-base - -- type: entity - id: BoxFolderGrey - parent: BoxFolderBase - suffix: Grey - components: - - type: Sprite - layers: - - state: folder-colormap - color: "#999999" - - state: folder-base - -- type: entity - id: BoxFolderBlack - parent: BoxFolderBase - suffix: Black - components: - - type: Sprite - layers: - - state: folder-colormap - color: "#3f3f3f" - - state: folder-base - -- type: entity - id: BoxFolderGreen - parent: BoxFolderBase - suffix: Green - components: - - type: Sprite - layers: - - state: folder-colormap - color: "#43bc38" - - state: folder-base - -- type: entity - id: BoxFolderCentCom - name: CentComm folder - parent: BoxFolderBase - categories: [ DoNotMap ] - description: CentComm's miserable little pile of secrets! - components: - - type: Sprite - layers: - - state: folder-centcom - - state: folder-base - -- type: entity - id: BoxFolderClipboard - parent: BoxFolderBase - name: clipboard - description: The weapon of choice for those on the front lines of bureaucracy. - components: - - type: Sprite - sprite: Objects/Misc/clipboard.rsi - layers: - - state: clipboard - - state: clipboard_paper - map: ["clipboard_paper"] - visible: false - - state: clipboard_pen - map: ["clipboard_pen"] - visible: false - - state: clipboard_over - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] - pen_slot: !type:ContainerSlot {} - - type: ItemSlots - slots: - pen_slot: - name: clipboard-slot-component-slot-name-pen - whitelist: - tags: - - Write - insertOnInteract: false - - type: Item - sprite: Objects/Misc/clipboard.rsi - size: Small - - type: Clothing - slots: [belt] - quickEquip: false - sprite: Objects/Misc/clipboard.rsi - - type: Storage - grid: - - 0,0,5,3 - whitelist: - tags: - - Document - - type: ItemMapper - mapLayers: - clipboard_paper: - whitelist: - tags: - - Document - clipboard_pen: - whitelist: - tags: - - Write - - type: MeleeWeapon - wideAnimationRotation: 180 - damage: - types: - Blunt: 6 - -- type: entity - id: BoxFolderCentComClipboard - parent: BoxFolderClipboard - name: CentComm clipboard - description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentComm officials, seldom seen actually used. - components: - - type: Sprite - sprite: Objects/Misc/cc-clipboard.rsi - layers: - - state: clipboard - - state: clipboard_paper - map: ["clipboard_paper"] - visible: false - - state: clipboard_pen - map: ["clipboard_pen"] - visible: false - - state: clipboard_over - - type: Item - sprite: Objects/Misc/cc-clipboard.rsi - - type: Clothing - sprite: Objects/Misc/cc-clipboard.rsi - -- type: entity - id: BoxFolderQmClipboard - parent: [BoxFolderClipboard, BaseGrandTheftContraband] - name: requisition digi-board - description: A bulky electric clipboard, filled with shipping orders and financing details. With so many compromising documents, you ought to keep this safe. - components: - - type: Sprite - sprite: Objects/Misc/qm_clipboard.rsi - layers: - - state: qm_clipboard - - state: qm_clipboard_paper - map: ["qm_clipboard_paper"] - visible: false - - state: qm_clipboard_pen - map: ["qm_clipboard_pen"] - visible: false - - state: qm_clipboard_over - - type: ItemSlots - slots: - pen_slot: - name: clipboard-slot-component-slot-name-pen - whitelist: - tags: - - Write - insertOnInteract: true - - type: Item - sprite: Objects/Misc/qm_clipboard.rsi - size: Normal - - type: Clothing - sprite: Objects/Misc/qm_clipboard.rsi - - type: Storage - grid: - - 0,0,4,3 - quickInsert: true - - type: StorageFill - contents: [] #to override base clipboard fill - - type: ItemMapper - mapLayers: - qm_clipboard_paper: - whitelist: - tags: - - Document - qm_clipboard_pen: - whitelist: - tags: - - Write - - type: CargoOrderConsole - removeLimitAccess: [ "Quartermaster" ] - - type: ActivatableUI - verbText: qm-clipboard-computer-verb-text - key: enum.CargoConsoleUiKey.Orders - - type: UserInterface - interfaces: - enum.CargoConsoleUiKey.Orders: - type: CargoOrderConsoleBoundUserInterface - enum.StorageUiKey.Key: - type: StorageBoundUserInterface - - type: MeleeWeapon - damage: - types: - Blunt: 10 - - type: Tag - tags: - - Folder - - HighRiskItem - - type: StealTarget - stealGroup: BoxFolderQmClipboard - - type: entity parent: [Paper, BaseSyndicateContraband] # eat or burn your damn piece of paper damn thieves id: TraitorCodePaper diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 1da9953b60..0f53488e69 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -16,7 +16,7 @@ components: - type: Objective icon: - sprite: Objects/Misc/bureaucracy.rsi + sprite: Objects/Misc/folders.rsi state: folder-white - type: MultipleTraitorsRequirement diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index d92fe17b66..87d5f9d0c1 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -22,27 +22,6 @@ { "name": "envelope_torn_overlay" }, - { - "name": "folder-base" - }, - { - "name": "folder-colormap" - }, - { - "name": "folder-white" - }, - { - "name": "folder-centcom" - }, - { - "name": "folder-overlay-paper" - }, - { - "name": "folder-sec-doc" - }, - { - "name": "folder-stamp-inverse" - }, { "name": "label_cart" }, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png b/Resources/Textures/Objects/Misc/folders.rsi/folder-base.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png rename to Resources/Textures/Objects/Misc/folders.rsi/folder-base.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png b/Resources/Textures/Objects/Misc/folders.rsi/folder-centcom.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png rename to Resources/Textures/Objects/Misc/folders.rsi/folder-centcom.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png b/Resources/Textures/Objects/Misc/folders.rsi/folder-colormap.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png rename to Resources/Textures/Objects/Misc/folders.rsi/folder-colormap.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png b/Resources/Textures/Objects/Misc/folders.rsi/folder-overlay-paper.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png rename to Resources/Textures/Objects/Misc/folders.rsi/folder-overlay-paper.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-sec-doc.png b/Resources/Textures/Objects/Misc/folders.rsi/folder-sec-doc.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-sec-doc.png rename to Resources/Textures/Objects/Misc/folders.rsi/folder-sec-doc.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-stamp-inverse.png b/Resources/Textures/Objects/Misc/folders.rsi/folder-stamp-inverse.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-stamp-inverse.png rename to Resources/Textures/Objects/Misc/folders.rsi/folder-stamp-inverse.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png b/Resources/Textures/Objects/Misc/folders.rsi/folder-white.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png rename to Resources/Textures/Objects/Misc/folders.rsi/folder-white.png diff --git a/Resources/Textures/Objects/Misc/folders.rsi/meta.json b/Resources/Textures/Objects/Misc/folders.rsi/meta.json new file mode 100644 index 0000000000..75cdf9e019 --- /dev/null +++ b/Resources/Textures/Objects/Misc/folders.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folder-base" + }, + { + "name": "folder-colormap" + }, + { + "name": "folder-white" + }, + { + "name": "folder-centcom" + }, + { + "name": "folder-overlay-paper" + }, + { + "name": "folder-sec-doc" + }, + { + "name": "folder-stamp-inverse" + } + ] +} -- 2.51.2