diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 41a14c6118..e563bf3a70 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 115fa4dd9a..899c0e9fda 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/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 + diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 092c56abc0..edd6dee035 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index be72c08c9a..7893742e21 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index c47addc495..1b1a1c5eec 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/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 diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 15bd8e6311..36e88d4679 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/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 diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/equipped-BELT.png new file mode 100644 index 0000000000..7db391656c Binary files /dev/null and b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/icon.png b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/icon.png new file mode 100644 index 0000000000..7e6e4b3f35 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-left.png new file mode 100644 index 0000000000..dbce144c60 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-right.png new file mode 100644 index 0000000000..8280138ae7 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json new file mode 100644 index 0000000000..0126b5b4db --- /dev/null +++ b/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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png new file mode 100644 index 0000000000..2e410898ef Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-left.png new file mode 100644 index 0000000000..a38875627f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-right.png new file mode 100644 index 0000000000..a38875627f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json new file mode 100644 index 0000000000..15cf39658c --- /dev/null +++ b/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 + } + ] +} \ No newline at end of file