From 686780c512a5f272a216bccddaef269bc7c6342f Mon Sep 17 00:00:00 2001
From: CrudeWax <75271456+CrudeWax@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:46:19 +0300
Subject: [PATCH] Hypopen (#6826)

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
---
 .../Prototypes/Catalog/uplink_catalog.yml     |  20 +++++++++-----
 .../Entities/Objects/Misc/paper.yml           |  25 +++++++++++++++++-
 .../Objects/Specific/Medical/hypospray.yml    |  24 +++++++++++++++++
 .../Objects/Misc/bureaucracy.rsi/meta.json    |   3 +++
 .../Misc/bureaucracy.rsi/overpriced_pen.png   | Bin 0 -> 317 bytes
 5 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/overpriced_pen.png

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 45752b0f16..fda17a96fe 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -129,6 +129,13 @@
   icon: /Textures/Objects/Tools/emag.rsi/icon.png
   price: 8
 
+- type: uplinkListing
+  id: UplinkHypopen
+  category: Utility
+  itemId: Hypopen
+  description: A chemical hypospray disguised as a pen, capable of instantly injecting up to 15u of reagents. Starts empty.
+  price: 4
+
 # Bundles
 
 - type: uplinkListing
@@ -223,6 +230,13 @@
 
 # Misc
 
+- type: uplinkListing
+  id: UplinkCyberpen
+  category: Misc
+  itemId: CyberPen
+  description: Cybersun's legal department pen. Smells vaguely of hard-light and war profiteering.
+  price: 4
+
 - type: uplinkListing
   id: UplinkBalloon
   category: Misc
@@ -243,12 +257,6 @@
   itemId: RevolverCapGun
   price: 4
 
-- type: uplinkListing
-  id: UplinkPen
-  category: Misc
-  itemId: Pen
-  price: 2
-
 - type: uplinkListing
   id: UplinkCigarettes
   category: Misc
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index c998205fee..8fcceead12 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -71,6 +71,28 @@
     HeldPrefix: pen
     size: 2
 
+- type: entity
+  name: Cybersun pen
+  parent: BaseItem
+  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. It's not literally pointless, only figuratively.
+  components:
+  - type: Tag
+    tags:
+    - Write
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    state: overpriced_pen
+    netsync: false
+  - type: Pickaxe
+    damage:
+      types:
+        Piercing: 5
+  - type: Item
+    sprite: Objects/Misc/bureaucracy.rsi
+    HeldPrefix: overpriced_pen
+    size: 2
+
 - type: entity
   id: BoxFolderBase
   parent: BoxBase
@@ -113,6 +135,8 @@
     visuals:
     - type: MappedItemVisualizer
 
+    
+    
 - type: entity
   id: BoxFolderRed
   parent: BoxFolderBase
@@ -183,4 +207,3 @@
     - state: folder-colormap
       color: "#3f3f3f"
     - state: folder-base
-
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 87663717aa..40fc1a4999 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -87,3 +87,27 @@
           Quantity: 10
         - ReagentId: Epinephrine
           Quantity: 5
+
+- type: entity
+  name: pen
+  suffix: Hypopen
+  parent: BaseItem
+  description: A dark ink pen.
+  id: Hypopen
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    state: pen
+    netsync: false
+  - type: Item
+    sprite: Objects/Misc/bureaucracy.rsi
+    HeldPrefix: pen
+  - type: SolutionContainerManager
+    solutions:
+      hypospray:
+        maxVol: 15
+  - type: RefillableSolution
+    solution: hypospray
+  - type: ExaminableSolution
+    solution: hypospray
+  - type: Hypospray
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index 4792a6a523..ae882f5379 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -221,6 +221,9 @@
     },
     {
       "name": "pen"
+    },
+	{
+      "name": "overpriced_pen"
     },
     {
       "name": "pen_blue"
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/overpriced_pen.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/overpriced_pen.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a2a3c04f3b4d7a25338c345cf5341e51cf18ca3
GIT binary patch
literal 317
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}-#uL%Ln2y}
z6C_v{Cy4Yk1sYswID1F=f9^B6pZ>a^XLxLl2@ajv2n3F?H#)TX6mBv8uBrKFY+zsz
zv%hw_V@yQH!|WQPP#MP{4jIpFi8Zm)ju(8oP{$TqTicdi78b(Ix#+;D4IBRR@Jx8{
zocGMn{JUFU*)Mm!Q@_iKNlf(BA-DgQx{v<74m<zryx0r#g1!XqFTdB%xcYJa)pNh<
z-5Htx$}lp6R7JjB^Z&Gg^}qcUlX_F!Hw3(Dn4N##uuQ`6&-XWJ$v^)66=$~B&-|rX
z#=y+X?0l4k&5f-s{{PQPNr^btJ&6e!Vhh_gLVd{ff|=pu>LB0dt5tcxAYkxx^>bP0
Hl+XkKlL&{F

literal 0
HcmV?d00001