diff --git a/Resources/Audio/_DV/Weapons/attributions.yml b/Resources/Audio/_DV/Weapons/attributions.yml new file mode 100644 index 0000000000..bcab4f18dc --- /dev/null +++ b/Resources/Audio/_DV/Weapons/attributions.yml @@ -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/" + diff --git a/Resources/Audio/Nyanotrasen/Weapons/electricguitarhit.ogg b/Resources/Audio/_DV/Weapons/electricguitarhit.ogg similarity index 100% rename from Resources/Audio/Nyanotrasen/Weapons/electricguitarhit.ogg rename to Resources/Audio/_DV/Weapons/electricguitarhit.ogg diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/_DV/Entities/Objects/Fun/instruments.yml similarity index 81% rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Fun/instruments.yml rename to Resources/Prototypes/_DV/Entities/Objects/Fun/instruments.yml index 67978f89fe..78fc57942c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Fun/instruments.yml @@ -13,11 +13,11 @@ "Slap": {36: 0} "Slap (XTra Funky)": {37: 0} - type: Sprite - sprite: Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi + sprite: _DV/Objects/Fun/Instruments/rickenbacker.rsi state: icon - type: Item size: Normal - sprite: Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi + sprite: _DV/Objects/Fun/Instruments/rickenbacker.rsi # - type: MeleeStaminaCost # swing: 10 # wieldCoefficient: 0.40 @@ -26,7 +26,7 @@ - StringInstrument - type: MeleeWeapon soundHit: - path: /Audio/Nyanotrasen/Weapons/electricguitarhit.ogg + path: /Audio/_DV/Weapons/electricguitarhit.ogg damage: types: Blunt: 7 @@ -41,7 +41,7 @@ components: - type: MeleeWeapon soundHit: - path: /Audio/Nyanotrasen/Weapons/electricguitarhit.ogg + path: /Audio/_DV/Weapons/electricguitarhit.ogg bluntStaminaDamageFactor: 4.5 attackRate: 1.25 range: 1.85 diff --git a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/icon.png deleted file mode 100644 index 5abf9574ed..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/inhand-left.png b/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/inhand-left.png deleted file mode 100644 index e83a916b79..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/inhand-right.png b/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/inhand-right.png deleted file mode 100644 index e83a916b79..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/meta.json deleted file mode 100644 index 65eb9cd911..0000000000 --- a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/meta.json +++ /dev/null @@ -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 - } - ] -} diff --git a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-left.png b/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-left.png deleted file mode 100644 index e83a916b79..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-right.png b/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-right.png deleted file mode 100644 index e83a916b79..0000000000 Binary files a/Resources/Textures/Nyanotrasen/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..3eccf86488 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..3eccf86488 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/icon.png b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/icon.png new file mode 100644 index 0000000000..5e08bd4fd6 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/inhand-left.png new file mode 100644 index 0000000000..4f34f19198 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/inhand-right.png new file mode 100644 index 0000000000..b6d1f43297 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/meta.json b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/meta.json new file mode 100644 index 0000000000..52c6f2bfe9 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-left.png b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..4f34f19198 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-right.png b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..4f34f19198 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Fun/Instruments/rickenbacker.rsi/wielded-inhand-right.png differ