Merge branch 'master' into logidept

DeltaV-Station · Sep 21, 2023 · 1030bfd · 1030bfd
2 parents 6737cc0 + c94c639
commit 1030bfd
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 3 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -61,3 +61,11 @@ Entries:
       message: Felinids have been reintegrated to the crew.
   id: 10
   time: '2023-09-20T23:28:21.0000000+00:00'
+- author: Colin-Tel
+  changes:
+    - type: Tweak
+      message: >-
+        Paramedics now spawn with their respective equipment for retrieving
+        crewmates more effectively.
+  id: 11
+  time: '2023-09-21T04:01:02.0000000+00:00'
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -17,3 +17,14 @@
         amount: 1
 #      - id: BaseBallBat THIS BAT IS TOO DAMN BIG!
 #        amount: 1
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackMedical
+  id: ClothingBackpackParamedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalMedical
+      - id: CheapRollerBedSpawnFolded
+      - id: BodyBag_Folded
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -0,0 +1,10 @@
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelMedical
+  id: ClothingBackpackDuffelParamedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalMedical
+      - id: CheapRollerBedSpawnFolded
+      - id: BodyBag_Folded
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -0,0 +1,10 @@
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelMedical
+  id: ClothingBackpackSatchelParamedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalMedical
+      - id: CheapRollerBedSpawnFolded
+      - id: BodyBag_Folded
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -23,11 +23,13 @@
   id: ParamedicGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitParamedic
-    back: ClothingBackpackMedicalFilled
+    back: ClothingBackpackParamedicFilled # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/backpack.yml
     shoes: ClothingShoesColorWhite
     id: ParamedicPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltParamedicFilled
+    pocket1: HandheldGPSBasic # DeltaV - Give Paramedics useful tools on spawn
+    pocket2: HandheldCrewMonitor # DeltaV - Give Paramedics useful tools on spawn
   innerclothingskirt: ClothingUniformJumpskirtParamedic
-  satchel: ClothingBackpackSatchelMedicalFilled
-  duffelbag: ClothingBackpackDuffelMedicalFilled
+  satchel: ClothingBackpackSatchelParamedicFilled # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/satchel.yml
+  duffelbag: ClothingBackpackDuffelParamedicFilled # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/duffelbag.yml