[ ADMIN BOUNTY ] BSO Rework!!

Resources/Locale/en-US/_Omu/set-selector/selectable-sets.ftl

@@ -35,11 +35,6 @@ selectable-set-hos-brdi-description=
     Once wielded by an unknown member of the Biesel Foreign Legion,
     this beloved rifle has seen battle with Sol on every world in the colonies.
 
-selectable-set-bso-brdi-name = BRDI R-25
-selectable-set-bso-brdi-description=
-    An iconic weapon used by members of the Biesel Republic Foreign Legion.
-    Repainted for Blueshield Officers.
-
 selectable-set-mk58-name = Mk58 Pistol
 selectable-set-mk58-description =
     The standard duty pistol for Nanotrasen security.
@@ -119,3 +114,32 @@ selectable-set-corpsman-combathardsuit-desc =
     Older model of corpsman's hardsuit.
     Built based on designs recovered from Regalis sector.
     Offers much better armor then newer models.
+
+# BSO
+selectable-set-bso-brdi-name = BRDI R-25
+selectable-set-bso-brdi-description =
+    An iconic weapon used by members of the Biesel Republic Foreign Legion.
+    Repainted for Blueshield Officers.
+
+selectable-set-bso-extraction-name = Extraction kit
+selectable-set-bso-extraction-description = 
+    A swift extraction guarantees safety, you stand by those words.
+    Includes: A webbing rig with a ridiculous amount of pouches and pockets, capable of holding many items.
+    The rig is prepacked with 20 bluespace-enchanced fultons, easily attachable to any rollerbed, a beacon for these fultons and a combat medical kit with various medicines in pill form.
+
+selectable-set-bso-surgical-name = Surgical kit
+selectable-set-bso-surgical-description =
+    You've seen those that you protect disected into multiple pieces and giblets far too many times.
+    Includes: A spatial general use chest rig, packed with a surgical omntitool and a bluespace body bag, capable of holding multiple cadavers, organs, pieces and giblets.
+
+selectable-set-bso-medical-name = Medical kit
+selectable-set-bso-medical-description =
+    Sometimes, the classic and simple option is the best option.
+    Includes: A spatial general use chest rig, packed with a compact defibrillator and two combat medical kits.
+
+selectable-set-bso-chemical-name = Chemical kit
+selectable-set-bso-chemical-description =
+    Perfect for healing allies or poisoning foes in a pinch,
+    for the Blueshield Officer especially fond of chemical efficiency.
+    Includes: A robust pouch for general use, 
+    packed with several vials of advanced medicine and a combat injector that instantly injects its contents upon forceful stabbing.

Resources/Locale/en-US/_Omu/stack/stacks.ftl

@@ -1 +1,2 @@
-stack-revcoin = RevCoin
+stack-revcoin = RevCoin
+stack-fulton-blueshield = bso fulton 

Resources/Prototypes/_Goobstation/Catalog/Fills/Belt/belts.yml

@@ -258,7 +258,7 @@
     - id: EnergySpeedloaderLethal
     - id: EnergySpeedloaderLethal
     - id: EnergySpeedloaderDisabler
-
+    - id: EnergySpeedloaderDisabler # Omu, 2nd disabler speedloader
 - type: entity
   id: ClothingBeltMilitaryRigGrenadierFilled
   parent: ClothingBeltMilitaryRigGrenadier

Resources/Prototypes/_Goobstation/Catalog/Fills/Lockers/heads.yml

@@ -74,4 +74,4 @@
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:NestedSelector
-        tableId: LockerFillBlueshieldOfficer
+        tableId: LockerFillBlueshieldOfficerOmu # Omustation apperance so we don't have to remap a thousand times

Resources/Prototypes/_Goobstation/Loadouts/role_loadouts.yml

@@ -119,7 +119,7 @@
   - BlueshieldOfficerJumpsuit
   - BlueshieldOfficerBackpack
   - BlueshieldOfficerOuter
-  - BlueshieldOfficerBelt #Omu - Senior BSO drip
+  # - BlueshieldOfficerBelt #Omu - Senior BSO drip | No more, now in support kit.
   - BlueshieldOfficerNeck
   - BlueshieldOfficerMask
   - BlueshieldOfficerShoes

