Upstream

[NEKakust]

Описание PR

Медиа

Проверки

• [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить.
• [ ] Я внимательно просмотрел все свои изменения и багов в них не нашёл.
• [ ] Я запускал локальный сервер со своими изменениями и всё протестировал.
• [ ] Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

:cl:

• add: Добавлено веселье!
• remove: Убрано веселье!
• tweak: Изменено веселье!
• fix: Исправлено веселье!

[github-actions[bot]]

This pull request has conflicts, please resolve those before we can evaluate the pull request.

[github-actions[bot]]

RSI Diff Bot; head commit 7927e5c3cc76ff22766523b2cacd18cf7a7dcd99 merging into 113aacce0148dd994550340d59b027761c1d690d This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Ghosts/ghost_human.rsi

| State | Old | New | Status | --- | --- | --- | --- | | animated |  |  | Modified | icon |  |  | Modified

Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi

| State | Old | New | Status | --- | --- | --- | --- | | advkit-inhand-left |  |  | Modified | advkit-inhand-right |  |  | Modified | advkit |  |  | Modified | blackkit-inhand-left |  |  | Modified | blackkit-inhand-right |  |  | Modified | blackkit |  |  | Modified | brutekit-inhand-left |  |  | Modified | brutekit-inhand-right |  |  | Modified | brutekit |  |  | Modified | burnkit-inhand-left |  |  | Modified | burnkit-inhand-right |  |  | Modified | burnkit |  |  | Modified | firstaid-inhand-left |  |  | Modified | firstaid-inhand-right |  |  | Modified | firstaid |  |  | Modified | o2kit-inhand-left |  |  | Modified | o2kit-inhand-right |  |  | Modified | o2kit |  |  | Modified | radkit-inhand-left |  |  | Modified | radkit-inhand-right |  |  | Modified | radkit |  |  | Modified | toxinkit-inhand-left |  |  | Modified | toxinkit-inhand-right |  |  | Modified | toxinkit |  |  | Modified

Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi

| State | Old | New | Status | --- | --- | --- | --- | | bsa_beam | ![]() |  | Added

Resources/Textures/Objects/Weapons/Guns/Shuttles/bluespace.rsi

| State | Old | New | Status | --- | --- | --- | --- | | cannon | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Belt/bluespacebelt.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-BELT | ![]() |  | Added | icon | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Belt/webbingsssp.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-BELT | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Hands/Gloves/glovesssp.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HAND | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Hands/Gloves/pawsblack.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HAND | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Hands/Gloves/pawswhite.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HAND | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Head/Hardsuits-helmet/centcomhelmet.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon-flash | ![]() |  | Added | icon | ![]() |  | Added | off-equipped-HELMET | ![]() |  | Added | off-inhand-left | ![]() |  | Added | off-inhand-right | ![]() |  | Added | on-equipped-HELMET | ![]() |  | Added | on-inhand-left | ![]() |  | Added | on-inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Head/Hardsuits-helmet/paratrooperhelmet.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon-flash | ![]() |  | Added | icon | ![]() |  | Added | off-equipped-HELMET | ![]() |  | Added | on-equipped-HELMET | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Head/Hats/beret_vdv.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET-hamster | ![]() |  | Added | equipped-HELMET | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Head/Hats/catearsblack.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Head/Helmet/sssphelmet.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/Balaclava/balaclava.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/Balaclava/balaclavablue.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/Balaclava/balaclavacyan.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/Balaclava/balaclavagreen.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/Balaclava/balaclavapink.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/Balaclava/balaclavared.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/Balaclava/balaclavascarlet.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/Balaclava/balaclavawhite.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Mask/ballmuzzle.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-MASK-reptilian | ![]() |  | Added | equipped-MASK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Necks/Cloaks/programmer_neck.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK | ![]() |  | Added | icon-left | ![]() |  | Added | icon-right | ![]() |  | Added | icon | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Necks/Cloaks/syndie_neck.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/OuterClothing/Hardsuits/centcomsuit.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING-digi | ![]() |  | Added | equipped-OUTERCLOTHING | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/OuterClothing/Hardsuits/paratroopersuit.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING-reptilian | ![]() |  | Added | equipped-OUTERCLOTHING | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/OuterClothing/Vests/vestsssp.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Under/stockingsblack.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET | ![]() |  | Added | icon | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Under/stockingsblue.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET | ![]() |  | Added | icon | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Under/stockingspink.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET | ![]() |  | Added | icon | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Under/stockingswhite.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET | ![]() |  | Added | icon | ![]() |  | Added

Resources/Textures/_Meowstation/Clothing/Uniforms/Jumpsuit/uniformsssp.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING-monkey | ![]() |  | Added | equipped-INNERCLOTHING-reptilian | ![]() |  | Added | equipped-INNERCLOTHING | ![]() |  | Added | icon | ![]() |  | Added | inhand-left | ![]() |  | Added | inhand-right | ![]() |  | Added