addressed review issues.

DeltaV-Station · Jan 15, 2025 · 6f2f0af · 6f2f0af
1 parent c88ec93
commit 6f2f0af
Show file tree

Hide file tree

Showing 16 changed files with 174 additions and 130 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -389,7 +389,7 @@
   - type: Pda
     id: QuartermasterIDCard
     state: pda-qm
-    #new delta v content
+    # Begin DeltaV changes
     penSlot:
       startingItem: PenLO
       priority: -1
@@ -552,7 +552,9 @@
     id: CaptainIDCard
     state: pda-captain
     penSlot:
-      startingItem: PenCap
+    # Begin DeltaV changes
+      startingItem: PenCapNew
+    # End DeltaV changes  
       priority: -1
       whitelist:
         tags:
@@ -572,7 +574,9 @@
     id: HoPIDCard
     state: pda-hop
     penSlot:
-      startingItem: PenHop
+    # Begin DeltaV changes
+      startingItem: PenHopNew
+    # End DeltaV changes
       priority: -1
       whitelist:
         tags:
@@ -592,14 +596,14 @@
   - type: Pda
     id: CEIDCard
     state: pda-ce
-    #new delta v content
+    # Begin DeltaV changes
     penSlot:
       startingItem: PenCE
       priority: -1
       whitelist:
         tags:
         - Write
-     #end delta v content
+    # End DeltaV changes
   - type: PdaBorderColor
     borderColor: "#949137"
     accentHColor: "#447987"
@@ -630,14 +634,14 @@
   - type: Pda
     id: CMOIDCard
     state: pda-cmo
-    #new delta v content
+    # Begin DeltaV changes
     penSlot:
       startingItem: PenCMO
       priority: -1
       whitelist:
         tags:
         - Write
-    #end delta v content
+    # End DeltaV changes
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentHColor: "#447987"
@@ -702,7 +706,7 @@
   - type: Icon
     state: pda-chemistry
 
-- type: entity 
+- type: entity
   parent: BasePDA
   id: RnDPDA
   name: mystagogue PDA # DeltaV - Epistemics Department replacing Science
@@ -711,14 +715,14 @@
   - type: Pda
     id: RDIDCard
     state: pda-rd
-    #new delta v content
+    # Begin DeltaV changes
     penSlot:
       startingItem: PenMystagogue
       priority: -1
       whitelist:
         tags:
         - Write
-    #end delta v content
+    # End DeltaV changes
   - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentHColor: "#447987"
@@ -764,14 +768,14 @@
   - type: Pda
     id: HoSIDCard
     state: pda-hos
-    #new delta v content
+    # Begin DeltaV changes
     penSlot:
       startingItem: PenHos
       priority: -1
       whitelist:
         tags:
         - Write
-    #end delta v content
+    # End DeltaV changes
   - type: PdaBorderColor
     borderColor: "#A32D26"
     accentHColor: "#447987"
@@ -796,14 +800,14 @@
   - type: Pda
     id: WardenIDCard
     state: pda-warden
-   #new delta v content
+   # Begin DeltaV changes
     penSlot:
       startingItem: PenWarden
       priority: -1
       whitelist:
         tags:
         - Write
-    #end delta v content
+    # Begin DeltaV changes
   - type: PdaBorderColor
     borderColor: "#A32D26"
     accentVColor: "#949137"

diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -42,6 +42,13 @@
     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.
 
@@ -109,91 +116,13 @@
   description: A luxurious fountain pen for the captain of the station.
   components:
   - type: Sprite
-    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
-
+    state: pen_cap
 
 - type: entity
   name: hop's fountain pen
   parent: PenEmbeddable
   id: PenHop
-  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.
+  description: A luxurious fountain pen for the hop of the station.
   components:
   - type: Sprite
-    state: pen_cj
-
-    # end new delta v pens. hop pen and captain pens are changed from upstream.
+    state: pen_hop
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/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,14 +82,12 @@
   - 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

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml
@@ -0,0 +1,103 @@
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenCMO
+  name: chief medical officer's pen
+  description: A fancy ballpoint pen belonging to the chief medical officer. Comes with enhanced surgical grip!
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_cmo
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenPsych
+  name: psychologist's pen
+  description: A cheap ballpoint pen belonging to the Psychologist. Understands you better than anyone.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_psych2
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenMystagogue
+  name: mystagogue's pen
+  description: An anomalous pen that may or may not have 0.001% chance of exploding when clicked.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_mystagogue
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenHos
+  name: head of security's pen
+  description: A robust pen, your strongest tool for keeping the peace.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_hos
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenWarden
+  name: warden's pen
+  description: An orderly pen that is chewed at the top from long hours in the office.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_warden
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenCE
+  name: chief engineer's pen
+  description: Once belonging to an egghead, it now belongs to you. Solves practical problems.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_ce
+
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenLO
+  name: logistics officer's pen
+  description: An efficient pen. Vital for writing strongly worded letters to Epistemics.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_lo
+
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenCJ
+  name: chief justice's pen
+  description: A lawful pen adorned with a gold fountain tip.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_cj
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenCapNew
+  name: captain's fountain pen
+  description: A luxurious fountain pen for the captain of the station.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_cap2
+
+- type: entity
+  parent: PenEmbeddable
+  id: PenHopNew
+  name: head of personnel's pen
+  description: Looks oddly familiar...
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/pens.rsi
+    state: pen_hop2
+