rickenback attribution gaming (#3258)
* rickenback attribution gaming * moved to dv * move proto and audio * license changes * add whitespace ops Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update attributions.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * it was fucking colin Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
|
|
@ -0,0 +1,5 @@
|
||||||
|
- files: ["electricguitarhit.ogg"]
|
||||||
|
license: "CC0-1.0"
|
||||||
|
copyright: "electricguitarhit.ogg is modified by Colin-Tel from a file made by guitarguy1985."
|
||||||
|
source: "https://freesound.org/people/guitarguy1985/sounds/52391/"
|
||||||
|
|
||||||
|
|
@ -13,11 +13,11 @@
|
||||||
"Slap": {36: 0}
|
"Slap": {36: 0}
|
||||||
"Slap (XTra Funky)": {37: 0}
|
"Slap (XTra Funky)": {37: 0}
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi
|
sprite: _DV/Objects/Fun/Instruments/rickenbacker.rsi
|
||||||
state: icon
|
state: icon
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Normal
|
size: Normal
|
||||||
sprite: Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi
|
sprite: _DV/Objects/Fun/Instruments/rickenbacker.rsi
|
||||||
# - type: MeleeStaminaCost
|
# - type: MeleeStaminaCost
|
||||||
# swing: 10
|
# swing: 10
|
||||||
# wieldCoefficient: 0.40
|
# wieldCoefficient: 0.40
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
- StringInstrument
|
- StringInstrument
|
||||||
- type: MeleeWeapon
|
- type: MeleeWeapon
|
||||||
soundHit:
|
soundHit:
|
||||||
path: /Audio/Nyanotrasen/Weapons/electricguitarhit.ogg
|
path: /Audio/_DV/Weapons/electricguitarhit.ogg
|
||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
Blunt: 7
|
Blunt: 7
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
components:
|
components:
|
||||||
- type: MeleeWeapon
|
- type: MeleeWeapon
|
||||||
soundHit:
|
soundHit:
|
||||||
path: /Audio/Nyanotrasen/Weapons/electricguitarhit.ogg
|
path: /Audio/_DV/Weapons/electricguitarhit.ogg
|
||||||
bluntStaminaDamageFactor: 4.5
|
bluntStaminaDamageFactor: 4.5
|
||||||
attackRate: 1.25
|
attackRate: 1.25
|
||||||
range: 1.85
|
range: 1.85
|
||||||
|
Before Width: | Height: | Size: 774 B |
|
Before Width: | Height: | Size: 723 B |
|
Before Width: | Height: | Size: 723 B |
|
|
@ -1,30 +0,0 @@
|
||||||
{
|
|
||||||
"version": 1,
|
|
||||||
"size": {
|
|
||||||
"x": 32,
|
|
||||||
"y": 32
|
|
||||||
},
|
|
||||||
"license": "CC-BY-SA-3.0",
|
|
||||||
"copyright": "Created by Daemon",
|
|
||||||
"states": [
|
|
||||||
{
|
|
||||||
"name": "icon"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "inhand-left",
|
|
||||||
"directions": 4
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "inhand-right",
|
|
||||||
"directions": 4
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "wielded-inhand-left",
|
|
||||||
"directions": 4
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "wielded-inhand-right",
|
|
||||||
"directions": 4
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
Before Width: | Height: | Size: 723 B |
|
Before Width: | Height: | Size: 723 B |
|
After Width: | Height: | Size: 896 B |
|
After Width: | Height: | Size: 896 B |
|
After Width: | Height: | Size: 601 B |
|
After Width: | Height: | Size: 684 B |
|
After Width: | Height: | Size: 676 B |
|
|
@ -0,0 +1,38 @@
|
||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/08cd8d05438c00f86c1504c3f4440442c04c58c9/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi and modified by Daemon",
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "equipped-BACKPACK",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "equipped-SUITSTORAGE",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-left",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-right",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "wielded-inhand-left",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "wielded-inhand-right",
|
||||||
|
"directions": 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 684 B |
|
After Width: | Height: | Size: 684 B |