Resources/Prototypes/_Omu/Catalog/Fills/Items/belts.yml

@@ -37,3 +37,57 @@
     contents:
     - id: SpeedLoaderRevolverLightRifle
       amount: 2
+
+- type: entity
+  id: ClothingBeltChemBagBSOFilled
+  parent: ClothingBeltChemBagBSO
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: CombatInjector
+      amount: 1
+    - id: ProcenylLazideChemistryVial
+      amount: 1
+    - id: EbifinlLazideChemistryVial
+      amount: 1
+    - id: SyriniverChemistryVial
+      amount: 1
+    - id: TirimolChemistryVial
+      amount: 1
+    - id: ArtiplatesChemistryVial
+      amount: 1
+    - id: OmnizineChemistryVial
+      amount: 1
+
+- type: entity
+  id: ClothingBeltMilitaryWebbingBSOFilledMed
+  parent: ClothingBeltMilitaryWebbingBSO
+  suffix: Filled, Medical Set
+  components:
+  - type: StorageFill
+    contents:
+    - id: DefibrillatorCompact
+    - id: MedkitCombatFilled
+      amount: 2
+
+- type: entity
+  id: ClothingBeltExtractionRigBSOFilled
+  parent: ClothingBeltExtractionRigBSO
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: FultonBeaconBlueshield
+    - id: FultonBlueshield
+    - id: MedkitCombatBlueFilled
+
+- type: entity
+  id: ClothingBeltBlueshieldEliteWebbingSurgicalFilled
+  parent: ClothingBeltBlueshieldEliteWebbingSurgical
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: OmnimedTool
+    - id: BodyBagBluespaceBSOFolded

Resources/Prototypes/_Omu/Catalog/Fills/Lockers/heads.yml

@@ -0,0 +1,20 @@
+- type: entityTable
+  id: LockerFillBlueshieldOfficerOmu
+  table: !type:AllSelector
+    children:
+    - id: BlueshieldUndeterminedHardsuit
+    - id: BlueshieldUndeterminedOffensive
+    - id: BlueshieldUndeterminedSupport
+    - id: HandheldCrewMonitorBSO
+    - id: FlippoLighterBlueshield
+    - id: CigPackBlueshield
+    - id: OxygenTankFilled
+    - id: NitrogenTankFilled
+    - id: BoxZiptie
+    - id: BlueshieldRollerBedSpawnFolded
+    - id: BlueshieldRollerBedStasisSpawnFolded
+    - id: FlashlightSeclite
+    - id: MedkitBSOFilled
+    - id: MedkitBSOIPCFilled
+    - id: ParamedHypo
+    - id: WeaponDisabler

Resources/Prototypes/_Omu/Catalog/selectable_sets.yml

@@ -60,18 +60,6 @@
   - MagazineCaselessRifle
   - MagazineCaselessRifle
 
-- type: selectableSet
-  id: BSOBRDISet
-  name: selectable-set-bso-brdi-name
-  description: selectable-set-bso-brdi-description
-  sprite:
-    sprite: _DEN/Objects/Weapons/Guns/SMGs/BRDI_R25_blue.rsi
-    state: icon
-  content:
-  - WeaponSubMachineGunBRDIR25BSO
-  - MagazineCaselessRifle
-  - MagazineCaselessRifle
-
 - type: selectableSet
   id: WeaponEnergyShotgunSet
   name: selectable-set-warden-eshotty-name
@@ -244,3 +232,57 @@
     state: icon
   content:
   - ClothingOuterHardsuitCorpsman
