Nuclear Operative Medic (#8274)

* Update belts.yml

* Add files via upload

* Update hypospray.yml

* Update hypospray.yml

* Update belt.yml

* Update belts.yml

* Add files via upload

* Update misc_startinggear.yml

* Update belts.yml

* Update misc_startinggear.yml

* Update misc_startinggear.yml

* Update belt.yml

* Update duffelbag.yml

* Update duffelbag.yml

* Update misc_startinggear.yml

* Update belts.yml

* Update chemistry-bottles.yml

* Update chemistry-bottles.yml

* Update belt.yml

* Update belt.yml

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -22,11 +22,11 @@
   - type: StorageFill
     contents:
       - id: Hemostat
-      - id: Saw
+      - id: SawAdvanced
       - id: Drill
       - id: Cautery
       - id: Retractor
-      - id: Scalpel
+      - id: ScalpelAdvanced
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
@@ -215,3 +215,23 @@
       - id: SurvivalKnife
       - id: PistolClarissa
       - id: BaseUplinkRadio40TC
+
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateMedical
+  id: ClothingBackpackDuffelSyndicateOperativeMedic
+  name: operative medic duffelbag
+  description: A large duffel bag for holding extra medical supplies.
+  components:
+  - type: StorageFill
+    contents:
+      - id: Hemostat
+      - id: SawAdvanced
+      - id: Drill
+      - id: Cautery
+      - id: Retractor
+      - id: ScalpelAdvanced
+      - id: BaseUplinkRadio40TC
+      - id: BoxSurvivalSyndicate
+      - id: SurvivalKnife
+      - id: PistolClarissa

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -83,3 +83,20 @@
   - type: StorageFill
     contents:
       - id: CaptainSabre
+
+- type: entity
+  id: ClothingBeltMilitaryWebbingMedFilled
+  parent: ClothingBeltMilitaryWebbingMed
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: SyndiHypo
+      - id: EpinephrineChemistryBottle
+        amount: 2
+      - id: EphedrineChemistryBottle
+        amount: 2
+      - id: OmnizineChemistryBottle
+        amount: 1
+      - id: MedkitCombatFilled  
+      

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

@@ -455,6 +455,19 @@
   - type: Clothing
     sprite: Clothing/Belt/militarywebbing.rsi
 
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltMilitaryWebbingMed
+  name: medical chest rig
+  description: A set of tactical webbing worn by Gorlax Marauder medic operatives.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/militarywebbingmed.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/militarywebbingmed.rsi
+  - type: Storage
+    capacity: 60
+    
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltSuspenders

Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml

@@ -19,6 +19,27 @@
     solution: hypospray
   - type: Hypospray
 
+- type: entity
+  name: gorlax hypospray
+  parent: BaseItem
+  description: Using reverse engineered designs from NT, Cybersun produced these in limited quantities for gorlax marauder operatives.
+  id: SyndiHypo
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/syndihypo.rsi
+    state: hypo
+  - type: Item
+    sprite: Objects/Specific/Medical/syndihypo.rsi
+  - type: SolutionContainerManager
+    solutions:
+      hypospray:
+        maxVol: 20
+  - type: RefillableSolution
+    solution: hypospray
+  - type: ExaminableSolution
+    solution: hypospray
+  - type: Hypospray
+  
 - type: entity
   name: chemical medipen
   parent: BaseItem

Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml

@@ -154,3 +154,28 @@
         - ReagentId: Nocturine
           Quantity: 30
 
+- type: entity
+  id: EphedrineChemistryBottle
+  name: ephedrine bottle
+  parent: BaseChemistryEmptyBottle
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink: 
+        maxVol: 30
+        reagents:
+        - ReagentId: Ephedrine
+          Quantity: 30
+
+- type: entity
+  id: OmnizineChemistryBottle
+  name: omnizine bottle
+  parent: BaseChemistryEmptyBottle
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink: 
+        maxVol: 30
+        reagents:
+        - ReagentId: Omnizine
+          Quantity: 30

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -95,7 +95,7 @@
     id: AgentIDCard
     pocket1: ExtendedEmergencyOxygenTankFilled
     belt: ClothingBeltMilitaryWebbing
-  innerclothingskirt: ClothingUniformJumpsuitOperative
+  innerclothingskirt: ClothingUniformJumpskirtOperative
   satchel: ClothingBackpackDuffelSyndicateOperative
   duffelbag: ClothingBackpackDuffelSyndicateOperative
 
@@ -114,7 +114,25 @@
     id: SyndiPDA
     pocket1: ExtendedEmergencyOxygenTankFilled
     belt: ClothingBeltMilitaryWebbing
-  innerclothingskirt: ClothingUniformJumpsuitOperative
+  innerclothingskirt: ClothingUniformJumpskirtOperative
   satchel: ClothingBackpackDuffelSyndicateOperative
   duffelbag: ClothingBackpackDuffelSyndicateOperative
   
+- type: startingGear
+  id: SyndicateOperativeMedicFull
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackDuffelSyndicateOperativeMedic
+    mask: ClothingMaskBreathMedical
+    eyes: ClothingEyesHudMedical
+    ears: ClothingHeadsetAltSyndicate
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitSyndieElite
+    shoes: ClothingShoesBootsMagSyndie
+    id: SyndiPDA
+    pocket1: DoubleEmergencyOxygenTankFilled
+    pocket2: HandheldHealthAnalyzer
+    belt: ClothingBeltMilitaryWebbingMedFilled
+  innerclothingskirt: ClothingUniformJumpskirtOperative
+  satchel: ClothingBackpackDuffelSyndicateOperativeMedic
+  duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic

Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by emisse for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and modified by emisse for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "hypo"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}