Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Респрайты и мелочи #76

Merged
merged 2 commits into from
Jul 21, 2024
Merged

Респрайты и мелочи #76

merged 2 commits into from
Jul 21, 2024

Conversation

AserCreator
Copy link

О чем PR

  • Добавлены новые звуки окончания раунда
  • Изменены звуки обычного и СБ борга
  • Респрайт СБ борга
  • Респрайт борга
  • Респрайт и изменение паралаксов
  • Респрайт бомб со сборки корвакса
  • Респрайт оружия со сборки корвакса
  • Сумеречники имеют собственную текстуру при одевании купальника
  • Респрайт зарядника батарей
  • Респрайт подстанции
  • Респрайт СМЭСа
  • Респрайт ЛКП
  • Респрайт интеркома
  • Респрайт воздушной сигнализации
  • Респрайт экрана
  • Респрайт шкафчика огнетушителя
  • Респрайт шкафчика дефиблилятора
  • Респрайт солнечных панелей
  • Респрайт мебели

Почему

Я конченый

Технические детали

Изменял прототипы боргов и паралаксов, осторожно щиткод (хотя он там итак был гыгыгы)

Медиа

  • Я добавил скриншот/видео, показывающее изменения в игре или PR не нуждается в показе
  • Я проверил изменения на предмет багов

@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 21, 2024 •
edited
Loading

RSI Diff Bot; head commit 68643c9 merging into 9b33eed
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Silicon/chassis.rsi

State Old New Status
robot Modified
robot_e Modified
robot_e_r Modified
robot_l Modified
security Modified
security_e Modified
security_e_r Modified
security_l Modified

Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified
primed Modified

Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi

State Old New Status
icon Modified
primed Modified

Resources/Textures/Objects/Weapons/Grenades/grenade.rsi

State Old New Status
icon Modified
primed Modified

Resources/Textures/Objects/Weapons/Grenades/modular.rsi

State Old New Status
complete Modified
empty Modified
no-payload Modified
primed Modified
wired Modified

Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi

State Old New Status
icon Modified
primed Modified

Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi

State Old New Status
base Modified
icon Modified
inhand-left-0 Modified
inhand-right-0 Modified
mag-unshaded-0 Modified
mag-unshaded-1 Modified
mag-unshaded-2 Modified
mag-unshaded-3 Modified
mag-unshaded-4 Modified

Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/claymore.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/cleaver.rsi

State Old New Status
butch Modified

Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/cult_blade.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/cult_dagger.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/debug.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/energykatana.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/gohei.rsi

State Old New Status
gohei Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/katana.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/machete.rsi

State Old New Status
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi

State Old New Status
equipped-BACKPACK Modified
inhand-left Modified
inhand-right Modified
spear Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi

State Old New Status
equipped-BACKPACK Modified
inhand-left Modified
inhand-right Modified
spear Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/shiv.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/spear.rsi

State Old New Status
equipped-BACKPACK Modified
inhand-left Modified
inhand-right Modified
spear Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi

State Old New Status
icon Modified

Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi

State Old New Status
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi

State Old New Status
equipped-BACKPACK Modified
inhand-left Modified
inhand-right Modified
spear Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Objects/Weapons/pflash.rsi

State Old New Status
flashing Modified
off Modified
on-unlit Modified
on Modified

Resources/Textures/Structures/Furniture/furniture.rsi

State Old New Status
bed-MED Modified
bed Modified
dresser Modified
mattress Modified
psychbed Modified
rack Modified

Resources/Textures/Structures/Power/Generation/solar_panel.rsi

State Old New Status
broken Modified
normal Modified
solar_tracker Modified
static Modified

Resources/Textures/Structures/Power/apc.rsi

State Old New Status
base Modified
broken Modified
channel0-auto_off Modified
channel0-auto_on Modified
channel0-manual_off Modified
channel0-manual_on Modified
channel1-auto_off Modified
channel1-auto_on Modified
channel1-manual_off Modified
channel1-manual_on Modified
channel2-auto_on Modified
channel2-manual_off Modified
channel2-manual_on Modified
display-charging Modified
display-full Modified
display-lack Modified
display-remote Modified
emag-unlit Modified
frame Modified
lock0-locked Modified
lock0-unlocked Modified
lock1-locked Modified
lock1-unlocked Modified
panel Modified
static Modified

Resources/Textures/Structures/Power/cable_terminal.rsi

State Old New Status
term Modified

Resources/Textures/Structures/Power/cell_recharger.rsi

State Old New Status
empty Modified
full Modified
light-charged Modified
light-charging Modified
light-empty Modified
open Modified

Resources/Textures/Structures/Power/smes.rsi

State Old New Status
smes-open Modified
smes Modified
static Modified

Resources/Textures/Structures/Power/substation.rsi

State Old New Status
charging Modified
dead Modified
full Modified
screen Modified
screen_wall Added

Resources/Textures/Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi

State Old New Status
equipped-INNERCLOTHING-shadowkin Added

Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi

State Old New Status
icon Added
primed Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi

State Old New Status
tranquilizer-spent Added
tranquilizer Added

Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added

Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi

State Old New Status
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 68643c9

@EndrAnimet EndrAnimet merged commit a2ed056 into EndrAnimet:master Jul 21, 2024
9 of 12 checks passed
@GeneralGaws
Copy link
Collaborator

Осторожно, он герой

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Sprite Changes: YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AserCreator @GeneralGaws @EndrAnimet