+
+# Blueshield Officer
+
+- type: selectableSet 
+  id: BSOBRDISet # Yes I moved it because it bothered me that it was in some random ass place above
+  name: selectable-set-bso-brdi-name
+  description: selectable-set-bso-brdi-description
+  sprite:
+    sprite: _DEN/Objects/Weapons/Guns/SMGs/BRDI_R25_blue.rsi
+    state: icon
+  content:
+  - WeaponSubMachineGunBRDIR25BSO
+  - MagazineCaselessRifle
+  - MagazineCaselessRifle
+
+- type: selectableSet
+  id: BSOExtractionSet
+  name: selectable-set-bso-extraction-name
+  description: selectable-set-bso-extraction-description
+  sprite:
+    sprite: _Omu/Objects/Tools/bluespace_fulton.rsi
+    state: extraction_pack
+  content:
+  - ClothingBeltExtractionRigBSOFilled
+
+- type: selectableSet
+  id: BSOSurgicalSet
+  name: selectable-set-bso-surgical-name
+  description: selectable-set-bso-surgical-description
+  sprite:
+    sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi
+    state: omnimed
+  content:
+  - ClothingBeltBlueshieldEliteWebbingSurgicalFilled
+
+- type: selectableSet
+  id: BSOMedicalSet
+  name: selectable-set-bso-medical-name
+  description: selectable-set-bso-medical-description
+  sprite:
+    sprite: Objects/Specific/Medical/medical.rsi
+    state: medicated-suture
+  content:
+  - ClothingBeltMilitaryWebbingBSOFilledMed
+
+- type: selectableSet
+  id: BSOChemicalSet
+  name: selectable-set-bso-chemical-name
+  description: selectable-set-bso-chemical-description
+  sprite:
+    sprite: _Goobstation/Objects/Weapons/Melee/blueshield_knife.rsi
+    state: icon
+  content:
+  - ClothingBeltChemBagBSOFilled

Resources/Prototypes/_Omu/Entities/Clothing/Belt/belts.yml

@@ -1,16 +1,16 @@
 - type: entity
-  parent: [ ClothingBeltMilitaryWebbingCMO, BaseCentcommContraband ]
   id: ClothingBeltMilitaryWebbingBSO
-  name: blueshield chest rig
-  description: A robust chest rig with deep pockets and hooks, for use by a Blueshield Officer.
+  parent: [ ClothingBeltMilitaryWebbingCMO, BaseCentcommContraband ]
+  name: blueshield officer's medical chest rig # renamed for medical set
+  description: A robust chest rig with deep pockets and hooks, for use by a Blueshield Officer who believes in the reliability of classic medicinals.
   components:
   - type: Sprite
     sprite: _Omu/Clothing/Belt/blueshieldwebbing.rsi
   - type: Clothing
     sprite: _Omu/Clothing/Belt/blueshieldwebbing.rsi
   - type: Storage
     grid:
-    - 0,0,4,2
+    - 0,0,6,2
     whitelist: # I have no idea why is, say, wrench here, but it's just copied from medical belt.
       tags:
         - Wrench
@@ -30,6 +30,8 @@
         - MedicalPatch # Goobstation
         - AutoinjectorCartridge # Goobstation
         - HandheldCrewMonitor # Goobstation
+        - Medkit # Omustation, for BSO's medical set
+        - BodyBag # Omustation, for BSO's surgical set
       components:
         - Flash
         - Handcuff
@@ -155,4 +157,79 @@
         type: StorageBoundUserInterface
       enum.ChameleonUiKey.Key:
         type: ChameleonBoundUserInterface
