Commit graph

37659 commits

Author SHA1 Message Date
Vigers Ray
813474d178 какашечки 2025-08-18 17:25:20 +03:00
Vigers Ray
4d05c58f09 фиксы говняшек 2025-08-18 05:33:02 +03:00
Vigers Ray
66b9322dd8 увы 2025-08-18 03:39:05 +03:00
Vigers Ray
fe462f3fa6 упс 2025-08-18 03:26:41 +03:00
Vigers Ray
90dc2facb5 Merge branch 'stable' 2025-08-18 03:15:46 +03:00
Vigers Ray
fee12c1488 зобыл 2025-08-18 03:15:06 +03:00
Vigers Ray
97f199f5bc зобыл 2025-08-18 03:05:09 +03:00
Vigers Ray
24f224ef50 egc 2025-08-18 01:57:00 +03:00
Vigers Ray
c440db7d57 упс 2025-08-18 01:37:55 +03:00
Sunrise-Bot
f1ae46fc93 Automatic changelog update 2025-08-18 01:30:29 +03:00
iertis
1a62c50d57
Великий фикс апстрима (#2821)
Co-authored-by: Matthew Herber <32679887+Happyrobot33@users.noreply.github.com>
2025-08-18 01:28:45 +03:00
Vigers Ray
305718810a Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Resources/Maps/_Sunrise/Station/oasis.yml
#	Resources/Maps/_Sunrise/Station/packed.yml
#	Resources/Maps/_Sunrise/Station/plasma.yml
#	Resources/Maps/_Sunrise/event/void.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json
#	Resources/migration.yml
2025-08-18 01:18:36 +03:00
Vigers Ray
82b6d63652 какашечки 2025-08-18 01:15:59 +03:00
Myra
dc86665c24
Stable (#39712) 2025-08-17 23:39:23 +02:00
Sunrise-Bot
5d19dfa77c Automatic changelog update 2025-08-18 00:27:16 +03:00
ReWAFFlution
516d74c081
Переделал броню СБ (#2809) 2025-08-18 00:25:32 +03:00
Errant
cced1b9a50
unbreak StandingStateSystem 2025-08-17 23:23:37 +02:00
IProduceWidgets
81aef0fb1c
update oasis -- AI rework (#39592) 2025-08-17 14:13:57 -07:00
Errant
7abb022b64
Merge branch 'staging' into stable 2025-08-17 22:53:52 +02:00
Tayrtahn
8034cabbae
Fix error when deleting a toggled ToggleableClothingComponent (#39191) 2025-08-17 12:34:47 -07:00
PJBot
79072d7d6a Automatic changelog update 2025-08-17 19:31:47 +00:00
Velcroboy
02f37a8eec
Allow hamster cages to sit on tables (#37953)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2025-08-17 12:30:40 -07:00
PJBot
af8295413b Automatic changelog update 2025-08-17 19:26:38 +00:00
August Sun
3d35435747
Allows disabler, practice disabler, disabler SMG, and practice laser rifle to be used by pacifists (#37164)
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
2025-08-17 12:25:31 -07:00
Hannah Giovanna Dawson
26badb7914
Update OpenTK to latest (#39227)
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-08-17 21:24:42 +02:00
ArtisticRoomba
497a5956a0
fix cl (#39706) 2025-08-17 12:18:16 -07:00
K-Dynamic
5630bf6bde
Removes duplicate CE and paramedic jumpsuits (#39520) 2025-08-17 12:15:38 -07:00
ruddygreat
d58ef22d62
Make diagonal grilles transparent (#39580)
* tiny fix

* also fix the window bug

---------

Co-authored-by: ruddygreat <ruddygreat1@gmail.com>
2025-08-17 12:09:15 -07:00
PJBot
9f83cc7671 Automatic changelog update 2025-08-17 19:01:57 +00:00
Nox
8e34228309
Packed Station - North East Overhaul (#38339)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-08-17 12:00:48 -07:00
PJBot
367156fba3 Automatic changelog update 2025-08-17 18:52:10 +00:00
Stefano Pigozzi
514c28137c
Fix typo and make capitalization consistent in fax names (#39455) 2025-08-17 11:50:57 -07:00
Odleer
352f5466bc
Бокс возращение в пулл (#2830)
Co-authored-by: Odleer <odlieerr@gmail.com>
2025-08-17 21:45:08 +03:00
Vigers Ray
a7d42367b6 фикс гост ролей в лобби 2025-08-17 21:25:00 +03:00
Vigers Ray
d0eb333620 скрыл топ контрибюторов если авторизация отключена 2025-08-17 21:15:50 +03:00
Vigers Ray
978d665ba7 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
2025-08-17 19:23:27 +03:00
Sunrise-Bot
d5ea557c50 Automatic changelog update 2025-08-17 19:20:21 +03:00
Ligyb
13e3a5b12c
попытки пофиксить ужасы (#2801) 2025-08-17 19:19:29 +03:00
banumbas
fdef4e8c3b
Убрал пацифизм вору и добавил ему термалы в инженерный набор. (#2826) 2025-08-17 19:18:36 +03:00
ThereDrD
7015894836
Обновление локализации (#2812) 2025-08-17 19:18:10 +03:00
Vigers Ray
78dcbd80fe лазерка борга с режимами 2025-08-17 19:13:29 +03:00
Tayrtahn
5ea928863f
Cleanup warnings in ChatSystem (#36773)
* Cleanup warnings in ChatSystem

* fix after merge

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-08-17 08:39:23 -04:00
github-actions[bot]
5bf44ea033
Update Credits (#39697)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2025-08-17 03:14:28 +02:00
PJBot
1b16a83748 Automatic changelog update 2025-08-16 23:05:19 +00:00
youtissoum
01f4f0cf14
Increase the bananium horn use delay (#39674)
Increase bananium horn use delay to 3 seconds
2025-08-17 01:04:12 +02:00
ViolentMonk
6e8260cf3f
Trigger for OnInteractUsing (#39692)
* Add trigger for InteractOnUsing

* Add blacklist and targetUsed fields

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnInteractUsingComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-16 23:57:16 +02:00
Zeneganto
201bc6cc5c
Swap ExudeGasses and ConsumeGasses (#39688)
Uh, um
2025-08-16 23:01:04 +02:00
slarticodefast
bd05e10a2e
Merge staging into master (#39694) 2025-08-16 22:14:14 +02:00
slarticodefast
85158a3d48
Fix industrial reagent grinder bug, second attempt (#39690)
* fix recycler 3

* Update Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
2025-08-16 21:54:15 +02:00
ScarKy0
529d7ff292
Predict MessyDrinker (#39660)
init
2025-08-16 17:03:50 +02:00