Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,488 Commits 1 Branch 0 Tags
master
Commit Graph

12 Commits

Author SHA1 Message Date
BIGZi0348
d13428d35a Merge remote-tracking branch 'WD-core/master' into upstream-core 2025-03-16 22:42:21 +03:00
BIGZi0348
670917881b Настенная консоль 2025-03-12 22:39:49 +03:00
Jabak
5dbbf68af8 Merge remote-tracking branch 'upstream/master' 2024-07-26 23:28:33 +03:00
ThereDrD0
85b86f2026 Revert gersoon (#502) 
* Revert "Изменено"

This reverts commit 985048acc6.

* fix naser
 2024-07-26 22:06:15 +03:00
Jabak
53e4d2bfe5 Merge remote-tracking branch 'upstream/master' into ups 2024-07-26 21:32:42 +03:00
Gersoon
985048acc6 Изменено 
Тайлы, декали, спрайты
Добавлено
Ебаные горршки и всё ыыа
 2024-07-26 18:38:36 +02:00
Cinka
7b953074ec - add: kink vending machine 
(cherry picked from commit de7753940ac8050a42c5ba0300532ae964224de4)
 2024-02-16 13:42:30 +03:00
Remuchi
64903d1403 [FEAT] Всякие прикольные разности и вкусности (#554) 
* feat: трикодер

* feat: принтер документов

* fix: текст фелинидов

* feat: возможность менять голос эмоутов

* feat: мяукаем при аспекте мяуканья

* feat: ПНВ

* fix: забирай свои метадаты

* fix: oopsies

* fix: линтер снова

* fix: пожалуйста линтер отстань
# Conflicts:
#	Content.Server/Speech/Components/VocalComponent.cs
#	Content.Server/White/AspectsSystem/Aspects/CatEarsAspect.cs
#	Resources/Prototypes/Catalog/Fills/Items/belt.yml
#	Resources/Prototypes/Reagents/Materials/materials.yml
#	Resources/Prototypes/White/Catalog/seniors_fills.yml
#	Resources/Prototypes/White/Catalog/uplink.yml
#	Resources/Prototypes/White/Recipes/lathe_recipes.yml
#	Resources/Prototypes/White/Research/experimental.yml
 2024-01-26 16:44:16 +07:00
Remuchi
09346f8805 feat: настенные консольки (#505) 2024-01-25 11:13:14 +03:00
Aviu00
16c8b95da4 Economy (#403) 
* nasrano

* Add station budget & salary

* Initial balance

* Vending machine UI

* Pricing for vending machines

* Finish economy

* Eftpos

* Finish eftpos

* Put eftpos into lockers

* Vending machine prices

* Small fixes

* Fix atm UI

* Add atms to maps

* fix

* reset

* Add PDA program

* Maps again

---------

Co-authored-by: Mona Hmiza <>
Co-authored-by: rhailrake <49613070+rhailrake@users.noreply.github.com>
 2024-01-24 13:04:22 +03:00
Cinkafox
28bbd8db89 Merge pull request #305 from frosty-dev/ERT-ERP 
Ert erp
 2024-01-20 14:44:21 +03:00
RavMorgan
5f51cb81de [Feat] War crime console (#144) 
* ADD: Icons, New component. Надо будет рефакторнуть худы в одну систему

* Some govno ebanoe

* ui

* Some govno

* UI and UI lol

* Dermo again

* ы

* Добавлена система консоли. Надо добавить манипуляцию с рекордами и сохранение крим. записей на сервер. Я пометил в туду

* Added functional for Criminal Records UI

* Дропаю это говно

* Рабочая версия крим консоли

* Fuull functional

* Added radio

* Arrest info feature

* improve ui

* another names

* New texturem Sprite viewer

* fix small names

* Added login menu

* Final fix.

* ох

* Убрал логгеры

* fix Comments and Access to proto

* moved dummy code, removed qustyions

* added disposer() when window was close

* Small fixes

* Removed comments. Added DNA check for CriminalityHud

* Small lol

---------

Co-authored-by: DocNITE <docnite0530@gmail.com>
 2024-01-19 11:09:18 +03:00