Move pens out of paper.yml mess (space-wizards#28044)

* Move pens out of paper.yml mess

* forgor

* fix tests

* fux

* fix 2

Resources/Prototypes/Catalog/Cargo/cargo_service.yml

@@ -61,7 +61,7 @@
 - type: cargoProduct
   id: ServiceBureaucracy
   icon:
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     state: pen
   product: CrateServiceBureaucracy
   cost: 1000

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -298,7 +298,7 @@
   id: UplinkExplodingPen
   name: uplink-exploding-pen-name
   description: uplink-exploding-pen-desc
-  icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen }
+  icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen }
   productEntity: PenExplodingBox
   cost:
     Telecrystal: 4
@@ -472,7 +472,7 @@
   id: UplinkHypopen
   name: uplink-hypopen-name
   description: uplink-hypopen-desc
-  icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen }
+  icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen }
   productEntity: HypopenBox
   cost:
     Telecrystal: 6
@@ -1715,4 +1715,4 @@
   - !type:BuyerWhitelistCondition
     blacklist:
       components:
-      - SurplusBundle
+      - SurplusBundle

Resources/Prototypes/Entities/Objects/Misc/paper.yml

@@ -283,119 +283,6 @@
   components:
   - type: NukeCodePaper
 
-- type: entity
-  name: pen
-  parent: BaseItem
-  id: Pen
-  description: 'A dark ink pen.'
-  components:
-  - type: Tag
-    tags:
-    - Write
-    - Pen
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: pen
-  - type: Item
-    sprite: Objects/Misc/bureaucracy.rsi
-    heldPrefix: pen
-    size: Tiny
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 25
-
-- type: entity
-  parent: Pen
-  id: PenEmbeddable
-  abstract: true
-  components:
-  - type: EmbeddableProjectile
-    offset: 0.3,0.0
-    removalTime: 0.0
-  - type: ThrowingAngle
-    angle: 315
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Piercing: 3
-
-#TODO: I want the luxury pen to write a cool font like Merriweather in the future.
-
-- type: entity
-  name: luxury pen
-  parent: Pen
-  id: LuxuryPen
-  description: A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork.
-  components:
-  - type: Sprite
-    state: luxury_pen
-  - type: Item
-    heldPrefix: luxury_pen
-
-- type: entity
-  name: Cybersun pen
-  parent: PenEmbeddable
-  id: CyberPen
-  description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise.
-  components:
-  - type: Tag
-    tags:
-    - Write
-    - WriteIgnoreStamps
-    - Pickaxe
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: overpriced_pen
-  - type: MeleeWeapon
-    wideAnimationRotation: -45
-    damage:
-      types:
-        Piercing: 15
-    soundHit:
-      path: /Audio/Weapons/bladeslice.ogg
-  - type: Tool
-    qualities:
-      - Screwing
-    useSound:
-      collection: Screwdriver
-  - type: Item
-    sprite: Objects/Misc/bureaucracy.rsi
-    heldPrefix: overpriced_pen
-    size: Tiny
-
-- type: entity
-  name: captain's fountain pen
-  parent: PenEmbeddable
-  id: PenCap
-  description: 'A luxurious fountain pen for the captain of the station.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: pen_cap
-
-- type: entity
-  name: CentCom pen
-  parent: CyberPen
-  id: PenCentcom
-  description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: pen_centcom
-  - type: Item
-    sprite: Objects/Misc/bureaucracy.rsi
-    heldPrefix: pen_centcom
-
-- type: entity
-  name: hop's fountain pen
-  parent: PenEmbeddable
-  id: PenHop
-  description: 'A luxurious fountain pen for the hop of the station.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
-    state: pen_hop
-
 - type: entity
   id: BoxFolderBase
   parent: BoxBase

Resources/Prototypes/Entities/Objects/Misc/pen.yml

@@ -0,0 +1,106 @@
+- type: entity
+  name: pen
+  parent: BaseItem
+  id: Pen
+  description: A dark ink pen.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/pens.rsi
+    state: pen
+  - type: Item
+    sprite: Objects/Misc/pens.rsi
+    heldPrefix: pen
+    size: Tiny
+  - type: Tag
+    tags:
+    - Write
+    - Pen
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 25
+
+- type: entity
+  parent: Pen
+  id: PenEmbeddable
+  abstract: true
+  components:
+  - type: EmbeddableProjectile
+    offset: 0.3,0.0
+    removalTime: 0.0
+  - type: ThrowingAngle
+    angle: 315
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 3
+
+#TODO: I want the luxury pen to write a cool font like Merriweather in the future.
+
+- type: entity
+  name: luxury pen
+  parent: Pen
+  id: LuxuryPen
+  description: A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork.
+  components:
+  - type: Sprite
+    state: luxury_pen
+  - type: Item
+    heldPrefix: luxury_pen
+
+- type: entity
+  name: Cybersun pen
+  parent: PenEmbeddable
+  id: CyberPen
+  description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise.
+  components:
+  - type: Tag
+    tags:
+    - Write
+    - WriteIgnoreStamps
+    - Pickaxe
+    - Pen
+  - type: Sprite
+    state: overpriced_pen
+  - type: Item
+    heldPrefix: overpriced_pen
+  - type: MeleeWeapon
+    wideAnimationRotation: -45
+    damage:
+      types:
+        Piercing: 15
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: Tool
+    qualities:
+      - Screwing
+    useSound:
+      collection: Screwdriver
+
+- type: entity
+  name: captain's fountain pen
+  parent: PenEmbeddable
+  id: PenCap
+  description: A luxurious fountain pen for the captain of the station.
+  components:
+  - type: Sprite
+    state: pen_cap
+
+- type: entity
+  name: CentCom pen
+  parent: CyberPen
+  id: PenCentcom
+  description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style.
+  components:
+  - type: Sprite
+    state: pen_centcom
+  - type: Item
+    heldPrefix: pen_centcom
+
+- type: entity
+  name: hop's fountain pen
+  parent: PenEmbeddable
+  id: PenHop
+  description: A luxurious fountain pen for the hop of the station.
+  components:
+  - type: Sprite
+    state: pen_hop

Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin.",
   "size": {
     "x": 32,
     "y": 32
@@ -159,38 +159,6 @@
     {
       "name": "paper_dotmatrix_words"
     },
-    {
-      "name": "pen"
-    },
-    {
-      "name": "pen_cap"
-    },
-    {
-      "name": "pen_centcom"
-    },
-    {
-      "name": "pen_hop"
-    },
-    {
-      "name": "overpriced_pen"
-    },
-    {
-      "name": "luxury_pen"
-    },
-    {
-      "name": "pen_blue"
-    },
-    {
-      "name": "pen_red"
-    },
-    {
-      "name": "pen-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "pen-inhand-right",
-      "directions": 4
-    },
     {
       "name": "scrap"
     },

Resources/Textures/Objects/Misc/pens.rsi/meta.json

@@ -0,0 +1,59 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pen"
+    },
+    {
+      "name": "pen_cap"
+    },
+    {
+      "name": "pen_centcom"
+    },
+    {
+      "name": "pen_hop"
+    },
+    {
+      "name": "overpriced_pen"
+    },
+    {
+      "name": "luxury_pen"
+    },
+    {
+      "name": "pen_blue"
+    },
+    {
+      "name": "pen_red"
+    },
+    {
+      "name": "pen-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "pen-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "overpriced_pen-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "overpriced_pen-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "pen_centcom-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "pen_centcom-inhand-right",
+      "directions": 4
+    }
+  ]
+}