Trying to fix conflicts

Resources/Locale/en-US/deltav/paper/stamp-component.ftl

@@ -1,4 +1,4 @@
 stamp-component-stamped-name-notary = NOTARY
 stamp-component-stamped-name-chiefjustice = Chief Justice
-stamp-component-stamped-name-psychologist = Psychologist
+stamp-component-stamped-name-prosec = Prosecutor
 stamp-component-stamped-name-pharmacist = Pharmacist

Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl

@@ -5,4 +5,5 @@ id-card-access-level-prosecutor = Prosecutor
 id-card-access-level-clerk = Clerk
 id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
+id-card-access-level-robotics = Robotics
 id-card-access-level-pharmacist = Pharmacist

Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -8,7 +8,7 @@
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi
-    
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitHoPFormal
@@ -209,6 +209,19 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformalsuit.rsi
 
+# Corpsman alt uniforms
+
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitBrigmedicTurtle
+  name: corpsman's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the dedication to reach the position of Corpsman.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi
+
 # Detective uniform
 
 - type: entity
@@ -222,7 +235,18 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi
 
-# Detective uniform
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitDetTurtle
+  name: detective's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Detective.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi
+
+# Senior Officer uniform
 
 - type: entity
   parent: ClothingUniformFoldableBase
@@ -259,6 +283,30 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_grey.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitWardenTurtle
+  name: warden's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the patience to reach the position of Warden.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi
+
+# HoS alt uniforms
+
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformJumpsuitHoSTurtle
+  name: head of security's turtleneck
+  description: A comfortable and tight-fitting turtleneck for those with the tenacity to reach the position of Head of Security.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+
 # Central Command Uniform - ported from Velta
 
 - type: entity
@@ -349,6 +397,30 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi
 
+- type: entity
+  parent: ClothingUniformFoldableBase
+  id: ClothingUniformBlackTurtleneck
+  name: black turtleneck
+  description: A simple black turtleneck. Perfect for any wannabe spy.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/black_turtleneck.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/black_turtleneck.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformCybersunAttorney
+  name: cybersun attorney suit
+  description: This durable Suit Jacket and Turtleneck Combo doubles as an Accounting suit, and includes an extra button. Take that, Nerd-otrasen!
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi
+
+# Pharmacist suits
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitPharmacistShirt

Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml

@@ -126,6 +126,14 @@
   - type: AccessReader
     access: [["Clerk"]]
 
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsRobotics
+  suffix: Robotics, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"]] # Uses research access until the job is added
+
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsPharmacist

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

@@ -78,6 +78,27 @@
 
 - type: entity
   parent: BasePDA
+  id: BaseJusticePDA
+  abstract: true
+  components:
+  - type: Pda
+    penSlot:
+      startingItem: LuxuryPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: CartridgeLoader
+    diskSpace: 7
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - CrimeAssistCartridge
+    - SecWatchCartridge
+
+- type: entity
+  parent: BaseJusticePDA
   id: ChiefJusticePDA
   name: chief justice PDA
   description: Whosoever bears this PDA is the law.
@@ -97,26 +118,14 @@
   - type: Pda
     id: ChiefJusticeIDCard
     state: pda-chiefjustice
-    penSlot:
-      startingItem: LuxuryPen
-      priority: -1
-      whitelist:
-        tags:
-        - Write
   - type: PdaBorderColor
     borderColor: "#470823"
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
     state: pda-chiefjustice
-  - type: CartridgeLoader
-    preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
 
 - type: entity
-  parent: BasePDA
+  parent: BaseJusticePDA
   id: ClerkPDA
   name: clerk PDA
   description: It has the stamp to prove it's been officially notarized!
@@ -136,26 +145,14 @@
   - type: Pda
     id: ClerkIDCard
     state: pda-clerk
-    penSlot:
-      startingItem: LuxuryPen
-      priority: -1
-      whitelist:
-        tags:
-        - Write
   - type: PdaBorderColor
     borderColor: "#611528"
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
     state: pda-clerk
-  - type: CartridgeLoader
-    preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
-
+
 - type: entity
-  parent: BasePDA
+  parent: BaseJusticePDA
   id: ProsecutorPDA
   name: prosecutor PDA
   description: Sharp. Looks like it could prosecute you all on its own.
