[Brigmedic] Something like a "big update" (#15496)

* [Brigmedic] Something like a "big update" * new locker * hardsuit resprite * resprite resprited hardsuit back to the future * custom headset * remove key * TrackingImplanter in locker * pda UI fix * brigmedic bedsheet * added transparency * mask * desc * name mask * skirt of life * Suits resprite * PDA resprite | Brigmed - Brigmedic * meta dic :) * Beret + medical gown * backpacks * locker fill update * why not? bzzz Moth-pocalypse * Brigmed - Brigmedic * fix * chance update
2023-04-26 09:48:44 +03:00
parent c431e0ff67
commit 509761c260
110 changed files with 489 additions and 39 deletions
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -28,6 +28,16 @@
      - id: BoxSurvivalSecurity
      - id: Flash

+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackBrigmedic
+  id: ClothingBackpackBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalBrigmedic
+      - id: Flash
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackMedical
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -27,6 +27,16 @@
      - id: BoxSurvivalSecurity
      - id: Flash

+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelBrigmedic
+  id: ClothingBackpackDuffelBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalBrigmedic
+      - id: Flash
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackDuffelMedical
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -27,6 +27,16 @@
      - id: BoxSurvivalSecurity
      - id: Flash

+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelBrigmedic
+  id: ClothingBackpackSatchelBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalBrigmedic
+      - id: Flash
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackSatchelMedical
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -56,6 +56,26 @@
      - state: internals
      - state: emergencytank

+- 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: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: EmergencyMedipen
+      - id: FoodTinMRE
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
+
 - type: entity
  name: survival box
  parent: BoxCardboard
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -47,20 +47,26 @@
 - type: entity
  id: LockerBrigmedicFilled
  suffix: Brigmedic, Filled
-  parent: LockerSecurity
+  parent: LockerBrigmedic
  components:
  - type: StorageFill
    contents:
-      - id: Flash
      - id: WeaponDisabler
-      - id: ClothingOuterHardsuitBrigmed
-      - id: EncryptionKeyMedical
+      - id: TrackingImplanter
+        amount: 2
+      - id: ClothingOuterHardsuitBrigmedic
      - id: BoxSterileMask
+      - id: ClothingHeadHatBeretBrigmedic
+      - id: ClothingOuterCoatAMG
+      - id: ClothingUniformJumpsuitBrigmedic
+      - id: ClothingUniformJumpskirtBrigmedic
+      - id: ClothingUniformJumpskirtOfLife
+        prob: 0.1
      - id: MedkitFilled
      - id: MedkitCombatFilled
        prob: 0.6
      - id: MedkitAdvancedFilled
-        prob: 0.3
+        prob: 0.4
      - id: MedkitOxygenFilled
        prob: 0.3
      - id: MedkitBruteFilled
@@ -69,6 +75,8 @@
        prob: 0.3
      - id: MedkitBurnFilled
        prob: 0.7
+      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
+        prob: 0.15

 - type: entity
  id: LockerDetectiveFilled
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -60,6 +60,15 @@
  - type: Sprite
    sprite: Clothing/Back/Backpacks/security.rsi

+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackBrigmedic
+  name: brigmedic backpack
+  description: It's a very sterile backpack.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/brigmedic.rsi
+
 - type: entity
  parent: ClothingBackpack
  id: ClothingBackpackEngineering
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -75,6 +75,15 @@
  - type: Sprite
    sprite: Clothing/Back/Duffels/security.rsi

+- type: entity
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelBrigmedic
+  name: brigmedic duffel bag
+  description: A large duffel bag for holding extra medical related goods.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Duffels/brigmedic.rsi
+
 - type: entity
  parent: ClothingBackpackDuffel
  id: ClothingBackpackDuffelChemistry
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -108,6 +108,15 @@
  - type: Sprite
    sprite: Clothing/Back/Satchels/security.rsi

+- type: entity
+  parent: ClothingBackpackSatchel
+  id: ClothingBackpackSatchelBrigmedic
+  name: brigmedic satchel
+  description: A sterile satchel for medical related needs.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/brigmedic.rsi
+
 - type: entity
  parent: ClothingBackpackSatchel
  id: ClothingBackpackSatchelCaptain
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -223,6 +223,23 @@
  - type: Clothing
    sprite: Clothing/Ears/Headsets/security.rsi

+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetBrigmedic
+  name: brigmedic headset
+  description: A headset that helps to hear the death cries.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyMedical
+      - EncryptionKeySecurity
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/brigmedic.rsi
+  - type: Clothing
+    sprite: Clothing/Ears/Headsets/brigmedic.rsi
+
 - type: entity
  parent: ClothingHeadset
  id: ClothingHeadsetService
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -233,15 +233,15 @@

 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitBrigmed
+  id: ClothingHeadHelmetHardsuitBrigmedic
  noSpawn: true
-  name: brigmed hardsuit helmet
-  description: The lightweight helmet of the brigmed hardsuit. Protects against viruses, and clowns.
+  name: brigmedic hardsuit helmet
+  description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
  components:
  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/brigmed.rsi
+    sprite: Clothing/Head/Hardsuits/brigmedic.rsi
  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/brigmed.rsi
+    sprite: Clothing/Head/Hardsuits/brigmedic.rsi
  - type: PointLight
    color: "#00FFFF"
  - type: Armor
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -64,6 +64,17 @@
  - type: Clothing
    sprite: Clothing/Head/Hats/beret_warden.rsi

