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.

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

[FIX] QoL-6 #1134

Merged
merged 7 commits into from
Feb 24, 2025
Merged

[FIX] QoL-6 #1134

merged 7 commits into from
Feb 24, 2025

Conversation

PyotrIgn
Copy link
Contributor

@PyotrIgn PyotrIgn commented Feb 24, 2025

Описание PR

Убраны товары для Дня Святого Валентина
Обычный станнер по заряду и урону по стамине вернулся к старым значениям
Убрали Дельту из маппула
Откат коробок оффов и возвращение старых и наших
Возвращены старые спрайты Лектера, Каммерера и Дрозда
Уменьшение цены на ЕМАГ и взломщик доступа
Локализация новых товаров в аплинке

Почему / Баланс

Потому что новые спрайты от Визардов не задают стиль этой комнате

Техническая информация

ПИВО

Чейнджлог
🆑 Петр

  • remove: Убраны из торговых автоматов товары ко Дню Святого Валентина
  • remove: Дельта убрана из пула карт. Причина - Керберос её полностью заменяет
  • tweak: Параметры станнера возвращены к старым значениям
  • tweak: Возвращены старые спрайты оружия
  • tweak: Уменьшение цен на ЕМАГ и взломщик доступа
  • tweak: Откат спрайтов коробок, тулбоксов и прочих от оффов
  • fix: Локализация новых товаров в аплинке

@github-actions github-actions bot added S: Untriaged Changes: Sprites Изменение спрайтов Changes: Map Изменение карт Changes: Localization Изменение локализации Changes: No C# size/M and removed S: Untriaged labels Feb 24, 2025
Copy link
Contributor

github-actions bot commented Feb 24, 2025

RSI Diff Bot; head commit b4cd7c4 merging into 7beb8de
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi

State Old New Status
banana-box Modified
berry-box Modified
box Modified
carp-box Modified
dink-box Modified
pizza-box Modified
spicy-box Modified
stonk-box Modified
teriyaki-box Modified

Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi

State Old New Status
box-open Modified
box Modified
box1 Modified
box2 Modified
box3 Modified
box4 Modified
box5 Modified
box6 Modified
pink-box1 Modified
pink-box2 Modified
pink-box3 Modified
pink-box4 Modified
pink-box5 Modified
pink-box6 Modified

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
icon Removed
closed Added
open Added

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
icon Removed
closed Added
open Added

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
icon Removed
closed Added
open Added

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
icon Removed
closed Added
open Added

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
icon Removed
closed Added
open Added

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi

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

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi

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

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi

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

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi

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

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi

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

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi

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

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi

State Old New Status
cig1 Modified
cig2 Modified
cig3 Modified
cig4 Modified
cig5 Modified
cig6 Modified

Resources/Textures/Objects/Decoration/present.rsi

State Old New Status
present Modified

Resources/Textures/Objects/Devices/flatpack.rsi

State Old New Status
ame-part Modified
base Modified
containment-field-generator Modified
emitter Modified
fax-machine Modified
grounding-rod Modified
icon-default Modified
overlay Modified
radiation-collector Modified
singularity-generator Modified
solar-assembly-part Modified
tesla-coil Modified
tesla-generator Modified

Resources/Textures/Objects/Materials/Scrap/generic.rsi

State Old New Status
junk-medkit-1 Modified
junk-medkit-2 Modified

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

State Old New Status
icon Modified

Resources/Textures/Objects/Storage/Happyhonk/clown.rsi

State Old New Status
box Modified
box-open Added

Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi

State Old New Status
box Modified
box-open Added

Resources/Textures/Objects/Storage/Happyhonk/mime.rsi

State Old New Status
box Modified
box-open Added

Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi

State Old New Status
box Modified
box-open Added

Resources/Textures/Objects/Storage/boxes.rsi

State Old New Status
agrichemkit Modified
envelope Modified
france Modified
nitrogentank Modified
throwing_knives Modified
shellbeanbag Added
shellflare Added
shellflash Added
shellincendiary Added
shellpractice Added
shellslug Added
shelltranquilizer Added
shelluranium Added

Resources/Textures/Objects/Storage/boxicons.rsi

State Old New Status
beaker Modified
bodybags Modified
box Modified
box_of_doom Modified
circuit Modified
disk_kit Modified
donk_kit Modified
flashbang Modified
glasses Modified
handcuff Modified
implant Modified
latex Modified
light Modified
lightmixed Modified
lighttube Modified
meson Modified
mousetraps Modified
pda Modified
pillbox Modified
sechud Modified
solution_trays Modified
sterile Modified
syringe Modified
throwing_knives Modified
tracks Modified
vials Modified
ziptie Modified

Resources/Textures/Objects/Storage/medalcase.rsi

State Old New Status
closed Modified
open Modified

Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi

State Old New Status
icon Modified
icon-open Added

Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
base-b Added
magb-1 Added
magb-2 Added
magb-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
practice Modified
base-10x24 Added
base-b Added
mag10-1 Added
mag10-2 Added
mag10-3 Added
magb-1 Added
magb-2 Added
magb-3 Added
rubber-b Added
rubber Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi

State Old New Status
base Modified
incendiary Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
practice Modified
uranium Modified
base-b Added
magb-1 Added
magb-2 Added
magb-3 Added
rubber Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi

State Old New Status
base Modified
capbase Modified
incendiary Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
piercing Modified
practice Modified
uranium Modified
mag-cap-1 Removed
mag-cap-2 Removed
mag-cap-3 Removed
cap Added
rubber Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi

State Old New Status
base Modified
incendiary Modified
incendiarydisplay Modified
mag-1 Modified
mag-2 Modified
practice Modified
uranium Modified
rubber Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi

State Old New Status
base Modified
incendiary Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
practice Modified
uranium Modified
base-big Removed
mag-big-1 Removed
mag-big-2 Removed
mag-big-3 Removed
base-b Added
magb-1 Added
magb-2 Added
magb-3 Added
practice-b Added
rubber Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi

State Old New Status
base Modified
beanbag Modified
flare Modified
incendiary Modified
lethal Modified
mag-1 Modified
mag-2 Modified

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

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

Resources/Textures/Objects/Storage/donkpocket.rsi

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

Edit: diff updated after b4cd7c4

@github-actions github-actions bot added size/XL and removed size/M labels Feb 24, 2025
@PyotrIgn PyotrIgn merged commit 56bf797 into master Feb 24, 2025
11 of 12 checks passed
@PyotrIgn PyotrIgn deleted the FIX_QoL_6 branch February 24, 2025 03:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: No C# Changes: Sprites Изменение спрайтов size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant