Add surgeon access & role (#2645)

* Add surgeon PDA and ID * Add surgeon access * Add surgeon job * Add Surgery door prototypes * Add Surgeon locker prototypes
DeltaV-Station · Jan 9, 2025 · 9a0abc3 · 9a0abc3
1 parent d6b7f74
commit 9a0abc3
Show file tree

Hide file tree

Showing 35 changed files with 399 additions and 5 deletions.
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -92,6 +92,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "Prosecutor", // Delta V - Add Prosecutor access
         "Robotics", // DeltaV
         "Clerk", // Delta V - Add Clerk access
+        "Surgery", // Delta V - Add Surgery access
     };
 
     [Serializable, NetSerializable]

diff --git a/Resources/Locale/en-US/_DV/job/job-names.ftl b/Resources/Locale/en-US/_DV/job/job-names.ftl
@@ -1,4 +1,5 @@
 job-name-medical-borg = Medical Cyborg
+job-name-surgeon = Surgeon
 job-name-chief-justice = Chief Justice
 job-name-clerk = Clerk
 job-name-prosecutor = Prosecutor

diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl
@@ -81,6 +81,12 @@ loadout-group-psychologist-outerclothing = Psychologist outer clothing
 loadout-group-psychologist-shoes = Psychologist shoes
 loadout-group-psychologist-id-delta = Psychologist PDA
 
+loadout-group-surgeon-head = Surgeon head
+loadout-group-surgeon-mask = Surgeon mask
+loadout-group-surgeon-scrubs = Surgeon scrubs
+loadout-group-surgeon-gloves = Surgeon gloves
+loadout-group-surgeon-id = Surgeon PDA
+
 # Miscellaneous
 loadout-group-scarfs = Scarf
 

diff --git a/Resources/Locale/en-US/_DV/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_DV/prototypes/access/accesses.ftl
@@ -6,3 +6,4 @@ 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-surgery = Surgery
diff --git a/Resources/Prototypes/Access/medical.yml b/Resources/Prototypes/Access/medical.yml
@@ -22,3 +22,4 @@
   - Chemistry
   - Paramedic # DeltaV - Add Paramedic access
   - Psychologist # DeltaV - Add Psychologist access
+  - Surgery # DeltaV - Add Surgery access
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -50,3 +50,4 @@
   - Clerk # DeltaV - Add Clerk access
   - Corpsman # DeltaV - Add Corpsman access
   - Robotics # DeltaV: Robotics access
+  - Surgery # DeltaV: Surgery access
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -59,6 +59,7 @@
       - Salvage
       - Security
       - Service
+      - Surgery # Delta V: Add Surgery access
       - Theatre
       - Zookeeper #Delta V: Add Zookeeper Access
       - ChiefJustice  #Delta V: Add Chief Justice Access
@@ -132,6 +133,7 @@
     - Salvage
     - Security
     - Service
+    - Surgery # DeltaV: Add surgery
     - Theatre
     - CentralCommand
     - NuclearOperative

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -34,6 +34,7 @@
   - External # DeltaV - Paramedics need this access
   - Psychologist # DeltaV - Add Psychologist access
   - Cryogenics
+  - Surgery # DeltaV - Add surgery access
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -16,6 +16,7 @@
   extendedAccess:
   - Chemistry
   - Paramedic # DeltaV - Add Paramedic access
+  - Surgery # DeltaV - Add Surgery access
   special: # Shitmed change
   - !type:AddComponentSpecial
     components:

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -108,6 +108,7 @@
   - Psychologist
   - Paramedic
   - MedicalBorg # Delta V - Medical Borg, see Resources/Prototypes/_DV/Roles/Jobs/Medical/medicalborg.yml
+  - Surgeon # Delta V - Surgeon, see Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml
 
 - type: department
   id: Security

diff --git a/Resources/Prototypes/_DV/Access/medical.yml b/Resources/Prototypes/_DV/Access/medical.yml
@@ -1,3 +1,7 @@
 - type: accessLevel
   id: Psychologist
   name: id-card-access-level-psychologist
