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

Ремап карт под парикмахера + автоматы для миграции #262

Merged
merged 5 commits into from
Jul 31, 2024
Merged

Ремап карт под парикмахера + автоматы для миграции #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
badea5d
Added vending machines for migration
SplikZerys Jul 29, 2024
00dee2c
Full remap Delta Station
SplikZerys Jul 29, 2024
c429077
Box remap
SplikZerys Jul 29, 2024
eafb10a
Remap: box, delta, fland, marathon and origin
SplikZerys Jul 30, 2024
8e831d3
migration for trash
SplikZerys Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,7 @@ ent-VendingMachineChemicals = ХимкоМат
.desc = Вероятно, не кофемашина.
ent-VendingMachineChemicalsSyndicate = СиндиСоки
.desc = Надеюсь, не из свежевыжатых синдикатовцев?
ent-VendingMachineCoffeeMigrateUnderwear = Лучшие горячие напитки Солнечной
.desc = Подаются кипящими, чтобы оставались горячими всю смену!
ent-VendingMachineDonutMigrateKinko = Monkin' Donuts
.desc = Автомат пончиков, предоставленный компанией Robust Industries, LLC.
9,445 changes: 4,630 additions & 4,815 deletions Resources/Maps/_Sunrise/Station/box.yml
View file
Open in desktop

Large diffs are not rendered by default.

23,718 changes: 11,377 additions & 12,341 deletions Resources/Maps/_Sunrise/Station/delta.yml
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading