diff --git a/Resources/Audio/White/CoinDrop/coindrop1.ogg b/Resources/Audio/White/CoinDrop/coindrop1.ogg new file mode 100644 index 0000000000..728dac6ecb Binary files /dev/null and b/Resources/Audio/White/CoinDrop/coindrop1.ogg differ diff --git a/Resources/Audio/White/CoinDrop/coindrop2.ogg b/Resources/Audio/White/CoinDrop/coindrop2.ogg new file mode 100644 index 0000000000..adb3f53e5e Binary files /dev/null and b/Resources/Audio/White/CoinDrop/coindrop2.ogg differ diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index 33499759b7..f3047d2371 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -461,3 +461,42 @@ - type: Sprite sprite: White/Fluff/6elblu/white-cloak.rsi + +#Serafim547 +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesMesonBlue + name: Утилизаторные очки + description: Очки с фиолетовым затемнением, использующие патентованный полимер, обеспечивающие надежную защиту глаз от всех видов повреждений. + components: + - type: Sprite + sprite: White/Fluff/Serafim547/meason_blue.rsi + - type: Clothing + sprite: White/Fluff/Serafim547/meason_blue.rsi + - type: EyeProtection + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSerafimSalvageSpecialist + name: комбинезон специалиста по утилизации + description: Удобный прочный комбинезон. Особенно грязный. + components: + - type: Sprite + sprite: White/Fluff/Serafim547/salvage.rsi + - type: Clothing + sprite: White/Fluff/Serafim547/salvage.rsi + +- type: entity + parent: BaseDice + id: VulpCoin + name: Золотая монета + description: Коллекционная чеканная монета с родины вульпканин, редкая находка обладающая не столь реальной, сколько символической ценностью. + components: + - type: Dice + sound: + collection: CoinDrop + sides: 2 + currentValue: 2 + - type: Sprite + sprite: White/Fluff/Serafim547/vulp_coin.rsi + state: coin_2 diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index ef5c8737a2..08435e85df 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -172,3 +172,19 @@ id: 6elbluBootsLoadout entity: ClothingShoesTourist sponsorOnly: true + +#Serafim547 +- type: loadout + id: Serafim547MesonBlueLoadout + entity: ClothingEyesGlassesMesonBlue + sponsorOnly: true + +- type: loadout + id: Serafim547SalvageSpecialistLoadout + entity: ClothingUniformJumpsuitSerafimSalvageSpecialist + sponsorOnly: true + +- type: loadout + id: Serafim547VulpCoinLoadout + entity: VulpCoin + sponsorOnly: true diff --git a/Resources/Prototypes/White/SoundCollections/coindrop.yml b/Resources/Prototypes/White/SoundCollections/coindrop.yml new file mode 100644 index 0000000000..72c5335d13 --- /dev/null +++ b/Resources/Prototypes/White/SoundCollections/coindrop.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: CoinDrop + files: + - /Audio/White/CoinDrop/coindrop1.ogg + - /Audio/White/CoinDrop/coindrop2.ogg diff --git a/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/equipped-EYES.png b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/equipped-EYES.png new file mode 100644 index 0000000000..8502570bea Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/icon.png b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/icon.png new file mode 100644 index 0000000000..0ddb2e8fe5 Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/inhand-left.png new file mode 100644 index 0000000000..3943ea28d0 Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/inhand-right.png new file mode 100644 index 0000000000..57aa18cf0d Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/meta.json b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/meta.json new file mode 100644 index 0000000000..83d5205e19 --- /dev/null +++ b/Resources/Textures/White/Fluff/Serafim547/meason_blue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Ya myaukayou", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-body-slim.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-body-slim.png new file mode 100644 index 0000000000..7c8672348e Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..98170f84b6 Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..8f0fc98768 Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon.png new file mode 100644 index 0000000000..e5557a33e1 Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-left.png new file mode 100644 index 0000000000..1987c5a9ea Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-right.png new file mode 100644 index 0000000000..54c5071292 Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/meta.json b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/meta.json new file mode 100644 index 0000000000..8148717fea --- /dev/null +++ b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_1.png b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_1.png new file mode 100644 index 0000000000..91bac2bbff Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_1.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_2.png b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_2.png new file mode 100644 index 0000000000..671d686882 Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_2.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/meta.json b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/meta.json new file mode 100644 index 0000000000..e0a701d6ba --- /dev/null +++ b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ya ebal slona", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "coin_1" + }, + { + "name": "coin_2" + } + ] +}