forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
..magboot spawn chance on brigmedic locker. Someone accidentally gave it a 0.1 chance to spawn lol.
- Loading branch information
1 parent
4f38820
commit b920aa7
Showing
16 changed files
with
186 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
Resources/Prototypes/_StarLight/Catalog/Fills/Items/firstaidkits.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- type: entity | ||
id: SecurityHypoKitFilled | ||
suffix: Filled | ||
parent: SecurityHypoKit | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: BrigHypo | ||
- id: ReinforcedEmptyChemistryVial | ||
amount: 8 |
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_StarLight/Entities/Objects/Specific/Medical/defib.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
Resources/Prototypes/_StarLight/Entities/Objects/Specific/Medical/hypospray.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
- type: entity | ||
name: Miniature Hypospray | ||
parent: [BaseItem, BaseSecurityContraband] | ||
description: A compact sterile injector for rapid chemical injection in combat situations. | ||
id: BrigHypo | ||
components: | ||
- type: Sprite | ||
sprite: _Starlight/Objects/Specific/Medical/hypospray.rsi | ||
state: hypo | ||
- type: Item | ||
sprite: _Starlight/Objects/Specific/Medical/hypospray.rsi | ||
size: Tiny | ||
- type: SolutionContainerManager | ||
solutions: | ||
hypospray: | ||
maxVol: 5 | ||
- type: RefillableSolution | ||
solution: hypospray | ||
- type: ExaminableSolution | ||
solution: hypospray | ||
- type: Hypospray | ||
onlyAffectsMobs: false | ||
- type: UseDelay | ||
delay: 0.5 | ||
- type: StaticPrice | ||
price: 750 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
Resources/Prototypes/_StarLight/Entities/Objects/Specific/chemistry-vials.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
# TODO: Have a seperate lid state that can be popped on and off (not as a seperate item) that changes whether the vial can be spilled or not. | ||
|
||
- type: entity | ||
name: Reinforced Vial | ||
parent: BaseItem | ||
id: ReinforcedEmptyChemistryVial | ||
description: A small vial made with blast-resistant glass. #My workaround for being unable to make a container explosion-proof. | ||
components: | ||
- type: Tag | ||
tags: | ||
- Trash | ||
- CentrifugeCompatible | ||
- Vial | ||
- type: PhysicalComposition | ||
materialComposition: | ||
Glass: 25 | ||
- type: FitsInDispenser | ||
solution: beaker | ||
- type: SpaceGarbage | ||
- type: Sprite | ||
sprite: Objects/Specific/Chemistry/vial.rsi | ||
layers: | ||
- state: vial-1 | ||
- state: vial-1-1 | ||
map: ["enum.SolutionContainerLayers.Fill"] | ||
visible: false | ||
- type: Appearance | ||
- type: SolutionContainerVisuals | ||
maxFillLevels: 6 | ||
fillBaseName: vial-1- | ||
inHandsMaxFillLevels: 4 | ||
inHandsFillBaseName: -fill- | ||
- type: Drink | ||
solution: beaker | ||
- type: SolutionContainerManager | ||
solutions: | ||
beaker: | ||
maxVol: 30 | ||
- type: MixableSolution | ||
solution: beaker | ||
- type: RefillableSolution | ||
solution: beaker | ||
- type: DrainableSolution | ||
solution: beaker | ||
- type: ExaminableSolution | ||
solution: beaker | ||
- type: DrawableSolution | ||
solution: beaker | ||
- type: SolutionTransfer | ||
maxTransferAmount: 30 | ||
canChangeTransferAmount: true | ||
- type: SolutionItemStatus | ||
solution: beaker | ||
- type: UserInterface | ||
interfaces: | ||
enum.TransferAmountUiKey.Key: | ||
type: TransferAmountBoundUserInterface | ||
- type: Item | ||
size: Tiny | ||
sprite: Objects/Specific/Chemistry/vial.rsi | ||
shape: | ||
- 0,0,0,0 | ||
- type: MeleeWeapon | ||
soundNoDamage: | ||
path: "/Audio/Effects/Fluids/splat.ogg" | ||
damage: | ||
types: | ||
Blunt: 0 | ||
- type: TrashOnSolutionEmpty | ||
solution: beaker | ||
- type: StaticPrice | ||
price: 100 | ||
- type: DamageOnLand | ||
damage: | ||
types: | ||
Blunt: 5 | ||
- type: DamageOtherOnHit | ||
damage: | ||
types: | ||
Blunt: 2 | ||
- type: Spillable | ||
solution: beaker | ||
- type: DnaSubstanceTrace |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,3 +42,4 @@ | |
- Flash | ||
- SecurityMedkit | ||
- DefibrillatorBrigmedical | ||
- SecurityHypoKitFilled |
Binary file added
BIN
+858 Bytes
...es/_Starlight/Objects/Specific/Medical/firstaidkits.rsi/HypoKit-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+832 Bytes
...s/_Starlight/Objects/Specific/Medical/firstaidkits.rsi/HypoKit-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+937 Bytes
...urces/Textures/_Starlight/Objects/Specific/Medical/firstaidkits.rsi/HypoKit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+781 Bytes
...es/Textures/_Starlight/Objects/Specific/Medical/hypospray.rsi/equipped-BELT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+794 Bytes
Resources/Textures/_Starlight/Objects/Specific/Medical/hypospray.rsi/hypo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+834 Bytes
...rces/Textures/_Starlight/Objects/Specific/Medical/hypospray.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+834 Bytes
...ces/Textures/_Starlight/Objects/Specific/Medical/hypospray.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions
26
Resources/Textures/_Starlight/Objects/Specific/Medical/hypospray.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and then modified by Killer Tamashi", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "hypo" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-BELT", | ||
"directions": 4 | ||
} | ||
] | ||
} |