brigmedic too

new-frontiers-14 · Jul 26, 2023 · d7db92e · d7db92e
1 parent 44781bc
commit d7db92e
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 117 deletions.
diff --git a/Resources/Maps/Shuttles/carrier.yml b/Resources/Maps/Shuttles/carrier.yml
@@ -836,6 +836,13 @@ entities:
     - pos: -2.5,-10.5
       parent: 1
       type: Transform
+- proto: BedsheetBrigmedic
+  entities:
+  - uid: 613
+    components:
+    - pos: 11.5,3.5
+      parent: 1
+      type: Transform
 - proto: BedsheetMedical
   entities:
   - uid: 1009
@@ -867,11 +874,6 @@ entities:
     - pos: 11.5,6.5
       parent: 1
       type: Transform
-  - uid: 566
-    components:
-    - pos: 11.5,3.5
-      parent: 1
-      type: Transform
   - uid: 572
     components:
     - pos: 10.5,9.5
@@ -3126,6 +3128,13 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
+- proto: ClothingHeadHatBeretBrigmedic
+  entities:
+  - uid: 614
+    components:
+    - pos: 11.443029,3.5367043
+      parent: 1
+      type: Transform
 - proto: ClothingHeadHatCaptain
   entities:
   - uid: 630
@@ -6183,15 +6192,6 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-  - uid: 616
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 613
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
   - uid: 626
     components:
     - flags: InContainer
@@ -6222,7 +6222,7 @@ entities:
     - pos: 2.5,4.5
       parent: 1
       type: Transform
-    - SecondsUntilStateChange: -3518.8318
+    - SecondsUntilStateChange: -3616.298
       state: Closing
       type: Door
   - uid: 582
@@ -6377,15 +6377,6 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-  - uid: 615
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 613
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
 - proto: KitchenKnife
   entities:
   - uid: 740
@@ -6434,6 +6425,13 @@ entities:
     - pos: 0.5,3.5
       parent: 1
       type: Transform
+- proto: LockerBrigmedicFilled
+  entities:
+  - uid: 566
+    components:
+    - pos: 11.5,4.5
+      parent: 1
+      type: Transform
 - proto: LockerCaptain
   entities:
   - uid: 619
@@ -6674,42 +6672,6 @@ entities:
           occludes: True
           ent: null
       type: ContainerContainer
-  - uid: 613
-    components:
-    - pos: 11.5,4.5
-      parent: 1
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-    - containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 614
-          - 615
-          - 616
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-      type: ContainerContainer
 - proto: LockerWardenFilled
   entities:
   - uid: 605
@@ -6999,15 +6961,6 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-  - uid: 614
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 613
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
   - uid: 622
     components:
     - flags: InContainer
@@ -7767,6 +7720,13 @@ entities:
     - pos: 9.5,5.5
       parent: 1
       type: Transform
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 615
+    components:
+    - pos: -1.5,-1.5
+      parent: 1
+      type: Transform
 - proto: SpawnPointPrisonGuard
   entities:
   - uid: 1335

diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
@@ -0,0 +1,40 @@
+- type: job
+  id: Brigmedic
+  name: job-name-brigmedic
+  description: job-description-brigmedic
+  playTimeTracker: JobBrigmedic
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 18000
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 7200
+  startingGear: BrigmedicGear
+  icon: "Brigmedic"
+  supervisors: job-supervisors-hos
+  canBeAntag: false
+  access:
+  - Medical
+  - Security
+  - Brig
+  - Maintenance
+  - External
+
+- type: startingGear
+  id: BrigmedicGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBrigmedic
+    outerClothing: ClothingOuterCoatAMG
+    back: ClothingBackpackBrigmedicFilled
+    shoes: ClothingShoesColorRed
+    gloves: ClothingHandsGlovesNitrile
+    eyes: ClothingEyesHudMedical
+    head: ClothingHeadHatBeretBrigmedic
+    id: BrigmedicPDA
+    ears: ClothingHeadsetBrigmedic
+    mask: ClothingMaskBreathMedicalSecurity
+    belt: ClothingBeltMedicalFilled
+  innerclothingskirt: ClothingUniformJumpskirtBrigmedic
+  satchel: ClothingBackpackSatchelBrigmedicFilled
+  duffelbag: ClothingBackpackDuffelBrigmedicFilled
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -86,7 +86,8 @@
   - Detective
   - Warden
   - PrisonGuard ##nyano