+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretBrigmedic
+  name: medical beret
+  description: White beret, looks like a cream pie on the head.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_brigmedic.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_brigmedic.rsi
+
 - type: entity
  parent: ClothingHeadBase
  id: ClothingHeadHatBowlerHat
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -121,6 +121,22 @@
    - PetWearable
    - WhitelistChameleon

+- type: entity
+  parent: ClothingMaskBreathMedical
+  id: ClothingMaskBreathMedicalSecurity
+  name: military-style medical mask
+  description: A medical mask with a small layer of protection against damage and viruses, similar to the one used in the medical units of the first corporate war.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/medicalsecurity.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/medicalsecurity.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+
 - type: entity
  parent: ClothingMaskPullableBase
  id: ClothingMaskBreath
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -251,3 +251,22 @@
    sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatAMG
+  name: armored medical gown
+  description: The version of the medical gown, with elements of a bulletproof vest, looks strange, but your heart is protected.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/brigmedic.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/brigmedic.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.85
+        Piercing: 0.65
+        Heat: 0.85
+        Caustic: 0.75
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -368,14 +368,14 @@

 - type: entity
  parent: ClothingOuterHardsuitBase
-  id: ClothingOuterHardsuitBrigmed
-  name: brigmed hardsuit
+  id: ClothingOuterHardsuitBrigmedic
+  name: brigmedic hardsuit
  description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit.
  components:
  - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/brigmed.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi
  - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/brigmed.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi
  - type: PressureProtection
    highPressureMultiplier: 0.3
    lowPressureMultiplier: 5500
@@ -394,7 +394,7 @@
        Radiation: 0.30
        Caustic: 0.2
  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitBrigmed
+    clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic

 - type: entity
  parent: ClothingOuterHardsuitBase
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -663,3 +663,14 @@
      sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi
    - type: Clothing
      sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtOfLife
+  name: skirt of life
+  description: A skirt that symbolizes the joy and positivity of our life.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/skirtoflife.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirt/skirtoflife.rsi
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -453,7 +453,7 @@
  - type: Sprite
    layers:
      - state: green
-      - state: brigmed
+      - state: brigmedic

 # SPECIAL
 # ERT
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -720,19 +720,19 @@

 - type: entity
  parent: BasePDA
-  id: BrigmedPDA
-  name: brigmed PDA
+  id: BrigmedicPDA
+  name: brigmedic PDA
  description: I wonder whose pulse is on the screen? I hope he doesnt stop... PDA has a built-in health analyzer.
  components:
  - type: PDA
-    id: BrigmedIDCard
-    state: pda-brigmed
+    id: BrigmedicIDCard
+    state: pda-brigmedic
  - type: PDABorderColor
    borderColor: "#A32D26"
-    accentHColor: "#447987"
-    accentVColor: "#447987"
+    accentHColor: "#d7d7d0"
+    accentVColor: "#d7d7d0"
  - type: Icon
-    state: pda-brigmed
+    state: pda-brigmedic
  - type: HealthAnalyzer
    scanDelay: 1
    scanningEndSound:
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  parent: BaseItem
  id: BedsheetBase
  name: BedsheetBase
@@ -265,6 +265,17 @@
  - type: Clothing
    sprite: Clothing/Neck/Bedsheets/rd.rsi

+- type: entity
+  id: BedsheetBrigmedic
+  parent: BedsheetBase
+  name: Brigmedic's bedsheet
+  description: Not worse than cotton.
+  components:
+  - type: Sprite
+    state: sheetrd
+  - type: Clothing
+    sprite: Clothing/Neck/Bedsheets/brigmedic.rsi
+
 - type: entity
  id: BedsheetRed
  parent: BedsheetBase
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -400,7 +400,7 @@

 - type: entity
  parent: IDCardStandard
-  id: BrigmedIDCard
+  id: BrigmedicIDCard
  name: brigmedic ID card
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -306,6 +306,21 @@
  - type: AccessReader
    access: [["Armory"]]

+# Brigmedic
+- type: entity
+  id: LockerBrigmedic
+  parent: LockerBaseSecure
+  name: brigmedic locker
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: brigmedic
+      state_open: armory_open
+      state_closed: brigmedic_door
+  - type: AccessReader
+    access: [["Medical"]]
+
 # Security Officer
 - type: entity
  id: LockerSecurity
--- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
@@ -25,15 +25,16 @@
  id: BrigmedicGear
  equipment:
    jumpsuit: ClothingUniformJumpsuitBrigmedic
-    back: ClothingBackpackSecurityFilled
+    outerClothing: ClothingOuterCoatAMG
+    back: ClothingBackpackBrigmedicFilled
    shoes: ClothingShoesColorRed
    gloves: ClothingHandsGlovesNitrile
    eyes: ClothingEyesHudMedical
-    head: ClothingHeadHatSurgcapBlue
-    id: BrigmedPDA
-    ears: ClothingHeadsetSecurity
-    mask: ClothingMaskSterile
+    head: ClothingHeadHatBeretBrigmedic
+    id: BrigmedicPDA
+    ears: ClothingHeadsetBrigmedic
+    mask: ClothingMaskBreathMedicalSecurity
    belt: ClothingBeltMedicalFilled
  innerclothingskirt: ClothingUniformJumpskirtBrigmedic
-  satchel: ClothingBackpackSatchelSecurityFilled
-  duffelbag: ClothingBackpackDuffelSecurityFilled
+  satchel: ClothingBackpackSatchelBrigmedicFilled
+  duffelbag: ClothingBackpackDuffelBrigmedicFilled