new pens for various departments

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -389,6 +389,14 @@
   - type: Pda
     id: QuartermasterIDCard
     state: pda-qm
+    #new delta v content
+    penSlot:
+      startingItem: PenLO
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+    #end delta v content
   - type: PdaBorderColor
     borderColor: "#e39751"
     accentVColor: "#a23e3e"
@@ -584,6 +592,14 @@
   - type: Pda
     id: CEIDCard
     state: pda-ce
+    #new delta v content
+    penSlot:
+      startingItem: PenCE
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+     #end delta v content
   - type: PdaBorderColor
     borderColor: "#949137"
     accentHColor: "#447987"
@@ -614,6 +630,14 @@
   - type: Pda
     id: CMOIDCard
     state: pda-cmo
+    #new delta v content
+    penSlot:
+      startingItem: PenCMO
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+    #end delta v content
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentHColor: "#447987"
@@ -678,7 +702,7 @@
   - type: Icon
     state: pda-chemistry
 
-- type: entity
+- type: entity 
   parent: BasePDA
   id: RnDPDA
   name: mystagogue PDA # DeltaV - Epistemics Department replacing Science
@@ -687,6 +711,14 @@
   - type: Pda
     id: RDIDCard
     state: pda-rd
+    #new delta v content
+    penSlot:
+      startingItem: PenMystagogue
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+    #end delta v content
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentHColor: "#447987"
@@ -732,6 +764,14 @@
   - type: Pda
     id: HoSIDCard
     state: pda-hos
+    #new delta v content
+    penSlot:
+      startingItem: PenHos
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+    #end delta v content
   - type: PdaBorderColor
     borderColor: "#A32D26"
     accentHColor: "#447987"
@@ -756,6 +796,14 @@
   - type: Pda
     id: WardenIDCard
     state: pda-warden
+   #new delta v content
+    penSlot:
+      startingItem: PenWarden
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+    #end delta v content
   - type: PdaBorderColor
     borderColor: "#A32D26"
     accentVColor: "#949137"
@@ -1027,6 +1075,14 @@
   - type: Pda
     id: PsychologistIDCard
     state: pda-medical
+    #new delta v content
+    penSlot:
+      startingItem: PenPsych
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+     #end delta v content 
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#447987"

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

@@ -42,13 +42,6 @@
     damage:
       types:
         Piercing: 3
-  - type: Tending # Shitmed
-    speed: 0.55
-  - type: SurgeryTool # Shitmed
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
 
 #TODO: I want the luxury pen to write a cool font like Merriweather in the future.
 
@@ -116,13 +109,91 @@
   description: A luxurious fountain pen for the captain of the station.
   components:
   - type: Sprite
-    state: pen_cap
+    state: pen_cap2
+
+#new delta v pens
+- type: entity
+  name: chief medical officer's pen
+  parent: PenEmbeddable
+  id: PenCMO
+  description: A fancy ballpoint pen belonging to the chief medical officer. Used for writing "do no harm" on things.
+  components:
+  - type: Sprite
+    state: pen_cmo
+
+- type: entity
+  name: psychologist's pen
+  parent: PenEmbeddable
+  id: PenPsych
+  description: A cheap ballpoint pen belonging to the Psychologist. Understands you better than anyone.
+  components:
+  - type: Sprite
+    state: pen_psych2
+
+- type: entity
+  name: mystagogue's pen
+  parent: PenEmbeddable
+  id: PenMystagogue
+  description: An anomalous pen that may or may not have 0.001% chance of exploding when clicked.
+  components:
+  - type: Sprite
+    state: pen_mystagogue
+
+- type: entity
+  name: head of security's pen
+  parent: PenEmbeddable
+  id: PenHos
+  description: A robust pen, your strongest tools for keeping the peace.
+  components:
+  - type: Sprite
+    state: pen_hos
+
+- type: entity
+  name: warden's pen
+  parent: PenEmbeddable
+  id: PenWarden
+  description: An orderly pen that is chewed at the top from long hours in the office.
+  components:
+  - type: Sprite
+    state: pen_warden
+
+- type: entity
+  name: chief engineer's pen
+  parent: PenEmbeddable
+  id: PenCE
+  description: Once belonging to an egghead, it now belongs to you. Solves practical problems.
+  components:
+  - type: Sprite
+    state: pen_ce
+
+
+- type: entity
+  name: logistics officer's pen
+  parent: PenEmbeddable
+  id: PenLO
+  description: An efficient pen. Vital for writing strongly worded letters to Epistemics.
+  components:
+  - type: Sprite
+    state: pen_lo
+
 
 - type: entity
   name: hop's fountain pen
   parent: PenEmbeddable
   id: PenHop
-  description: A luxurious fountain pen for the hop of the station.
+  description: This pen looks oddly familiar...
+  components:
+  - type: Sprite
+    state: pen_hop2
+
+
+- type: entity
+  name: chief justice's pen
+  parent: PenEmbeddable
+  id: PenCJ
+  description: A lawful pen adorned with a gold fountain tip.
   components:
   - type: Sprite
-    state: pen_hop
+    state: pen_cj
+
+    # end new delta v pens. hop pen and captain pens are changed from upstream.

Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml

@@ -66,7 +66,7 @@
   id: ChiefJusticePDA
   name: chief justice PDA
   description: Whosoever bears this PDA is the law.
-  components:
+  components: 
   - type: Sprite
     sprite: _DV/Objects/Devices/pda.rsi
     layers:
@@ -82,6 +82,14 @@
   - type: Pda
     id: ChiefJusticeIDCard
     state: pda-chiefjustice
+    #new cj pen
+    penSlot:
+      startingItem: PenCJ
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+    #end cj pen
   - type: PdaBorderColor
     borderColor: "#470823"
   - type: Icon

Resources/Textures/Objects/Misc/pens.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. 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. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. pen_cap2, pen_hos2, lo, mysta, ce, hos, cj, warden and psych pens sprited by kushbreth.",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,34 @@
     {
       "name": "pen"
     },
+
+	{
+      "name": "pen_cap2"
+    },
+	{
+      "name": "pen_hos"
+    },
+	{
+      "name": "pen_cmo"
+    },
+	{
+      "name": "pen_psych2"
+    },
+	{
+      "name": "pen_ce"
+    },
+	{
+      "name": "pen_hop2"
+    },
+	{
+      "name": "pen_lo"
+    },
+	{
+      "name": "pen_warden"
+    },
+	{
+      "name": "pen_mystagogue"
+    },
     {
       "name": "pen_cap"
     },
@@ -24,6 +52,9 @@
     },
     {
       "name": "luxury_pen"
+    },
+	{
+      "name": "pen_cj"
     },
     {
       "name": "pen_blue"
@@ -55,5 +86,6 @@
       "name": "pen_centcom-inhand-right",
       "directions": 4
     }
+
   ]
 }