-
+  - BrigMedic
+
 - type: department
   id: Science
   description: department-Science-description

diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -135,3 +135,6 @@
 
 - type: playTimeTracker
   id: JobZookeeper
+
+- type: playTimeTracker
+  id: BrigMedic
diff --git a/Resources/Prototypes/_NF/Shipyard/carrier.yml b/Resources/Prototypes/_NF/Shipyard/carrier.yml
@@ -25,5 +25,6 @@
           overflowJobs: []
           availableJobs:
             PrisonGuard: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 1, 1 ]
             Warden: [ 1, 1 ]
+            BrigMedic: [ 1, 1 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml b/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml
@@ -292,34 +292,34 @@
           availableJobs:
             Detective: [ 1, 1 ]
 
-- type: vessel
-  id: Enforcer
-  name: NSF Enforcer
-  description: A small security vessel for rapid response
-  price: 21350
-  category: Small
-  group: Security
-  shuttlePath: /Maps/Shuttles/enforcer.yml
+# - type: vessel
+  # id: Enforcer
+  # name: NSF Enforcer
+  # description: A small security vessel for rapid response
+  # price: 21350
+  # category: Small
+  # group: Security
+  # shuttlePath: /Maps/Shuttles/enforcer.yml
 
-- type: gameMap
-  id: Enforcer
-  mapName: 'NSF Enforcer'
-  mapPath: /Maps/Shuttles/enforcer.yml
-  minPlayers: 0
-  stations:
-    Enforcer:
-      stationProto: StandardFrontierVessel
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Enforcer {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationJobs
-          overflowJobs: []
-          availableJobs:
-            PrisonGuard: [ 0, 0 ]
-            SecurityOfficer: [ 1, 1 ]
+# - type: gameMap
+  # id: Enforcer
+  # mapName: 'NSF Enforcer'
+  # mapPath: /Maps/Shuttles/enforcer.yml
+  # minPlayers: 0
+  # stations:
+    # Enforcer:
+      # stationProto: StandardFrontierVessel
+      # components:
+        # - type: StationNameSetup
+          # mapNameTemplate: '{0} Enforcer {1}'
+          # nameGenerator:
+            # !type:NanotrasenNameGenerator
+            # prefixCreator: '14'
+        # - type: StationJobs
+          # overflowJobs: []
+          # availableJobs:
+            # PrisonGuard: [ 0, 0 ]
+            # SecurityOfficer: [ 1, 1 ]
 
 - type: vessel
   id: Trident
@@ -349,7 +349,6 @@
           availableJobs:
             PrisonGuard: [ 1, 1 ]
             SecurityOfficer: [ 1, 1 ]
-            Warden: [ 1, 1 ]
 
 - type: vessel
   id: Pulse

diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -13,24 +13,6 @@ DrinkKvassGlass: null
 KvassTank: null
 
 # 2023-05-03
-SpawnPointBrigmedic: null
-ClothingHeadsetBrigmedic: null
-ClothingHeadHatBeretBrigmedic: null
-ClothingHeadHelmetHardsuitBrigmedic: null
-ClothingOuterHardsuitBrigmedic: null
-ClothingOuterCoatAMG: null
-ClothingBackpackBrigmedic: null
-ClothingBackpackBrigmedicFilled: null
-ClothingBackpackSatchelBrigmedic: null
-ClothingBackpackSatchelBrigmedicFilled: null
-ClothingBackpackDuffelBrigmedic: null
-ClothingBackpackDuffelBrigmedicFilled: null
-BrigmedicIDCard: null
-BrigmedicPDA: null
-BoxSurvivalBrigmedic: null
-LockerBrigmedic: null
-LockerBrigmedicFilled: null
-BedsheetBrigmedic: null
 
 # 2023-05-04
 BoxMagazineMagnumSubMachineGun: BoxMagazinePistolSubMachineGun