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

Перенос сигаретки #465

Merged
merged 19 commits into from
Oct 13, 2024
Merged

Conversation

Hyrmik
Copy link
Contributor

@Hyrmik Hyrmik commented Sep 12, 2024

Описание PR

Коммит взят отсюда --> RMC-14/RMC-14#3590

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

Для разнообразия табачной продукции и большей вариативности для развития раковых заболеваемости

Медиа

image
image

Проверки

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

Изменения

🆑

  • add: НТ установило сотрудничество с несколькими табачными корпорациями в галактике и теперь новые виды возможностей получения рака лёгких можно приобрести в ShadyCigs Делюкс! Слава НТ!
  • add: В связи с увеличением спроса на табачную продукцию, а также в рамках новой миссии ТСФ по целенаправленной борьбе с незаконными табачными плантациями, цены на табак были повышены. Слава ТСФ!!

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов Changes: Map Изменение карт No C# labels Sep 12, 2024
Copy link
Contributor

github-actions bot commented Sep 12, 2024

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

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigarettes/executive_select_cigarette.rsi

State Old New Status
burnt-icon Added
lit-equipped-MASK Added
lit-icon Added
lit-inhand-left Added
lit-inhand-right Added
unlit-equipped-MASK Added
unlit-icon Added
unlit-inhand-left Added
unlit-inhand-right Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigarettes/executive_select_packet.rsi

State Old New Status
cig1 Added
cig10 Added
cig11 Added
cig12 Added
cig13 Added
cig14 Added
cig15 Added
cig16 Added
cig17 Added
cig18 Added
cig19 Added
cig2 Added
cig20 Added
cig3 Added
cig4 Added
cig5 Added
cig6 Added
cig7 Added
cig8 Added
cig9 Added
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigarettes/lucky_sloths_cigarette.rsi

State Old New Status
burnt-icon Added
lit-equipped-MASK Added
lit-icon Added
lit-inhand-left Added
lit-inhand-right Added
unlit-equipped-MASK Added
unlit-icon Added
unlit-inhand-left Added
unlit-inhand-right Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigarettes/lucky_sloths_packet.rsi

State Old New Status
cig1 Added
cig10 Added
cig11 Added
cig12 Added
cig13 Added
cig14 Added
cig15 Added
cig16 Added
cig17 Added
cig18 Added
cig19 Added
cig2 Added
cig20 Added
cig3 Added
cig4 Added
cig5 Added
cig6 Added
cig7 Added
cig8 Added
cig9 Added
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigarettes/lucky_sloths_packet_4.rsi

State Old New Status
cig1 Added
cig2 Added
cig3 Added
cig4 Added
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigarettes/we_ya_gold_cigarette.rsi

State Old New Status
burnt-icon Added
lit-equipped-MASK Added
lit-icon Added
lit-inhand-left Added
lit-inhand-right Added
unlit-equipped-MASK Added
unlit-icon Added
unlit-inhand-left Added
unlit-inhand-right Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigarettes/we_ya_gold_packet.rsi

State Old New Status
cig1 Added
cig10 Added
cig11 Added
cig12 Added
cig13 Added
cig14 Added
cig15 Added
cig16 Added
cig17 Added
cig18 Added
cig19 Added
cig2 Added
cig20 Added
cig3 Added
cig4 Added
cig5 Added
cig6 Added
cig7 Added
cig8 Added
cig9 Added
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigars/cigar_case.rsi

State Old New Status
cig1 Added
cig2 Added
cig3 Added
cig4 Added
cig5 Added
cig6 Added
cig7 Added
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigars/tarback.rsi

State Old New Status
burnt-icon Added
lit-equipped-MASK Added
lit-icon Added
unlit-equipped-MASK Added
unlit-icon Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Cigars/tarback_box.rsi

State Old New Status
cig1 Added
cig2 Added
cig3 Added
cig4 Added
cig5 Added
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Matchboxes/brown_matchbook.rsi

State Old New Status
inhand-left Added
inhand-right Added
mpacket Added
mpacket0 Added
mpacket1 Added
mpacket2 Added
mpacket3 Added
mpacket4 Added
mpacket5 Added
mpacket6 Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Matchboxes/electro_matchbook.rsi

State Old New Status
inhand-left Added
inhand-right Added
mpacket Added
mpacket0 Added
mpacket1 Added
mpacket2 Added
mpacket3 Added
mpacket4 Added
mpacket5 Added
mpacket6 Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Matchboxes/executive_select_matchbook.rsi

State Old New Status
inhand-left Added
inhand-right Added
mpacket Added
mpacket0 Added
mpacket1 Added
mpacket2 Added
mpacket3 Added
mpacket4 Added
mpacket5 Added
mpacket6 Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Matchboxes/matchbook.rsi

State Old New Status
inhand-left Added
inhand-right Added
mpacket Added
mpacket0 Added
mpacket1 Added
mpacket2 Added
mpacket3 Added
mpacket4 Added
mpacket5 Added
mpacket6 Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Matchboxes/matchbox.rsi

State Old New Status
matchbox-open Added
matchbox Added
matchbox1 Added
matchbox2 Added
matchbox3 Added
matchbox4 Added
matchbox5 Added
matchbox6 Added

Resources/Textures/ADT/Objects/Consumable/Smokeables/Matchboxes/we_ya_matchbook.rsi

State Old New Status
inhand-left Added
inhand-right Added
mpacket Added
mpacket0 Added
mpacket1 Added
mpacket2 Added
mpacket3 Added
mpacket4 Added
mpacket5 Added
mpacket6 Added

Resources/Textures/ADT/Objects/Tools/Lighters/execzippo.rsi

State Old New Status
closed Added
lighter_flame Added
open Added

Resources/Textures/ADT/Objects/Tools/Lighters/zippo.rsi

State Old New Status
closed Added
lighter_flame Added
open Added

Edit: diff updated after a372dec

@Bolper
Copy link
Contributor

Bolper commented Sep 15, 2024

Ты конечно молодец, что черри пикнул коммит, но собсна это все нам в папку пойдет ибо изменения не такие большие, да и по мне слишком спорные текстуры

@Schrodinger71 Schrodinger71 marked this pull request as draft September 15, 2024 10:11
@github-actions github-actions bot added the Changes: Localization Изменение локализации label Sep 27, 2024
@github-actions github-actions bot removed the Changes: Map Изменение карт label Sep 28, 2024
@Hyrmik Hyrmik marked this pull request as ready for review October 12, 2024 08:14
@Hyrmik Hyrmik requested a review from Darkiich October 13, 2024 09:10
Copy link
Contributor

@Darkiich Darkiich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ревью выполнено

@Hyrmik Hyrmik added this pull request to the merge queue Oct 13, 2024
Merged via the queue into AdventureTimeSS14:master with commit 8660e4e Oct 13, 2024
15 checks passed
@Hyrmik Hyrmik deleted the avava branch October 13, 2024 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants