diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index b6956c071f..e358a47d72 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -110,3 +110,30 @@ sprite: White/Fluff/Warete/warete_jumpsuit.rsi - type: Clothing sprite: White/Fluff/Warete/warete_jumpsuit.rsi + +# HSKveez +- type: entity + parent: ClothingNeckBase + id: HSKveezKulon + name: плазменное сердце + description: Не взрывай. + components: + - type: Sprite + sprite: White/Fluff/HSKveez/hope.rsi + - type: Clothing + sprite: White/Fluff/HSKveez/hope.rsi + - type: PointLight + radius: 2 + energy: 2 + color: '#ff6bff' + +- type: entity + name: дубинка контрактника + parent: Stunbaton + id: HSKveezStunBaton + description: Телескопическая дубинка, наносящая легкий электрический шок. + components: + - type: Sprite + sprite: White/Fluff/HSKveez/contactor_batton.rsi + - type: Clothing + sprite: White/Fluff/HSKveez/contactor_batton.rsi diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index 50a7bedc22..6d6f0b31d6 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -39,3 +39,15 @@ id: WareteJumpskirtLoadout entity: WareteJumpskirt sponsorOnly: true + +# HSKveez +- type: loadout + id: HSKveezKulonLoadout + entity: HSKveezKulon + sponsorOnly: true + +- type: loadout + id: HSKveezStunBatonLoadout + entity: HSKveezStunBaton + sponsorOnly: true + whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden ] diff --git a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/White/Ghosts/custom_ghosts.yml index 5d530bcaac..24ad329b56 100644 --- a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/White/Ghosts/custom_ghosts.yml @@ -37,3 +37,11 @@ alpha: 1 ghostName: Величайший ghostDescription: Восстал из небытия. + +- type: customGhost + id: hskveez-ghost + ckey: hskveez + sprite: White/Ghosts/hskveez-ghost.rsi + alpha: 0.9 + ghostName: Огонек + ghostDescription: А где тут огнетушитель? diff --git a/Resources/Textures/Mobs/Customization/cat_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/cat_parts.rsi/meta.json index 77c6e978d2..8c05fabfb8 100644 --- a/Resources/Textures/Mobs/Customization/cat_parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/cat_parts.rsi/meta.json @@ -1,2 +1,81 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/blob/master/icons/mob/mutant_bodyparts.dmi", "states": [{"name":"ears_cat_inner","directions":4},{"name":"ears_cat_outer","directions":4},{"name":"tail_cat","directions":4}]} - +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e9cc620e9f908e18949031c6e1b5811e3fc5af4e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ears_cat_inner", + "directions": 4 + }, + { + "name": "ears_cat_outer", + "directions": 4 + }, + { + "name": "tail_cat", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/cat_parts.rsi/tail_cat.png b/Resources/Textures/Mobs/Customization/cat_parts.rsi/tail_cat.png index bb6b2de8ef..d7ff1589bc 100644 Binary files a/Resources/Textures/Mobs/Customization/cat_parts.rsi/tail_cat.png and b/Resources/Textures/Mobs/Customization/cat_parts.rsi/tail_cat.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/equipped-BELT.png b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/equipped-BELT.png new file mode 100644 index 0000000000..89b96b169b Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/meta.json b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/meta.json new file mode 100644 index 0000000000..0a57e7fd9e --- /dev/null +++ b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stunbaton_nocell" + }, + { + "name": "stunbaton_off" + }, + { + "name": "stunbaton_on" + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/off-inhand-left.png b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/off-inhand-left.png new file mode 100644 index 0000000000..ff769f902f Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/off-inhand-right.png b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/off-inhand-right.png new file mode 100644 index 0000000000..ff769f902f Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/on-inhand-left.png b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/on-inhand-left.png new file mode 100644 index 0000000000..acaa4672a1 Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/on-inhand-right.png b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/on-inhand-right.png new file mode 100644 index 0000000000..a94d2de852 Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_nocell.png b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_nocell.png new file mode 100644 index 0000000000..7f6cd9c18d Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_nocell.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_off.png b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_off.png new file mode 100644 index 0000000000..7f6cd9c18d Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_off.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_on.png b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_on.png new file mode 100644 index 0000000000..f674b492bb Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/contactor_batton.rsi/stunbaton_on.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/equipped-NECK.png b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/equipped-NECK.png new file mode 100644 index 0000000000..04673e30c4 Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/icon.png b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/icon.png new file mode 100644 index 0000000000..bdbc898449 Binary files /dev/null and b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json new file mode 100644 index 0000000000..a9524d2503 --- /dev/null +++ b/Resources/Textures/White/Fluff/HSKveez/hope.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "equipped-NECK", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/animated.png b/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/animated.png new file mode 100644 index 0000000000..81ca96bfb1 Binary files /dev/null and b/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/animated.png differ diff --git a/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/meta.json new file mode 100644 index 0000000000..65ad07bfed --- /dev/null +++ b/Resources/Textures/White/Ghosts/hskveez-ghost.rsi/meta.json @@ -0,0 +1,103 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "animated", + "directions": 4, + "delays": [ + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ] + ] + } + ] +} \ No newline at end of file