Добавил бригмедика (#40)

* added brigmedic * added brigmedic to some maps * added loadout to bm * changelog --------- Co-authored-by: Vigers Ray <[email protected]>
space-sunrise · Jun 8, 2024 · 840a080 · 840a080
1 parent af626ce
commit 840a080
Show file tree

Hide file tree

Showing 27 changed files with 211 additions and 38 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -318,3 +318,11 @@ Entries:
     type: Add
   id: 28
   time: '2024-06-08T13:44:48.897715+00:00'
+- author: pacable
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0431\u0440\u0438\u0433\u043C\
+      \u0435\u0434\u0438\u043A\u0430 \u043D\u0430 \u043D\u0435\u043A\u043E\u0442\u043E\
+      \u0440\u044B\u0435 \u043A\u0430\u0440\u0442\u044B."
+    type: Add
+  id: 29
+  time: '2024-06-08T13:51:03.111200+00:00'
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl
@@ -30,6 +30,8 @@ ent-ClothingBackpackEngineeringFilled = { ent-ClothingBackpackEngineering }
     .desc = { ent-ClothingBackpackEngineering.desc }
 ent-ClothingBackpackAtmosphericsFilled = { ent-ClothingBackpackAtmospherics }
     .desc = { ent-ClothingBackpackAtmospherics.desc }
+ent-ClothingBackpackBrigmedicFilled = { ent-ClothingBackpackBrigmedic }
+    .desc = { ent-ClothingBackpackBrigmedic.desc }
 ent-ClothingBackpackScienceFilled = { ent-ClothingBackpackScience }
     .desc = { ent-ClothingBackpackScience.desc }
 ent-ClothingBackpackHydroponicsFilled = { ent-ClothingBackpackHydroponics }

diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl
@@ -30,6 +30,8 @@ ent-ClothingBackpackDuffelEngineeringFilled = { ent-ClothingBackpackDuffelEngine
     .desc = { ent-ClothingBackpackDuffelEngineering.desc }
 ent-ClothingBackpackDuffelAtmosphericsFilled = { ent-ClothingBackpackDuffelAtmospherics }
     .desc = { ent-ClothingBackpackDuffelAtmospherics.desc }
+ent-ClothingBackpackDuffelBrigmedicFilled = { ent-ClothingBackpackDuffelBrigmedic }
+    .desc = { ent-ClothingBackpackDuffelBrigmedic.desc }
 ent-ClothingBackpackDuffelScienceFilled = { ent-ClothingBackpackDuffelScience }
     .desc = { ent-ClothingBackpackDuffelScience.desc }
 ent-ClothingBackpackDuffelHydroponicsFilled = { ent-ClothingBackpackDuffelHydroponics }

diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl
@@ -32,6 +32,8 @@ ent-ClothingBackpackSatchelEngineeringFilled = { ent-ClothingBackpackSatchelEngi
     .desc = { ent-ClothingBackpackSatchelEngineering.desc }
 ent-ClothingBackpackSatchelAtmosphericsFilled = { ent-ClothingBackpackSatchelAtmospherics }
     .desc = { ent-ClothingBackpackSatchelAtmospherics.desc }
+ent-ClothingBackpackSatchelBrigmedicFilled = { ent-ClothingBackpackSatchelBrigmedic }
+    .desc = { ent-ClothingBackpackSatchelBrigmedic.desc }
 ent-ClothingBackpackSatchelScienceFilled = { ent-ClothingBackpackSatchelScience }
     .desc = { ent-ClothingBackpackSatchelScience.desc }
 ent-ClothingBackpackSatchelHydroponicsFilled = { ent-ClothingBackpackSatchelHydroponics }

diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl
@@ -13,3 +13,6 @@ ent-BoxHug = box of hugs
     .suffix = Emergency
 ent-BoxSurvivalSyndicate = extended-capacity survival box
     .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
+ent-BoxSurvivalBrigmedic = survival box
+    .desc = It's a box with basic internals inside. This one contains to extra medipens.
+    .suffix = Brimedic
diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl
@@ -1,2 +1,5 @@
 loadout-group-inventory = Мой инвентарь
 loadout-group-psychologist-backpack = Рюкзак психолога
+
+loadout-group-brigmedic-backpack = Рюкзак бригмедика
+loadout-group-brigmedic-jumpsuit = Униформа бригмедика
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl
@@ -13,3 +13,6 @@ ent-BoxHug = коробка обнимашек
     .suffix = Аварийный
 ent-BoxSurvivalSyndicate = расширенный аварийный запас
     .desc = Коробка с базовым набором для выживания. Согласно этикетке, содержит более ёмкий баллон.
+ent-BoxSurvivalBrigmedic = аварийный набор
+    .desc = Коробка с базовым набором для выживания. Солгасно дополнительной этикетке, содержит 2 экстренных медипена.
+    .suffix = Бригмедик
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -486,16 +486,6 @@
       - state: green
       - state: detective
 
-- type: entity
-  id: SpawnPointBrigmedic
-  parent: SpawnPointJobBase
-  name: brigmedic
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: brigmedic
-
 # SPECIAL
 # ERT
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -433,16 +433,6 @@
   - type: PresetIdCard
     job: HeadOfSecurity
 
-- type: entity
-  parent: IDCardStandard
-  id: BrigmedicIDCard
-  name: brigmedic ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idbrigmedic
-
 - type: entity
   parent: IDCardStandard
   id: CentcomIDCard

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -153,23 +153,6 @@
   inhand:
     - WeaponMeleeToolboxRobust
 
-#Brigmedic
-
-- type: startingGear
-  id: BrigmedicGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitBrigmedic
-    outerClothing: ClothingOuterCoatAMG
-    back: ClothingBackpackBrigmedic
-    shoes: ClothingShoesColorRed
-    gloves: ClothingHandsGlovesNitrile
-    eyes: ClothingEyesHudMedical
-    head: ClothingHeadHatBeretBrigmedic
-    id: BrigmedicPDA
-    ears: ClothingHeadsetBrigmedic
-    mask: ClothingMaskBreathMedicalSecurity
-    belt: ClothingBeltMedicalFilled
-
 # Aghost
 - type: startingGear
   id: MobAghostGear

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -82,6 +82,7 @@
   - SecurityOfficer
   - Detective
   - Warden
+  - Brigmedic  # Sunrise-Brigmedic
 
 - type: department
   id: Science

diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -16,3 +16,13 @@
       contents:
         - id: BoxSurvivalMedical
         - id: RubberStampPsychologist
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackBrigmedic
+  id: ClothingBackpackBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalBrigmedic
+      - id: Flash
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -16,3 +16,13 @@
       contents:
         - id: BoxSurvivalMedical
         - id: RubberStampPsychologist
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelBrigmedic
+  id: ClothingBackpackDuffelBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalBrigmedic
+      - id: Flash
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -16,3 +16,13 @@
       contents:
         - id: BoxSurvivalMedical
         - id: RubberStampPsychologist
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelBrigmedic
+  id: ClothingBackpackSatchelBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalBrigmedic
+      - id: Flash
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/emergency.yml
@@ -0,0 +1,19 @@
+- type: entity
+  name: survival box
+  parent: BoxCardboard
+  id: BoxSurvivalBrigmedic
+  description: It's a box with basic internals inside.
+  suffix: Medical
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreathMedicalSecurity
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyMedipen
+      - id: EmergencyMedipen
+      - id: FoodSnackNutribrick
+      - id: DrinkWaterBottleFull
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml
@@ -0,0 +1,11 @@
+- type: entity
+  id: SpawnPointBrigmedic
+  parent: SpawnPointJobBase
+  name: brigmedic
+  components:
+  - type: SpawnPoint
+    job_id: Brigmedic
+  - type: Sprite
+    layers:
+      - state: green
+      - state: brigmedic
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml
@@ -9,3 +9,15 @@
         - state: idiaa
     - type: PresetIdCard
       job: IAA
+
+- type: entity
+  parent: IDCardStandard
+  id: BrigmedicIDCard
+  name: brigmedic ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: idbrigmedic
+  - type: PresetIdCard
+    job: Brigmedic
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml
@@ -0,0 +1,44 @@
+- type: loadout
+  id: BrigmedicBackpack
+  equipment: BrigmedicBackpack
+
+- type: startingGear
+  id: BrigmedicBackpack
+  equipment:
+    back: ClothingBackpackBrigmedicFilled
+
+- type: loadout
+  id: BrigmedicDuffel
+  equipment: BrigmedicDuffel
+
+- type: startingGear
+  id: BrigmedicDuffel
+  equipment:
+    back: ClothingBackpackDuffelBrigmedicFilled
+
+- type: loadout
+  id: BrigmedicSatchel
+  equipment: BrigmedicSatchel
+
+- type: startingGear
+  id: BrigmedicSatchel
+  equipment:
+    back: ClothingBackpackSatchelBrigmedicFilled
+
+- type: loadout
+  id: BrigmedicJumpsuit
+  equipment: BrigmedicJumpsuit
+
+- type: startingGear
+  id: BrigmedicJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBrigmedic
+
+- type: loadout
+  id: BrigmedicJumpskirt
+  equipment: BrigmedicJumpskirt
+
+- type: startingGear
+  id: BrigmedicJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBrigmedic
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml
@@ -13,10 +13,24 @@
   loadouts:
   - DefaultBra
 
-- type: loadoutGroup
   id: Pants
   name: loadout-group-pants
   minLimit: 0
   loadouts:
   - DefaultWomanPants
   - DefaultManPants
+
+- type: loadoutGroup
+  id: BrigmedicBackpack
+  name: loadout-group-brigmedic-backpack
+  loadouts:
+  - BrigmedicBackpack
+  - BrigmedicSatchel
+  - BrigmedicDuffel
+
+- type: loadoutGroup
+  id: BrigmedicJumpsuit
+  name: loadout-group-brigmedic-jumpsuit
+  loadouts:
+  - BrigmedicJumpsuit
+  - BrigmedicJumpskirt
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml
@@ -8,3 +8,13 @@
   - Bra
   - Pants
   - Socks
+
+- type: roleLoadout
+  id: JobBrigmedic
+  groups:
+  - BrigmedicJumpsuit
+  - BrigmedicBackpack
+  - Trinkets
+  - Bra
+  - Pants
+  - Socks
diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml
@@ -63,4 +63,5 @@
             Musician: [ 1, 1 ]
             # Sunrise-Roles
             IAA: [ 1, 1 ]
+            Brigmedic: [ 1, 1 ]
 
diff --git a/Resources/Prototypes/_Sunrise/Maps/cluster.yml b/Resources/Prototypes/_Sunrise/Maps/cluster.yml
@@ -62,4 +62,5 @@
             Musician: [ 1, 1 ]
             # Sunrise-Roles
             IAA: [ 1, 1 ]
+            Brigmedic: [ 1, 1 ]
 
diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml
@@ -55,3 +55,4 @@
             Psychologist: [ 1, 1 ]
             Detective: [ 1, 1 ]
             Paramedic: [ 2, 2 ]
+            Brigmedic: [ 1, 1 ]  # Sunrise-Brigmedic
diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml
@@ -64,3 +64,4 @@
             Musician: [ 1, 1 ]
             # Sunrise-Roles
             IAA: [ 1, 1 ]
+            Brigmedic: [ 1, 1 ]
diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml
@@ -63,3 +63,4 @@
             Musician: [ 1, 1 ]
             # Sunrise-Roles
             IAA: [ 1, 1 ]
+            Brigmedic: [ 1, 1 ]
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml
@@ -0,0 +1,38 @@
+- 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: "JobIconBrigmedic"
+  supervisors: job-supervisors-hos
+  canBeAntag: false
+  access:
+  - Medical
+  - Security
+  - Brig
+  - Maintenance
+  - External
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+
+- type: startingGear
+  id: BrigmedicGear
+  equipment:
+    outerClothing: ClothingOuterCoatLabSecurityMedic
+    shoes: ClothingShoesColorRed
+    gloves: ClothingHandsGlovesLatex
+    eyes: ClothingEyesHudMedSec
+    head: ClothingHeadHatBeretSecurityMedic
+    id: BrigmedicPDA
+    ears: ClothingHeadsetBrigmedic
+    mask: ClothingMaskSterile
+    belt: ClothingBeltMedicalFilled
diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml
@@ -1,2 +1,5 @@
 - type: playTimeTracker
   id: JobIAA
+
+- type: playTimeTracker
+  id: JobBrigmedic