@@ -175,23 +172,11 @@
   - type: Pda
     id: ProsecutorIDCard
     state: pda-prosecutor
-    penSlot:
-      startingItem: LuxuryPen
-      priority: -1
-      whitelist:
-        tags:
-        - Write
   - type: PdaBorderColor
     borderColor: "#6f6192"
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
     state: pda-prosecutor
-  - type: CartridgeLoader # DeltaV - Crime Assist
-    preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - CrimeAssistCartridge
 
 - type: entity
   parent: SyndiPDA
@@ -244,15 +229,13 @@
 
 # Passenger
 
+# event visitors get externals emergency access, not a good thing for powergaming tiders
 - type: entity
-  parent: PassengerPDA
-  id: VisitorPDA
-  name: visitor PDA
-  description: If you hold onto this, it can be a fun souvenier when you get to... wherever you're going!
+  parent: VisitorPDA
+  id: VisitorPDALoadout
   components:
   - type: Pda
-    id: VisitorIDCard
-    state: pda-visitor # - aPDA Sprite Rework
+    id: VisitorIDCardLoadout
 
 - type: entity
   parent: PassengerPDA
@@ -496,4 +479,4 @@
   components:
   - type: Pda
     id: FoolIDCard
-    state: pda-fool # - aPDA Sprite Rework
+    state: pda-fool # - aPDA Sprite Rework

Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml

@@ -1,16 +1,19 @@
 - type: entity
-  name: psychologist's rubber stamp
+  name: notary stamp
   parent: RubberStampBase
-  id: RubberStampPsychologist
+  id: RubberStampNotary
   suffix: DO NOT MAP
+  description: An old-fashioned seal for marking important documents, made of polished bronze.
   components:
   - type: Stamp
-    stampedName: stamp-component-stamped-name-psychologist
-    stampedColor: "#00ccff"
-    stampState: "paper_stamp-psychologist"
+    stampedName: stamp-component-stamped-name-notary
+    stampedColor: "#a81f3d"
+    stampState: "paper_stamp-notary"
   - type: Sprite
     sprite: DeltaV/Objects/Misc/stamps.rsi
-    state: stamp-psychologist
+    state: stamp-notary
+  - type: StealTarget
+    stealGroup: RubberStampNotary
 
 - type: entity
   name: pharmacist's rubber stamp
@@ -26,35 +29,32 @@
   - type: Sprite
     sprite: DeltaV/Objects/Misc/stamps.rsi
     state: stamp-pharmacist
-    
+
 - type: entity
-  name: notary stamp
+  name: chief justice stamp
   parent: RubberStampBase
-  id: RubberStampNotary
+  id: RubberStampChiefJustice
   suffix: DO NOT MAP
-  description: An old-fashioned seal for marking important documents, made of polished bronze.
   components:
   - type: Stamp
-    stampedName: stamp-component-stamped-name-notary
-    stampedColor: "#a81f3d"
+    stampedName: stamp-component-stamped-name-chiefjustice
+    stampedColor: "#6b2833"
     stampState: "paper_stamp-notary"
   - type: Sprite
     sprite: DeltaV/Objects/Misc/stamps.rsi
-    state: stamp-notary
-  - type: StealTarget
-    stealGroup: RubberStampNotary
-
+    state: stamp-cj
+
 - type: entity
-  name: chief justice stamp
+  name: prosecutor's rubber stamp
   parent: RubberStampBase
-  id: RubberStampChiefJustice
+  id: RubberStampProsec
   suffix: DO NOT MAP
+  description: A rubber stamp for stamping important documents. A more legal way to annoy Security.
   components:
   - type: Stamp
-    stampedName: stamp-component-stamped-name-chiefjustice
-    stampedColor: "#6b2833"
-    stampState: "paper_stamp-notary"
+    stampedName: stamp-component-stamped-name-prosec
+    stampedColor: "#562D3D"
+    stampState: "paper_stamp-prosec"
   - type: Sprite
     sprite: DeltaV/Objects/Misc/stamps.rsi
-    state: stamp-cj
-
+    state: stamp-prosec