Commit graph

16649 commits

Author SHA1 Message Date
VigersRay
49a32e89bc фикс локалей некоторых предметов 2024-06-04 21:47:58 +03:00
VigersRay
381562a0f4 фиксы апстрима 2024-06-04 11:16:43 +03:00
VigersRay
5bf387e89c Merge remote-tracking branch 'origin/master' 2024-06-04 10:59:26 +03:00
VigersRay
1ef40d67f5 fix attributions.yml 2024-06-04 10:59:06 +03:00
Odleer
d92c3e240b
Респрайт тайлов и декалей (#11)
* resprte tiles and decals

* resprte tiles and decals

* resprte tiles and decals
2024-06-04 10:56:26 +03:00
SplikZerys
e944b32795
Updated station-goal-component.ftl (#9) 2024-06-04 10:56:02 +03:00
AL-S?
ca60f708ea
Изменил лого (#12)
* Add files via upload

* logo-ru

* Add files via upload

* logo

---------

Co-authored-by: Al-ss <99600368+gghj31621@users.noreply.github.com>
2024-06-04 10:04:19 +03:00
Vigers Ray
e0566ffa3e
Хаб серверов (#13)
* Хаб серверов внутри игры

* чейнжлог
2024-06-04 10:03:48 +03:00
Vigers Ray
c47264dfdb
Экраны времени ожидания для шаттла прибытия. (#14)
* Add ArrivalsShuttleTimer to sunrise arrivals shuttle

* чейнжлог
2024-06-04 10:02:35 +03:00
Morb0
de7c38bccb Update locale
(cherry picked from commit 29bd9967f75d665fd9a0e3e1eb301cf65c61de73)
2024-06-04 09:55:29 +03:00
VigersRay
55060929c7 фиксы апстрима 2024-06-04 09:54:56 +03:00
VigersRay
5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
Tayrtahn
9d2b4ed3b2
Add an integration test for solution fill level sprites. (#28564) 2024-06-04 10:23:43 +10:00
deltanedas
16b3fb1204
LoadMapRule grid storage rework (#28210)
*
2024-06-03 20:04:19 -04:00
Mr. 27
7d22897d02
Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605)
*
2024-06-03 19:52:15 -04:00
Verm
2ae5c953de
Humans can no longer honk on command (#28566)
* Humans can no longer honk on command

* Undo change it emote file

* I hate tabs

* Some comments
2024-06-04 01:45:00 +02:00
Velcroboy
98ab251f92
Remove duplicate entities (#28561) 2024-06-03 16:55:43 -04:00
PJBot
b1c123efae Automatic changelog update 2024-06-03 18:49:52 +00:00
RenQ
3e2eb6cc7a
"Death gasp" for a moth (#28409) 2024-06-03 14:48:01 -04:00
Ed
a4d1601758
Accent trait limit (#28046) 2024-06-03 14:47:06 -04:00
Tayrtahn
ee8224bce2
Tip 51 does not exist (#28555) 2024-06-03 12:59:59 -04:00
Tayrtahn
b5e8a69622
Add a test for sliceable cargo bounty exploits (#28357) 2024-06-03 12:24:32 -04:00
PJBot
1e04b3c9f4 Automatic changelog update 2024-06-03 16:13:28 +00:00
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs (#28270) 2024-06-03 12:12:21 -04:00
lzk
87ffbab461
Remove locale related changelog (#28547) 2024-06-03 09:37:30 -04:00
deltanedas
8d78b7442a
make objectives use entityCategory (#28269) 2024-06-03 09:23:52 -04:00
PJBot
33d963a149 Automatic changelog update 2024-06-03 13:05:14 +00:00
Cojoke
e784f2cf3c
Make projectiles not hit crates unless clicked on (#28072) 2024-06-03 09:04:07 -04:00
deltanedas
977bd5ad6d
make GameRule use entity category (#28294) 2024-06-03 08:39:25 -04:00
PJBot
f8f55dea1e Automatic changelog update 2024-06-03 12:11:31 +00:00
Cojoke
a0b49116be
Adds Chat Triggers to the Gasp Emote (#28466) 2024-06-03 08:10:24 -04:00
PJBot
64ff99231a Automatic changelog update 2024-06-03 12:06:20 +00:00
Cojoke
eb026c9b5b
Gives Medibots Random Lines(not a good title) (#28543) 2024-06-03 08:05:14 -04:00
PJBot
ba5af33ee4 Automatic changelog update 2024-06-03 11:55:38 +00:00
Verm
36396e3f86
Changes SyndiCat spawner to a radio (#28492) 2024-06-03 07:54:32 -04:00
PJBot
39481fb2b0 Automatic changelog update 2024-06-03 03:34:36 +00:00
AJCM-git
be35a5d369
Header of Gas tank UI screen now fetched from Entity name and local (#28545) 2024-06-02 23:33:30 -04:00
PJBot
42217079b7 Automatic changelog update 2024-06-03 03:31:08 +00:00
PJBot
0a8167f055 Automatic changelog update 2024-06-03 03:30:03 +00:00
Verm
31eb3ed62c
Welding tweaks (#27959) 2024-06-02 23:28:53 -04:00
AJCM-git
509e3aedf7
RespawnRuleSystem tweaks. (#28528) 2024-06-02 23:28:38 -04:00
PJBot
7ecff3e699 Automatic changelog update 2024-06-03 02:19:55 +00:00
Whisper
9dbdacda95
Rename admin cloak to weh cloak (#28540) 2024-06-02 19:18:49 -07:00
Pieter-Jan Briers
307a0428c7
Shut up a child throwing a tantrum (#28538) 2024-06-03 03:05:18 +02:00
PJBot
947ed7bb22 Automatic changelog update 2024-06-02 23:52:25 +00:00
Voomra
504208c665
fix: localize PraySystem UI (#28535)
tweak: localize PraySystem UI
2024-06-02 16:51:19 -07:00
Killerqu00
4eadbbc39d
fix typos in bonfire descriptions (#28515)
* fix typo

* a
2024-06-02 15:40:02 -04:00
PJBot
054118757b Automatic changelog update 2024-06-02 17:31:33 +00:00
PJBot
6b40b5269e Automatic changelog update 2024-06-02 16:53:47 +00:00
Leon Friedrich
16be126ca1
Remove noSpawn: true from action entity prototypes (#28508) 2024-06-02 01:11:48 -07:00