]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cleanup: Move folders out of bureaucracy.rsi and paper.yml (#35108)
authorWinkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Wed, 23 Apr 2025 06:31:42 +0000 (09:31 +0300)
committerGitHub <noreply@github.com>
Wed, 23 Apr 2025 06:31:42 +0000 (23:31 -0700)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
13 files changed:
Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml
Resources/Prototypes/Entities/Objects/Misc/folders.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Misc/paper.yml
Resources/Prototypes/Objectives/traitor.yml
Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Resources/Textures/Objects/Misc/folders.rsi/folder-base.png [moved from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png with 100% similarity]
Resources/Textures/Objects/Misc/folders.rsi/folder-centcom.png [moved from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-centcom.png with 100% similarity]
Resources/Textures/Objects/Misc/folders.rsi/folder-colormap.png [moved from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png with 100% similarity]
Resources/Textures/Objects/Misc/folders.rsi/folder-overlay-paper.png [moved from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png with 100% similarity]
Resources/Textures/Objects/Misc/folders.rsi/folder-sec-doc.png [moved from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-sec-doc.png with 100% similarity]
Resources/Textures/Objects/Misc/folders.rsi/folder-stamp-inverse.png [moved from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-stamp-inverse.png with 100% similarity]
Resources/Textures/Objects/Misc/folders.rsi/folder-white.png [moved from Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png with 100% similarity]
Resources/Textures/Objects/Misc/folders.rsi/meta.json [new file with mode: 0644]

index 3ca5731bd8e8ffc63e78ee729552fd685a4a9f2d..7631d43316ba610a47a570cb3f449a1f2a27ec34 100644 (file)
@@ -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 (file)
index 0000000..f72d4c3
--- /dev/null
@@ -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
index c6f7e0e4056565e09725ec7c3fb313c667086235..ae7ab0f442b0b2109e35499e3f10e0164e74ca21 100644 (file)
@@ -50,7 +50,7 @@
   - type: Item
     size: Tiny
   - type: PhysicalComposition
-  
+
 - type: entity
   name: paper
   parent: BasePaper
   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
index 1da9953b609a197de7732f29b242a776c9a97e18..0f53488e69e97d512dba119c7e0313287e985ca4 100644 (file)
@@ -16,7 +16,7 @@
   components:
   - type: Objective
     icon:
-      sprite: Objects/Misc/bureaucracy.rsi
+      sprite: Objects/Misc/folders.rsi
       state: folder-white
   - type: MultipleTraitorsRequirement
 
index d92fe17b66e025d5ef76f7c5afcf9cb6e7e0a0e8..87d5f9d0c1d858dc568fc93a26cfe214249322a4 100644 (file)
     {
       "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/folders.rsi/meta.json b/Resources/Textures/Objects/Misc/folders.rsi/meta.json
new file mode 100644 (file)
index 0000000..75cdf9e
--- /dev/null
@@ -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"
+        }
+    ]
+}