-  - type: HideContrabandContent #Goobstation-Contraband detector
+  - type: HideContrabandContent #Goobstation-Contraband detector
+
+- type: entity
+  id: ClothingBeltChemBagBSO
+  parent: [ ChemBag, BaseCentcommContraband ]
+  name: blueshield officer's medical pouch
+  description: A robust pouch for medical supplies worn by Blueshield Officers especially fond of chemical based medicinals.
+  components:
+  - type: Sprite 
+    sprite: _Omu/Clothing/Belt/blueshieldchembag.rsi
+  - type: Clothing
+    sprite: _Omu/Clothing/Belt/blueshieldchembag.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.01
+  - type: Storage
+    whitelist: # Yeah so I kinda just copied everything from the syndie one nukie corpsman gets and then also combined it with the BSO webbing whitelist on request
+      tags:
+        - PillCanister
+        - Syringe
+        - Dropper
+        - MedicalPatch
+        - Brutepack
+        - Bloodpack
+        - Gauze
+        - Ointment
+        - CigPack
+        - Cigarette
+        - Bottle
+        - Spray
+        - Radio
+        - DiscreteHealthAnalyzer
+        - SurgeryTool
+        - Tourniquet #Goobstation
+        - AutoinjectorCartridge # Goobstation
+        - HandheldCrewMonitor # Goobstation
+        - Medkit # Omustation, for BSO's medical set
+        - BodyBag # Omustation, for BSO's surgical set
+      components:
+        - Pill
+        - Hypospray
+        - SyringeGun
+        - SurgeryTool
+        - Defibrillator
+        - SolutionTransfer
+        - GunApplySolution # Dart gun
+        - Flash
+        - Handcuff
+        - Whistle
+        - Injector
+        - HandLabeler
+        - FitsInDispenser
+
+- type: entity
+  id: ClothingBeltExtractionRigBSO
+  parent: ClothingBeltStorageBase
+  name: blueshield officer's extraction rig
+  description: A more modern design of the rigs used by salvagers with even more pockets and pouches, worn by Blueshield Officers which like to focus on efficient extraction.
+  components:
+  - type: Sprite
+    sprite: _Omu/Clothing/Belt/blueshieldextractionwebbing.rsi
+  - type: Clothing
+    sprite: _Omu/Clothing/Belt/blueshieldextractionwebbing.rsi
+  - type: Storage
+    grid:
+    - 0,0,9,1 # 20 squares of space, least of all of the options (chembag has 24, the chest rigs have 21), cus it can store anything. Also funny long line.
+
+- type: entity 
+  id: ClothingBeltBlueshieldEliteWebbingSurgical
+  parent: ClothingBeltMilitaryWebbingBSO # this is to share the same whitelist
+  name: blueshield officer's surgical chest rig
+  description: A robust chest rig with deep pockets and hooks, for use by a Blueshield Officer who is used to picking up and putting any VIP back together.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Clothing/Belt/blueshieldwebbing.rsi
+  - type: Clothing
+    sprite: _Starlight/Clothing/Belt/blueshieldwebbing.rsi

Resources/Prototypes/_Omu/Entities/Objects/Specific/CentralCommand/set_selectors.yml

@@ -0,0 +1,36 @@
+# Blueshield Omu Edition
+
+- type: entity
+  id: BlueshieldUndeterminedOffensive
+  name:  blueshield offensive sets pack
+  description: A small box utilizing bluespace technology to drop in a loadout meant for offensive directly to you. Choose wisely.
+  parent: [ BaseItem, BaseSetSelector, BaseCentcommContraband ]
+  components:
+  - type: Sprite
+    sprite: _Omu/Objects/Misc/GunCases/blueshieldoffensivecase.rsi
+    state: icon
+  - type: SetSelector
+    possibleSets:
+    - BSOBRDISet
+    - BSOChesterSet
+    - BSORevolverSet
+    - BSOBlueshieldSet
+    - BSOCQCSet
+    maxSelectedSets: 1
+
+- type: entity
+  id: BlueshieldUndeterminedSupport
+  name:  blueshield support sets pack
+  description: A small box utilizing bluespace technology to drop in a loadout meant for support directly to you. Choose wisely.
+  parent: [ BaseItem, BaseSetSelector, BaseCentcommContraband ]
+  components:
+  - type: Sprite
+    sprite: _Omu/Objects/Misc/GunCases/blueshieldsupportcase.rsi
+    state: icon
+  - type: SetSelector
+    possibleSets:
+    - BSOExtractionSet
+    - BSOSurgicalSet
+    - BSOMedicalSet
+    - BSOChemicalSet
+    maxSelectedSets: 1

Resources/Prototypes/_Omu/Entities/Objects/Specific/Chemistry/chemistry-vials.yml

@@ -0,0 +1,14 @@
+- type: entity
+  id: ArtiplatesChemistryVial
+  parent: BaseChemistryEmptyVial
+  suffix: artiplates
+  components:
+  - type: Label
+    currentLabel: reagent-name-artiplates
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 30
+        reagents:
+          - ReagentId: Artiplates
+            Quantity: 30