From: EnDecc <33369477+Endecc@users.noreply.github.com> Date: Sun, 22 Oct 2023 07:34:06 +0000 (-0400) Subject: The Quartermaster's Requisition Digi-board (#21023) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=002d3be16b3fa2e3da383e4c6608f4efcfc90c37;p=space-station-14.git The Quartermaster's Requisition Digi-board (#21023) * Added sprites * Added item in game * Ditched glowing light indicator to simplify implementation * Added clipboard to locker fill * Added traitor objective * forgor meta.json * forgor clip textures on front-facing in-hand sprites * lowered concussiveness of bureaucracy * added remote cargo ordering, paper sucking, and removed paper on spawn * slightly reduce storage capacity so it can fit in backpacks --- diff --git a/Resources/Locale/en-US/cargo/qm-clipboard.ftl b/Resources/Locale/en-US/cargo/qm-clipboard.ftl new file mode 100644 index 0000000000..1f77aa98f0 --- /dev/null +++ b/Resources/Locale/en-US/cargo/qm-clipboard.ftl @@ -0,0 +1 @@ +qm-clipboard-computer-verb-text = Toggle Requests diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index bf1ca09ead..0d000cc5dc 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -6,6 +6,7 @@ - type: StorageFill contents: - id: ClothingNeckCloakQm + - id: BoxFolderQmClipboard - id: ClothingHeadsetCargo - id: ClothingUniformJumpsuitQMTurtleneck - id: ClothingUniformJumpskirtQMTurtleneck diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 5b4e5e24ba..132d6b7aff 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -494,6 +494,76 @@ types: Blunt: 6 +- type: entity + id: BoxFolderQmClipboard + parent: BoxFolderBase + 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: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + pen_slot: !type:ContainerSlot {} + - type: ItemSlots + slots: + pen_slot: + name: Pen + whitelist: + tags: + - Write + insertOnInteract: true + - type: Item + sprite: Objects/Misc/qm_clipboard.rsi + size: 30 + - type: Clothing + slots: [belt] + quickEquip: false + sprite: Objects/Misc/qm_clipboard.rsi + - type: Storage + capacity: 90 + quickInsert: true + whitelist: + tags: + - Document + - type: StorageFill + contents: [] #to override base folder fill + - type: ItemMapper + mapLayers: + qm_clipboard_paper: + whitelist: + tags: + - Document + qm_clipboard_pen: + whitelist: + tags: + - Write + - type: CargoOrderConsole + - type: ActivatableUI + verbText: qm-clipboard-computer-verb-text + key: enum.CargoConsoleUiKey.Orders + - type: UserInterface + interfaces: + - key: enum.CargoConsoleUiKey.Orders + type: CargoOrderConsoleBoundUserInterface + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + - type: MeleeWeapon + damage: + types: + Blunt: 10 + # Stamps - type: entity name: generic rubber stamp diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 01f3dd4109..2ddf78e032 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -16,6 +16,7 @@ NukeDiskStealObjective: 1 MagbootsStealObjective: 1 CorgiMeatStealObjective: 1 + ClipboardStealObjective: 1 CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index cc4324e729..f0e8daad3d 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -196,6 +196,19 @@ prototype: ClothingShoesBootsMagAdv owner: job-name-ce +## qm + +- type: entity + noSpawn: true + parent: BaseTraitorStealObjective + id: ClipboardStealObjective + components: + - type: NotJobRequirement + job: Quartermaster + - type: StealCondition + prototype: BoxFolderQmClipboard + owner: job-name-qm + ## hop - type: entity diff --git a/Resources/Textures/Objects/Misc/qm_clipboard.rsi/equipped-BELT.png b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/equipped-BELT.png new file mode 100644 index 0000000000..463095e280 Binary files /dev/null and b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Misc/qm_clipboard.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/inhand-left.png new file mode 100644 index 0000000000..5c16b61f09 Binary files /dev/null and b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/qm_clipboard.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/inhand-right.png new file mode 100644 index 0000000000..828ff7061f Binary files /dev/null and b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/qm_clipboard.rsi/meta.json b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/meta.json new file mode 100644 index 0000000000..7f03f20980 --- /dev/null +++ b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Clipboard sprites are by Endecc (Github) for SS14 Wizard's Den, taken from https://github.com/space-wizards/space-station-14/pull/21023, qm_clipboard_paper is a modified version of paper from bureaucracy.rsi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "qm_clipboard" + }, + { + "name": "qm_clipboard_over" + }, + { + "name": "qm_clipboard_paper" + }, + { + "name": "qm_clipboard_pen" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard.png b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard.png new file mode 100644 index 0000000000..3a2e26d8c9 Binary files /dev/null and b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard.png differ diff --git a/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_over.png b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_over.png new file mode 100644 index 0000000000..bf3c772ec3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_over.png differ diff --git a/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_paper.png b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_paper.png new file mode 100644 index 0000000000..073471721a Binary files /dev/null and b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_paper.png differ diff --git a/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_pen.png b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_pen.png new file mode 100644 index 0000000000..9bc39904d4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_pen.png differ