]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
The Quartermaster's Requisition Digi-board (#21023)
authorEnDecc <33369477+Endecc@users.noreply.github.com>
Sun, 22 Oct 2023 07:34:06 +0000 (03:34 -0400)
committerGitHub <noreply@github.com>
Sun, 22 Oct 2023 07:34:06 +0000 (00:34 -0700)
* 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

13 files changed:
Resources/Locale/en-US/cargo/qm-clipboard.ftl [new file with mode: 0644]
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Resources/Prototypes/Entities/Objects/Misc/paper.yml
Resources/Prototypes/Objectives/objectiveGroups.yml
Resources/Prototypes/Objectives/traitor.yml
Resources/Textures/Objects/Misc/qm_clipboard.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/qm_clipboard.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/qm_clipboard.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/qm_clipboard.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_over.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_paper.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_pen.png [new file with mode: 0644]

diff --git a/Resources/Locale/en-US/cargo/qm-clipboard.ftl b/Resources/Locale/en-US/cargo/qm-clipboard.ftl
new file mode 100644 (file)
index 0000000..1f77aa9
--- /dev/null
@@ -0,0 +1 @@
+qm-clipboard-computer-verb-text = Toggle Requests
index bf1ca09eadb1b43965a194d26b47a899c220b1fd..0d000cc5dc890f4b9ad2705302436daddb15f693 100644 (file)
@@ -6,6 +6,7 @@
   - type: StorageFill
     contents:
       - id: ClothingNeckCloakQm
+      - id: BoxFolderQmClipboard
       - id: ClothingHeadsetCargo
       - id: ClothingUniformJumpsuitQMTurtleneck
       - id: ClothingUniformJumpskirtQMTurtleneck
index 5b4e5e24bac512dfaba71cba04383165eb013228..132d6b7aff91be95be4626aa1fb746fa89384229 100644 (file)
       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
index 01f3dd410946608bcf2d214d55b1928f6ce8ccc2..2ddf78e032ba8a02480f48e49380437cca11c4f7 100644 (file)
@@ -16,6 +16,7 @@
     NukeDiskStealObjective: 1
     MagbootsStealObjective: 1
     CorgiMeatStealObjective: 1
+    ClipboardStealObjective: 1
     CaptainGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
index cc4324e729ca231c1d15837584ea133218c44a4c..f0e8daad3d1cbabdb39afc035cc82c1db7c3774f 100644 (file)
     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 (file)
index 0000000..463095e
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 (file)
index 0000000..5c16b61
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 (file)
index 0000000..828ff70
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 (file)
index 0000000..7f03f20
--- /dev/null
@@ -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 (file)
index 0000000..3a2e26d
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 (file)
index 0000000..bf3c772
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 (file)
index 0000000..0734717
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 (file)
index 0000000..9bc3990
Binary files /dev/null and b/Resources/Textures/Objects/Misc/qm_clipboard.rsi/qm_clipboard_pen.png differ