+
+- type: accessLevel
+  id: Surgery
+  name: id-card-access-level-surgery
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml
@@ -54,3 +54,18 @@
     - id: BoxFolderBlack
     - id: BoxFolderClipboard
     - id: DrinkVacuumFlask
+
+- type: entity
+  parent: ClothingBeltMedical
+  id: ClothingBeltSurgeonFilled
+  suffix: Filled, Surgical
+  components:
+  - type: StorageFill
+    contents:
+    - id: Cautery
+    - id: Scalpel
+    - id: Retractor
+    - id: Hemostat
+    - id: Bonesetter
+    - id: BoneGel
+    - id: SawElectric
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml
@@ -21,3 +21,100 @@
     containers:
       entity_storage: !type:NestedSelector
         tableId: PsychologistLockerFill
+
+- type: entityTable
+  id: SurgeonOutfit
+  table: !type:GroupSelector
+    children:
+    - !type:AllSelector
+      weight: 10
+      children:
+      - id: ClothingHeadHatSurgcapPurple
+      - id: UniformScrubsColorPurple
+    - !type:AllSelector
+      weight: 10
+      children:
+      - id: ClothingHeadHatSurgcapGreen
+      - id: UniformScrubsColorGreen
+    - !type:AllSelector
+      weight: 10
+      children:
+      - id: ClothingHeadHatSurgcapBlue
+      - id: UniformScrubsColorBlue
+    - !type:AllSelector
+      weight: 10
+      children:
+      - id: ClothingHeadHatSurgcapCyan
+      - id: UniformScrubsColorCyan
+    - !type:AllSelector
+      weight: 5
+      children:
+      - id: ClothingHeadHatSurgcapBlack
+      - id: UniformScrubsColorBlack
+    - !type:AllSelector
+      weight: 5
+      children:
+      - id: ClothingHeadHatSurgcapPink
+      - id: UniformScrubsColorPink
+    - !type:AllSelector
+      weight: 5
+      children:
+      - id: ClothingHeadHatSurgcapRainbow
+      - id: UniformScrubsColorRainbow
+    - !type:AllSelector
+      weight: 10
+      children:
+      - id: ClothingHeadHatSurgcapWhite
+      - id: UniformScrubsColorWhite
+    - !type:AllSelector
+      weight: 1
+      children:
+      - id: ClothingHeadHatSurgcapCybersun
+      - id: UniformScrubsColorCybersun
+
+- type: entityTable
+  id: SurgeonSanitzation
+  table: !type:GroupSelector
+    children:
+    - id: BoxNitrileGloves
+    - id: BoxSterileMask
+
+- type: entityTable
+  id: SurgeonGloves
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHandsGlovesNitrile
+    - id: ClothingHandsGlovesLatex
+
+- type: entityTable
+  id: SurgeonLockerFill
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: SurgeonOutfit
+    - !type:NestedSelector
+      tableId: SurgeonSanitzation
+    - !type:NestedSelector
+      tableId: SurgeonGloves
+    - id: ClothingHeadsetMedical
+    - id: ClothingEyesHudMedical
+    - id: ClothingBackpackDuffelSurgeryFilled
+    - id: ClothingOuterVestTank
+    - id: LunchboxMedicalFilledRandom
+      prob: 0.3
+    - id: BoxSyringe
+      prob: 0.3
+    - id: HandheldHealthAnalyzer
+      prob: 0.6
+    - id: ClothingHeadMirror
+      prob: 0.4
+
+- type: entity
+  parent: LockerSurgeon
+  id: LockerSurgeonFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: SurgeonLockerFill
diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
@@ -118,3 +118,16 @@
     - state: green
     - sprite: _DV/Markers/jobs.rsi
       state: adminassistant
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointSurgeon
+  name: surgeon
+  components:
+  - type: SpawnPoint
+    job_id: Surgeon
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: _DV/Markers/jobs.rsi
+      state: surgeon
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/door_access.yml
@@ -86,6 +86,30 @@
   - type: AccessReader
     access: [["Psychologist"]]
 
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSurgery
+  suffix: Surgery, Locked
+  components:
+  - type: AccessReader
+    access: [["Surgery"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSurgeryResearch
+  suffix: Surgery/Epistemics, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"], ["Surgery"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSurgeryRobotics
+  suffix: Surgery/Robotics, Locked
+  components:
+  - type: AccessReader
+    access: [["Robotics"], ["Surgery"]]
+
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsMail

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
@@ -383,6 +383,36 @@
     id: SocialWorkerIDCard
     state: pda-socialworker
 
+# Surgeon
+
+- type: entity
+  parent: BaseMedicalPDA
+  id: SurgeonPDA
+  name: surgeon PDA
+  description: Smells faintly like burnt flesh and anesthesia.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Devices/pda.rsi
+    layers:
+    - map: [ "enum.PdaVisualLayers.Base" ]
+    - state: "light_overlay"
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
+      shader: "unshaded"
+      visible: false
+    - state: "id_overlay"
+      map: [ "enum.PdaVisualLayers.IdLight" ]
+      shader: "unshaded"
+      visible: false
+  - type: Pda
+    id: SurgeonIDCard
+    state: pda-surgeon
+  - type: PdaBorderColor
+    borderColor: "#5b97bc"
+    accentHColor: "#ffffff"
+    accentVColor: "#ffffff"
+  - type: Icon
+    state: pda-surgeon
+
 # Atmospherics Technician
 
 - type: entity

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml
@@ -204,6 +204,22 @@
   - type: IdCard
     jobTitle: job-alt-title-social-worker
 
+# Surgeon
+
+- type: entity
+  parent: MedicalIDCard
+  id: SurgeonIDCard
+  name: Surgeon ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: _DV/Objects/Misc/id_cards.rsi
+      state: idsurgeon
+  - type: IdCard
+    jobTitle: job-name-surgeon
+    jobIcon: JobIconSurgeon
+
 # Atmospheric Technician
 
 - type: entity

diff --git a/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml
@@ -281,6 +281,52 @@
     containers:
       board: [ DoorElectronicsPsychologist ]
 
+- type: entity
+  parent: AirlockMaintRnDLocked
+  id: AirlockMaintRnDSurgeryLocked
+  suffix: Surgery/Epistemics, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSurgeryResearch ]
+
+- type: entity
+  parent: AirlockMedical
+  id: AirlockSurgeryLocked
+  suffix: Surgery, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSurgery ]
+
+- type: entity
+  parent: AirlockMedicalGlass
+  id: AirlockSurgeryGlassLocked
+  suffix: Surgery, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSurgery ]
+
+- type: entity
+  parent: AirlockScienceGlass
+  id: AirlockSurgeryScienceGlassLocked
+  suffix: Surgery/Epistemics, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSurgeryResearch ]
+
+
+- type: entity
+  parent: AirlockMaintMedLocked
+  id: AirlockMaintSurgeryLocked
+  suffix: Surgery, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSurgery ]
+
 - type: entity
   parent: AirlockFreezer
   id: AirlockFreezerServiceLocked

diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -47,6 +47,18 @@
   - type: AccessReader
     access: [["Psychologist"]]
 
+- type: entity
+  parent: LockerBaseSecureDeltaV
+  id: LockerSurgeon
+  name: surgeon's locker
+  components:
+  - type: EntityStorageVisuals
+    stateBaseClosed: surgeon
+    stateDoorOpen: surgeon_open
+    stateDoorClosed: surgeon_door
+  - type: AccessReader
+    access: [ [ "Surgery" ] ]
+
 - type: entity
   parent: LockerBaseSecureDeltaV
   id: LockerAdministrativeAssistant