Cigarettes rework #1919

TryHardo7 · 2024-09-23T16:02:57Z

Создал несколько новых уникальных для некоторых отделов и не только сигарет со стилизованными пачками.
Создал новую базу для визуалайзера сигарет внутри пачки для новых пачек в перспективе 3х4 а не кабинета.
Старые остались как были, мне лень их перерисовывать и вообще я не спрайтер.

Был добавлен новый химикат - Неоникатинойд, менее вредный для гуманоидов при курении.
Этот химикат лежит в основе не-лечащих сигарет, нужен для баланса генетического урона, потому что в лечащих
сигаретах меньше вещества, а в оказывающих эффект больше.

Разделил все сигареты в игре на 2 фундаментальные базы - лечащие и оказывающие эффект, в лечащих сигаретах никотин, в оказывающих эффект - неоникатиноид.
Курение переделано так, что теперь оно заносит в организм вещества из сигарет со скоростью более близкой к скорости метаболизма, так реагенты не успевают копиться внутри куклы, но успевают усвоиться и оказать эффект.

Теперь курение вызывает рак, приблизительно 1 сигарета наносит 1-1.3 клеточного урона

Время курения сигарет до реворка и после примерно сровнял, для игрока разницы не заметно.

Добавил локализацию для всех сигарет.
Добавил новые сигареты, посвященные отделам в вендоры соответствующих отделов.

Никотин в шлёпских сигаретах заменён на неоникатинойд, чтобы шлёпстеры поменьше травились.

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

🆑 Lancevrot

add: Добавлены новые виды сигарет!
add: Курение вызывает рак! Ура!
tweak: Старым сигаретам добавлены новые эффекты!
fix: Исправлено - эффекты химии в сигаретах не срабатывали при курении!

github-actions · 2024-09-23T16:03:13Z

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

github-actions · 2024-09-23T16:03:41Z

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

Resources/Textures/SS220/Objects/Consumable/Smokeables/Cigaretts/Packs/AVD.rsi

State	Old	New	Status
closed			Added
inhand-left			Added
inhand-right			Added
open			Added

Resources/Textures/SS220/Objects/Consumable/Smokeables/Cigaretts/Packs/ENG.rsi

State	Old	New	Status
closed			Added
inhand-left			Added
inhand-right			Added
open			Added

Resources/Textures/SS220/Objects/Consumable/Smokeables/Cigaretts/Packs/MED.rsi

State	Old	New	Status
closed			Added
inhand-left			Added
inhand-right			Added
open			Added

Resources/Textures/SS220/Objects/Consumable/Smokeables/Cigaretts/Packs/RnD.rsi

State	Old	New	Status
closed			Added
inhand-left			Added
inhand-right			Added
open			Added

Resources/Textures/SS220/Objects/Consumable/Smokeables/Cigaretts/Packs/SEC.rsi

State	Old	New	Status
closed			Added
inhand-left			Added
inhand-right			Added
open			Added

Resources/Textures/SS220/Objects/Consumable/Smokeables/Cigaretts/Packs/WEH.rsi

State	Old	New	Status
closed			Added
inhand-left			Added
inhand-right			Added
open			Added

Resources/Textures/SS220/Objects/Consumable/Smokeables/Cigaretts/Packs/visualizer.rsi

State	Old	New	Status
1			Added
10			Added
2			Added
3			Added
4			Added
5			Added
6			Added
7			Added
8			Added
9			Added

Edit: diff updated after 09f7e91

gogenych

Всё гуд. Спрайты бы Кемрану показать

github-actions · 2024-09-23T16:17:35Z

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

Ady4ik

Посмотрел только поверхностно, увынск

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/SS220Cigarettes/cartons.yml

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/SS220Cigarettes/cigarette.yml

Resources/Locale/en-US/reagents/meta/narcotics.ftl

Resources/Locale/ru-RU/reagents/meta/narcotics.ftl

Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml

Co-authored-by: Ady4ik <[email protected]>

…220Cigarettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

…220Cigarettes/cartons.yml Co-authored-by: Ady4ik <[email protected]>

…220Cigarettes/packs.yml Co-authored-by: Ady4ik <[email protected]>

Co-authored-by: Ady4ik <[email protected]>

added comments

TryHardo7 · 2024-09-23T20:27:11Z

Комментарии в код добавил, но надо спрайты получше сделать, пока к мержу не готово

EstKemran · 2024-09-28T22:10:47Z

Пройдены все круги ревьюверского ада, перерисовал все спрайты, удалил блоки за ненадобностью, сделал новый визуализатор сигарет внутри пачки, под новые спрайты. Новые пачки (на серую не обращайте внимания, её нет в файлах):

Добавь эту картинку в описание ПРа

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml

...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/SS220Cigaretts/Packs/MED.rsi/meta.json

...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/SS220Cigaretts/Packs/RnD.rsi/meta.json

...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/SS220Cigaretts/Packs/SEC.rsi/meta.json

...ces/Textures/Objects/Consumable/Smokeables/Cigarettes/SS220Cigaretts/Packs/WEH.rsi/meta.json

...tures/Objects/Consumable/Smokeables/Cigarettes/SS220Cigaretts/Packs/visualizer.rsi/meta.json

…on-14 into Cigarettes

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml

Resources/Prototypes/Reagents/narcotics.yml

…se_smokeables.yml

Ady4ik

after requested changes rfm

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

DexlerXD · 2024-10-01T15:53:22Z

чекам всё ещё плохо...

Resources/Prototypes/SS220/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml

…les/Cigarettes/packs.yml Co-authored-by: Ady4ik <[email protected]>

Cigrettes rework

f246d67

github-actions bot added the Merge Conflict Some content has conflicts. label Sep 23, 2024

gogenych approved these changes Sep 23, 2024

View reviewed changes

github-actions bot added the Merge Conflict Some content has conflicts. label Sep 23, 2024

DexlerXD requested a review from EstKemran September 23, 2024 19:04

github-actions bot added the Status: Needs Review label Sep 23, 2024

Ady4ik requested changes Sep 23, 2024

View reviewed changes

TryHardo7 and others added 12 commits September 23, 2024 22:59

Update Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml

13e639a

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml

e188418

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Locale/ru-RU/reagents/meta/narcotics.ftl

b5ea53f

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Locale/ru-RU/reagents/meta/narcotics.ftl

4a30d60

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

0e4d8ef

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/SS…

d96902f

…220Cigarettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/SS…

484e5c5

…220Cigarettes/cartons.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/SS…

3e320ac

…220Cigarettes/packs.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Reagents/narcotics.yml

73f582f

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Reagents/narcotics.yml

7e09c90

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

8294e7b

Co-authored-by: Ady4ik <[email protected]>

Update packs.yml

9361142

added comments

Ady4ik changed the title ~~Cigrettes rework~~ [DNM] Cigrettes rework Sep 24, 2024

Updated all sprites and visualizer

e1caf05

TryHardo7 changed the title ~~[DNM] Cigrettes rework~~ Cigarettes rework Sep 28, 2024

TryHardo7 added 2 commits September 29, 2024 01:00

hotfix sprites

2c56a4f

hotfix sprite

85161d9

EstKemran approved these changes Sep 28, 2024

View reviewed changes

Merge branch 'master' into Cigarettes

fa2755f

github-actions bot removed the Merge Conflict Some content has conflicts. label Sep 29, 2024

DexlerXD suggested changes Sep 29, 2024

View reviewed changes

TryHardo7 added 3 commits September 29, 2024 13:30

changed some directories, added comments

1633857

Merge branch 'Cigarettes' of https://github.com/TryHardo7/space-stati…

38479e9

…on-14 into Cigarettes

path fix

99f6427

DexlerXD approved these changes Sep 29, 2024

View reviewed changes

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml Outdated Show resolved Hide resolved

Resources/Prototypes/Reagents/narcotics.yml Outdated Show resolved Hide resolved

DexlerXD added 2 commits September 29, 2024 14:17

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/ba…

46a5a68

…se_smokeables.yml

Update Resources/Prototypes/Reagents/narcotics.yml

e716d9d

Ady4ik requested changes Oct 1, 2024

View reviewed changes

TryHardo7 and others added 9 commits October 1, 2024 15:44

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

c9a6422

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

93f73a4

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

edb445f

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

76e96d2

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

c8f125a

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

54f09e6

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

7b01b53

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

1aa43f9

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Ci…

0524d53

…garettes/cigarette.yml Co-authored-by: Ady4ik <[email protected]>

Ady4ik self-requested a review October 1, 2024 14:16

Ady4ik approved these changes Oct 1, 2024

View reviewed changes

Ady4ik requested changes Oct 2, 2024

View reviewed changes

Resources/Prototypes/SS220/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml Outdated Show resolved Hide resolved

Update Resources/Prototypes/SS220/Entities/Objects/Consumable/Smokeab…

09f7e91

…les/Cigarettes/packs.yml Co-authored-by: Ady4ik <[email protected]>

Ady4ik approved these changes Oct 2, 2024

View reviewed changes

Ady4ik merged commit e9c55d1 into SerbiaStrong-220:master Oct 2, 2024
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cigarettes rework #1919

Cigarettes rework #1919

TryHardo7 commented Sep 23, 2024 •

edited

Loading

github-actions bot commented Sep 23, 2024

github-actions bot commented Sep 23, 2024 •

edited

Loading

gogenych left a comment

github-actions bot commented Sep 23, 2024

Ady4ik left a comment

TryHardo7 commented Sep 23, 2024

EstKemran commented Sep 28, 2024

Ady4ik left a comment

DexlerXD commented Oct 1, 2024

Cigarettes rework #1919

Cigarettes rework #1919

Conversation

TryHardo7 commented Sep 23, 2024 • edited Loading

github-actions bot commented Sep 23, 2024

github-actions bot commented Sep 23, 2024 • edited Loading

gogenych left a comment

Choose a reason for hiding this comment

github-actions bot commented Sep 23, 2024

Ady4ik left a comment

Choose a reason for hiding this comment

TryHardo7 commented Sep 23, 2024

EstKemran commented Sep 28, 2024

Ady4ik left a comment

Choose a reason for hiding this comment

DexlerXD commented Oct 1, 2024

TryHardo7 commented Sep 23, 2024 •

edited

Loading

github-actions bot commented Sep 23, 2024 •

edited

Loading