forked from space-sunrise/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
# Conflicts: # Resources/Changelog/ChangelogSunrise.yml
- Loading branch information
Showing
12 changed files
with
223 additions
and
1 deletion.
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
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
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
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
107 changes: 107 additions & 0 deletions
107
Resources/Prototypes/_Sunrise/Entities/Objects/Misc/pepper_spray.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,107 @@ | ||
| - type: entity | ||
| parent: BaseItem | ||
| id: BasePepperSpray | ||
| name: перцовый баллончик | ||
| description: Баллончик с очень едкой жижей внутри. | ||
| abstract: true | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Sunrise/Objects/Misc/pepperspray.rsi | ||
| - type: SolutionContainerManager | ||
| solutions: | ||
| spray: | ||
| maxVol: 40 | ||
| reagents: | ||
| - ReagentId: TearGas | ||
| Quantity: 40 | ||
| - type: DrainableSolution | ||
| solution: spray | ||
| - type: UseDelay | ||
| - type: Spray | ||
| transferAmount: 5 | ||
| pushbackAmount: 30 | ||
| spraySound: | ||
| path: /Audio/Effects/spray.ogg | ||
| sprayedPrototype: PepperSpray | ||
| vaporAmount: 3 | ||
| vaporSpread: 90 | ||
| sprayVelocity: 2.0 | ||
| - type: MeleeWeapon | ||
| wideAnimationRotation: -135 | ||
| attackRate: 2 | ||
| damage: | ||
| types: | ||
| Blunt: 4 | ||
| soundHit: | ||
| path: /Audio/Weapons/smash.ogg | ||
| - type: Tool | ||
| qualities: | ||
| - Rolling | ||
| speedModifier: 0.7 | ||
| - type: ItemToggle | ||
| soundActivate: | ||
| path: /Audio/Machines/button.ogg | ||
| params: | ||
| variation: 0.125 | ||
| volume: -4 | ||
| soundDeactivate: | ||
| path: /Audio/Machines/button.ogg | ||
| params: | ||
| variation: 0.125 | ||
| volume: -4 | ||
| - type: ToggleVerb | ||
| text: fire-extinguisher-component-verb-text | ||
| - type: SpraySafety | ||
| - type: Appearance | ||
| - type: PhysicalComposition | ||
| materialComposition: | ||
| Steel: 20 | ||
| Plastic: 20 | ||
|
|
||
| - type: entity | ||
| parent: BasePepperSpray | ||
| id: PepperSprayBottleRed | ||
| components: | ||
| - type: Sprite | ||
| layers: | ||
| - state: item | ||
| - state: overlay | ||
| color: "#FF0000" | ||
|
|
||
| - type: entity | ||
| parent: BasePepperSpray | ||
| id: PepperSprayBottleGreen | ||
| components: | ||
| - type: Sprite | ||
| layers: | ||
| - state: item | ||
| - state: overlay | ||
| color: "#00FF00" | ||
|
|
||
| - type: entity | ||
| parent: BasePepperSpray | ||
| id: PepperSprayBottleBlue | ||
| components: | ||
| - type: Sprite | ||
| layers: | ||
| - state: item | ||
| - state: overlay | ||
| color: "#0000FF" | ||
|
|
||
| - type: entity | ||
| name: pepper spray | ||
| id: PepperSpray | ||
| parent: Vapor | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Sunrise/Effects/pepperSpray.rsi | ||
| layers: | ||
| - state: spray | ||
| map: [ "enum.VaporVisualLayers.Base" ] | ||
| - type: Physics | ||
| bodyType: Dynamic | ||
| - type: Appearance | ||
| - type: VaporVisuals | ||
| animationTime: 0.4 | ||
| animationState: spray |
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
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
22 changes: 22 additions & 0 deletions
22
Resources/Textures/_Sunrise/Effects/pepperSpray.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,22 @@ | ||
| { | ||
| "version": 1, | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "made by github: @pxc1984 discord: @pacable", | ||
| "states": [ | ||
| { | ||
| "name": "spray", | ||
| "delays": [ | ||
| [ | ||
| 0.1, | ||
| 0.1, | ||
| 0.1, | ||
| 0.1 | ||
| ] | ||
| ] | ||
| } | ||
| ] | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions
17
Resources/Textures/_Sunrise/Objects/Misc/pepperspray.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,17 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "made by discrod: @sat_domasaki", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "item" | ||
| }, | ||
| { | ||
| "name": "overlay" | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+149 Bytes
Resources/Textures/_Sunrise/Objects/Misc/pepperspray.rsi/overlay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.