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 |
|
BIGZi0348
|
79852fa0ff
|
Merge remote-tracking branch 'WD-core/master' into upstream-core
|
2025-03-10 23:47:36 +03:00 |
|
keslik
|
2533b2c82f
|
picture
|
2025-03-08 22:37:13 +03:00 |
|
BIGZi0348
|
3418bfe6d7
|
Merge remote-tracking branch 'WD-core/master' into upstream-core
|
2025-03-05 23:14:23 +03:00 |
|
BIGZi0348
|
23584d4487
|
Добавки
|
2025-03-05 20:36:46 +03:00 |
|
BIGZi0348
|
8c61524ce6
|
Merge remote-tracking branch 'WD-core/master' into upstream-core
|
2025-01-09 00:50:52 +03:00 |
|
BIGZi0348
|
f0aed97268
|
Pot (#868)
|
2025-01-08 22:42:40 +03:00 |
|
Hero010h
|
2f12d60109
|
Merge branch 'Pot' of https://github.com/frosty-dev/ss14-core into Pot
|
2025-01-08 01:04:06 +03:00 |
|
Hero010h
|
634f83e08d
|
Обновление спрайта самодельной грядки
|
2025-01-08 00:39:13 +03:00 |
|
BIGZi0348
|
b5f012e210
|
Правки
|
2025-01-02 20:18:55 +03:00 |
|
Hero010h
|
c8ba8e6edf
|
Спрайт земли готов
|
2025-01-01 23:47:36 +03:00 |
|
BIGZi0348
|
44175ce102
|
Merge remote-tracking branch 'WD-core/master' into upstream-core
|
2024-12-29 18:29:29 +03:00 |
|
Hero010h
|
5aefcb95bf
|
Правки
|
2024-12-29 16:19:04 +03:00 |
|
BIGZi0348
|
1907ecc399
|
Loudspeaker
|
2024-12-29 16:00:55 +03:00 |
|
BIGZi0348
|
14aa691a38
|
Merge remote-tracking branch 'WD-core/master' into upstream-core
|
2024-12-27 00:21:35 +03:00 |
|
Hero010h
|
ed1a7340b7
|
Добавлены прототипы пустых ящиков
|
2024-12-25 00:14:34 +03:00 |
|
Hero010h
|
4be980ed54
|
Попытка создать новые шкафчики
|
2024-12-24 23:42:08 +03:00 |
|
BIGZi0348
|
b89aeb3879
|
Merge remote-tracking branch 'WD-core/master' into upstream-core
|
2024-12-22 00:04:31 +03:00 |
|
BIGZi0348
|
4b078f50ad
|
Гирлянды
|
2024-12-21 14:19:09 +03:00 |
|
BIGZi0348
|
ee4a258450
|
Merge remote-tracking branch 'WD-core/master' into upstream-6
|
2024-12-02 00:11:52 +03:00 |
|
BIGZi0348
|
425f91b201
|
Мясной крюк
|
2024-12-01 18:49:29 +03:00 |
|
Jabak
|
b09f28657f
|
Merge remote-tracking branch 'upstream/master' into ups
|
2024-09-29 13:08:38 +03:00 |
|
BIGZi0348
|
3babdb2a69
|
Починка спрайта деревянного стола и иконки в меню кравта (#709)
* Awawawa
* I hecking love Prettier
|
2024-09-26 23:07:30 +03:00 |
|
Jabak
|
26cd9ad80c
|
Merge remote-tracking branch 'upstream/master' into ups
|
2024-08-01 11:20:57 +03:00 |
|
ThereDrD0
|
ae4b7834b7
|
Респрайт всего связанного с клоуном (#529)
* resprite all clown stuff
* commit 2
|
2024-08-01 08:42:28 +03:00 |
|
Jabak
|
decd47769b
|
Merge remote-tracking branch 'upstream/master'
|
2024-07-28 15:08:05 +03:00 |
|
PuroSlavKing
|
a1f562d181
|
[Feature] Wide Glass Airlocks (#504)
* [Feature] Double Airlock
* up1
* [Feature] Threeple Airlock
|
2024-07-27 18:46:53 +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
|
2e0704bb13
|
Изменено (#500)
Ээээааа. Я не туда насрал
|
2024-07-26 19:40:56 +03:00 |
|
Gersoon
|
985048acc6
|
Изменено
Тайлы, декали, спрайты
Добавлено
Ебаные горршки и всё ыыа
|
2024-07-26 18:38:36 +02:00 |
|
Jabak
|
06405f8c62
|
Merge remote-tracking branch 'upstream/master' into ups
|
2024-07-20 18:45:46 +03:00 |
|
ThereDrD0
|
0dff5a3f79
|
Респрайты канистр и плащей Капитана, СЕ и РД (#469)
* canisters resprite
* captain, research director and chief engineer cloaks resprite
|
2024-07-20 05:32:31 +03:00 |
|
Aviu00
|
7f1825b713
|
Фиксы (#314)
* - fix: Fix surplus discount.
* - fix: Fix clumsy bolt barrage.
* - fix: Bookshelf fix error.
* - fix: Fix lying.
* - add: Monkeys can lie down.
* Revert "- fix: Fix surplus discount."
This reverts commit b89f9dc75fa7908198cfe054a7623d4effbe63d6.
* - remove: No shuttle wall reflect.
|
2024-05-30 15:12:24 +03:00 |
|
Jabkas
|
8a176945bd
|
- fixsprite: BookShelf
|
2024-04-15 00:34:23 +03:00 |
|
Aviu00
|
d2ea0bf4ed
|
Merge remote-tracking branch 'upstream/master' into ups
|
2024-04-08 12:54:38 +03:00 |
|
ThereDrD0
|
2ba2612c4e
|
Респрайты (#235)
* add: experimental stunbaton resprite.
* add: galoshes resprite
* add: sofa resprite
* fix: outer grey sofa
* fix: experimental stunbaton sprite
|
2024-03-24 12:04:31 +03:00 |
|
|
|
2d24788571
|
Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts:
# Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs
# Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml
|
2024-03-17 15:51:30 +03:00 |
|
Puro
|
ae5125144f
|
[Sprite] AME + Solar panels (#189)
|
2024-03-14 20:19:34 +03:00 |
|
|
|
614318c0f2
|
Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts:
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
|
2024-03-02 16:39:39 +03:00 |
|
ThereDrD0
|
6c242fabf9
|
add: wooden doshasprites (#136)
|
2024-02-28 14:00:28 +00:00 |
|
|
|
7b953074ec
|
- add: kink vending machine
(cherry picked from commit de7753940ac8050a42c5ba0300532ae964224de4)
|
2024-02-16 13:42:30 +03:00 |
|
Remuchi
|
a085815fc5
|
[Tweak] Бумажная работа и фикс крафта пнв. (#560)
* fix: персонал станции вспомнил как делать пнв
* feat: заказ бумаги в карго
* feat: бумажная дверь
# Conflicts:
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/White/Recipes/lathe_recipes.yml
|
2024-01-26 16:51:25 +07: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 |
|
Remuchi
|
6d20951c5d
|
feat: Перенос суперматерии
|
2024-01-22 18:32:33 +07:00 |
|
Cinkafox
|
28bbd8db89
|
Merge pull request #305 from frosty-dev/ERT-ERP
Ert erp
|
2024-01-20 14:44:21 +03:00 |
|
