Clipboards added to autolathe (and other folder changes) (#37705)

* Added plastic clipboards; added plastic clipboards to the PTech machine; added clipboards & plastic clipboards to the autolathe * Fixed plastic clipboard inhand sprites; added and implemented 'empty' clipboard prototypes * Cleaned up code for empty clipboards; removed BoxFolderBaseEmpty since now it's redundant * Extensive folder cleanup * Bugfixed random folder spawns * Reduced amount of paper in CrateServiceBureaucracy * Medical folder sprite rename * BaseTraitorSocialObjective sprite fix * Added office paper to bureaucracy crate * First pass at addressing recent review * Second pass at addressing recent review * Fix of weird migration.yml error * whoops, forgot to undo the rename to folder-white.png in the last few commits * whoops, didn't commit that last commit properly * whoops, forgot to undo this reordering
2025-08-27 03:07:32 -04:00
parent 2965522cdd
commit 60ea2b37fb
22 changed files with 247 additions and 89 deletions
--- a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
@@ -124,40 +124,37 @@
    contents:
      - id: RubberStampApproved
      - id: RubberStampDenied
+      - id: Paper
+        amount: 5
      - id: Pen
-      - id: Pen
-      - id: Pen
-      - id: BoxFolderBase
+        amount: 3
+      - id: BoxFolderBaseEmpty
        orGroup: folderA
-      - id: BoxFolderBlack
+      - id: BoxFolderBlackEmpty
        orGroup: folderA
-      - id: BoxFolderBlue
+      - id: BoxFolderBlueEmpty
        orGroup: folderA
-      - id: BoxFolderGreen
+      - id: BoxFolderGreenEmpty
        orGroup: folderA
-      - id: BoxFolderGrey
+      - id: BoxFolderGreyEmpty
        orGroup: folderA
-      - id: BoxFolderRed
+      - id: BoxFolderRedEmpty
        orGroup: folderA
-      - id: BoxFolderWhite
+      - id: BoxFolderYellowEmpty
        orGroup: folderA
-      - id: BoxFolderYellow
-        orGroup: folderA
-      - id: BoxFolderBase
+      - id: BoxFolderBaseEmpty
        orGroup: folderB
-      - id: BoxFolderBlack
+      - id: BoxFolderBlackEmpty
        orGroup: folderB
-      - id: BoxFolderBlue
+      - id: BoxFolderBlueEmpty
        orGroup: folderB
-      - id: BoxFolderGreen
+      - id: BoxFolderGreenEmpty
        orGroup: folderB
-      - id: BoxFolderGrey
+      - id: BoxFolderGreyEmpty
        orGroup: folderB
-      - id: BoxFolderRed
+      - id: BoxFolderRedEmpty
        orGroup: folderB
-      - id: BoxFolderWhite
-        orGroup: folderB
-      - id: BoxFolderYellow
+      - id: BoxFolderYellowEmpty
        orGroup: folderB
      - id: CrayonBox
        prob: 0.50
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -144,15 +144,17 @@
  - type: StorageFill
    contents:
    - id: Paper
-      amount: 15
+      amount: 12
+    - id: PaperOffice
+      amount: 6
    - id: Pen
      amount: 2
-    - id: BoxFolderClipboard
+    - id: BoxFolderClipboardEmpty
      amount: 2
    - id: HandLabeler
-    - id: BoxFolderBlue
-    - id: BoxFolderRed
-    - id: BoxFolderYellow
+    - id: BoxFolderBlueEmpty
+    - id: BoxFolderRedEmpty
+    - id: BoxFolderYellowEmpty
    - id: NewtonCradle
    - id: BoxEnvelope
    - id: BrbSign
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -7,6 +7,7 @@
    ClothingHeadsetGrey: 5
    RubberStampApproved: 1
    RubberStampDenied: 1
+    BoxFolderPlasticClipboardEmpty: 2
    Paper: 10
    Envelope: 10
    HandLabeler: 2
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml
@@ -15,10 +15,10 @@
  - type: RandomSpawner
    offset: 0
    prototypes:
+    - BoxFolderBase
    - BoxFolderRed
    - BoxFolderBlue
    - BoxFolderYellow
-      - BoxFolderWhite
    - BoxFolderGrey
    - BoxFolderBlack
    - BoxFolderGreen
--- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: BoxFolderNuclearCodes
  parent: BaseItem
+  id: BoxFolderNuclearCodes
  name: nuclear code folder
  components:
  - type: Sprite
@@ -19,8 +19,8 @@
  - type: Appearance

 - type: entity
-  id: BoxFolderBase
  parent: BoxBase
+  id: BoxFolderBaseEmpty
  name: folder
  description: A folder filled with top secret paperwork.
  components:
@@ -62,6 +62,12 @@
  - type: Tag
    tags:
    - Folder
+
+- type: entity
+  abstract: true
+  id: BoxFolderFill # Include this as a parent prototype to add 0-5 random papers to a folder's inventory when spawned.
+  suffix: Filled
+  components:
  - type: StorageFill
    contents:
    - id: Paper
@@ -76,8 +82,22 @@
      prob: 0.2

 - type: entity
-  id: BoxFolderRed
-  parent: BoxFolderBase
+  abstract: true
+  id: BoxFolderFillThreePapers # Like BoxFolderFill, but always has exactly three sheets of standard paper; use for roles' startingGear
+  suffix: 3 papers
+  components:
+  - type: StorageFill
+    contents:
+    - id: Paper
+      amount: 3
+
+- type: entity
+  parent: [BoxFolderBaseEmpty, BoxFolderFill]
+  id: BoxFolderBase
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderRedEmpty
  suffix: Red
  components:
  - type: Sprite
@@ -87,8 +107,13 @@
    - state: folder-base

 - type: entity
-  id: BoxFolderBlue
-  parent: BoxFolderBase
+  parent: [BoxFolderRedEmpty, BoxFolderFill]
+  id: BoxFolderRed
+  suffix: Red, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderBlueEmpty
  suffix: Blue
  components:
  - type: Sprite
@@ -98,8 +123,13 @@
    - state: folder-base

 - type: entity
-  id: BoxFolderYellow
-  parent: BoxFolderBase
+  parent: [BoxFolderBlueEmpty, BoxFolderFill]
+  id: BoxFolderBlue
+  suffix: Blue, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderYellowEmpty
  suffix: Yellow
  components:
  - type: Sprite
@@ -109,18 +139,13 @@
    - state: folder-base

 - type: entity
-  id: BoxFolderWhite
-  parent: BoxFolderBase
-  suffix: White
-  components:
-  - type: Sprite
-    layers:
-    - state: folder-white
-    - state: folder-base
+  parent: [BoxFolderYellowEmpty, BoxFolderFill]
+  id: BoxFolderYellow
+  suffix: Yellow, Filled

 - type: entity
-  id: BoxFolderGrey
-  parent: BoxFolderBase
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderGreyEmpty
  suffix: Grey
  components:
  - type: Sprite
@@ -130,8 +155,13 @@
    - state: folder-base

 - type: entity
-  id: BoxFolderBlack
-  parent: BoxFolderBase
+  parent: [BoxFolderGreyEmpty, BoxFolderFill]
+  id: BoxFolderGrey
+  suffix: Grey, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderBlackEmpty
  suffix: Black
  components:
  - type: Sprite
@@ -141,8 +171,13 @@
    - state: folder-base

 - type: entity
-  id: BoxFolderGreen
-  parent: BoxFolderBase
+  parent: [BoxFolderBlackEmpty, BoxFolderFill]
+  id: BoxFolderBlack
+  suffix: Black, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderGreenEmpty
  suffix: Green
  components:
  - type: Sprite
@@ -152,10 +187,30 @@
    - state: folder-base

 - type: entity
-  id: BoxFolderCentCom
-  name: CentComm folder
-  parent: BoxFolderBase
+  parent: [BoxFolderGreenEmpty, BoxFolderFill]
+  id: BoxFolderGreen
+  suffix: Green, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderWhiteEmpty
+  suffix: White
+  components:
+  - type: Sprite
+    layers:
+    - state: folder-white
+    - state: folder-base
+
+- type: entity
+  parent: [BoxFolderWhiteEmpty, BoxFolderFill]
+  id: BoxFolderWhite
+  suffix: White, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderCentComEmpty
  categories: [ DoNotMap ]
+  name: CentComm folder
  description: CentComm's miserable little pile of secrets!
  components:
  - type: Sprite
@@ -164,8 +219,13 @@
    - state: folder-base

 - type: entity
-  id: BoxFolderClipboard
-  parent: BoxFolderBase
+  parent: [BoxFolderCentComEmpty, BoxFolderFill]
+  id: BoxFolderCentCom
+  suffix: DO NOT MAP, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderClipboardEmpty
  name: clipboard
  description: The weapon of choice for those on the front lines of bureaucracy.
  components:
@@ -223,8 +283,42 @@
        Blunt: 6

 - type: entity
-  id: BoxFolderCentComClipboard
-  parent: BoxFolderClipboard
+  parent: [BoxFolderClipboardEmpty, BoxFolderFill]
+  id: BoxFolderClipboard
+
+- type: entity
+  parent: [BoxFolderClipboardEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderClipboardThreePapers
+
+- type: entity
+  parent: BoxFolderClipboardEmpty
+  id: BoxFolderPlasticClipboardEmpty
+  name: plastic clipboard
+  description: A cheap clipboard made of blue plastic. For those who aren't yet ready to wield the bureaucratic might of a proper wooden clipboard.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/plastic_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/plastic_clipboard.rsi
+  - type: Clothing
+    sprite: Objects/Misc/plastic_clipboard.rsi
+
+- type: entity
+  parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFill]
+  id: BoxFolderPlasticClipboard
+
+- type: entity
+  parent: BoxFolderClipboardEmpty
+  id: BoxFolderCentComClipboardEmpty
  name: CentComm clipboard
  description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentComm officials, seldom seen actually used.
  components:
@@ -245,8 +339,16 @@
    sprite: Objects/Misc/cc-clipboard.rsi

 - type: entity
+  parent: [BoxFolderCentComClipboardEmpty, BoxFolderFill]
+  id: BoxFolderCentComClipboard
+
+- type: entity
+  parent: [BoxFolderCentComClipboardEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderCentComClipboardThreePapers
+
+- type: entity
+  parent: [BoxFolderClipboardEmpty, BaseGrandTheftContraband]
  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:
@@ -278,8 +380,6 @@
    grid:
    - 0,0,4,3
    quickInsert: true
-  - type: StorageFill
-    contents: [] #to override base clipboard fill
  - type: ItemMapper
    mapLayers:
      qm_clipboard_paper:
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -123,6 +123,7 @@
    - PartsStatic
    - AtmosStatic
    - CablesStatic
+    - PaperworkStatic
    - CargoStatic
    - MaterialsStatic
    - BasicChemistryStatic
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -6,12 +6,13 @@
      rolls: !type:RangeNumberSelector
        range: 2, 4
      children:
-      - id: BoxFolderBlue
+      - id: BoxFolderBase
      - id: BoxFolderRed
+      - id: BoxFolderBlue
      - id: BoxFolderYellow
-      - id: BoxFolderWhite
      - id: BoxFolderGrey
      - id: BoxFolderBlack
+      - id: BoxFolderGreen
    - !type:GroupSelector
      rolls: !type:RangeNumberSelector
        range: 0, 3
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -17,7 +17,7 @@
  - type: Objective
    icon:
      sprite: Objects/Misc/folders.rsi
-      state: folder-white
+      state: folder-colormap
  - type: MultipleTraitorsRequirement

 - type: entity
--- a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
@@ -38,6 +38,12 @@
  - CableMVStack
  - CableHVStack

+- type: latheRecipePack
+  id: PaperworkStatic
+  recipes:
+  - BoxFolderClipboardEmpty
+  - BoxFolderPlasticClipboardEmpty
+
 ## Dynamic

 # Things you'd expect sci salv and engi to make use of
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -277,3 +277,18 @@
  materials:
    Steel: 30

+- type: latheRecipe
+  id: BoxFolderClipboardEmpty
+  result: BoxFolderClipboardEmpty
+  completetime: 2
+  materials:
+    Wood: 100
+    Steel: 25
+
+- type: latheRecipe
+  id: BoxFolderPlasticClipboardEmpty
+  result: BoxFolderPlasticClipboardEmpty
+  completetime: 2
+  materials:
+    Plastic: 100
+    Steel: 25
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -39,7 +39,7 @@
  equipment:
    id: QuartermasterPDA
    ears: ClothingHeadsetQM
-    belt: BoxFolderClipboard
+    belt: BoxFolderClipboardThreePapers
    pocket1: AppraisalTool
  storage:
    back:
--- a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
@@ -28,7 +28,7 @@
    id: CentcomPDA
    ears: ClothingHeadsetAltCentCom
    belt: WeaponPistolN1984
-    pocket1: BoxFolderBlack
+    pocket1: BoxFolderCentComClipboardThreePapers
    pocket2: PenCentcom


--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -65,7 +65,7 @@
    id: HoPPDA
    gloves: ClothingHandsGlovesHop
    ears: ClothingHeadsetAltCommand
-    belt: BoxFolderClipboard
+    belt: BoxFolderClipboardThreePapers
    eyes: ClothingEyesHudCommand
  storage:
    back:
--- a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
@@ -1239,7 +1239,7 @@
    pocket1: BookSun
    pocket2: BookRandomStory
  inhand:
-  - BoxFolderClipboard
+  - BoxFolderClipboardThreePapers

 - type: startingGear
  id: VisitorMusicianFancyAltA
@@ -1509,7 +1509,7 @@
    back: ClothingBackpackSatchel
    ears: ClothingHeadsetService
    pocket1: MicrophoneInstrument
-    pocket2: BoxFolderClipboard
+    pocket2: BoxFolderClipboardThreePapers

 - type: startingGear
  id: VisitorReporterAlt
@@ -1520,7 +1520,7 @@
    back: ClothingBackpackSatchel
    ears: ClothingHeadsetService
    pocket1: MicrophoneInstrument
-    pocket2: BoxFolderClipboard
+    pocket2: BoxFolderClipboardThreePapers

 - type: startingGear
  id: VisitorServiceWorker
--- a/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/clipboard.png
+++ b/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/clipboard.png
--- a/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/clipboard_over.png
+++ b/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/clipboard_over.png
--- a/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/clipboard_paper.png
+++ b/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/clipboard_paper.png
--- a/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/clipboard_pen.png
+++ b/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/clipboard_pen.png
--- a/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/equipped-BELT.png
+++ b/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/equipped-BELT.png
--- a/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/inhand-left.png
+++ b/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/inhand-left.png
--- a/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/inhand-right.png
+++ b/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/inhand-right.png
--- a/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/plastic_clipboard.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Clipboard sprites are by WJohn (Github) for tgstation, taken from https://github.com/tgstation/tgstation/commit/3cc10b1785bff95e861d722b5164189951761921. Inhand sprites by nmajask (Github) for SS14. Aforementioned sprites modified again by Hitlinemoss. clipboard_paper is a modified version of paper from bureaucracy.rsi.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "clipboard"
+    },
+    {
+      "name": "clipboard_over"
+    },
+    {
+      "name": "clipboard_paper"
+    },
+    {
+      "name": "clipboard_pen"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}