Commit graph

26988 commits

Author SHA1 Message Date
GayBot
abf90aa88e Automatic changelog update 2024-07-16 19:14:51 +03:00
SplikZerys
56b1a49b08
New Secret Weights (#204) 2024-07-16 19:13:57 +03:00
pacable
1701311dc9
bugfix: добавил ОЦК МЩ (#205)
* у ОСЩ майндщилд

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* Revert "у ОСЩ майндщилд"

This reverts commit 595f8867cc29c5cf248d9da06c03de22ed80eae4.

* у ОЦК майндщилд

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-16 19:13:45 +03:00
pacable
ea7b989540
Удалена музыка по требованию правообладателя (#206)
* у ОСЩ майндщилд

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* Revert "у ОСЩ майндщилд"

This reverts commit 595f8867cc29c5cf248d9da06c03de22ed80eae4.

* удалил музыку qdzava

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-16 19:12:33 +03:00
VigersRay
b390abe77c Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-16 14:00:27 +03:00
Cojoke
927cf7799f
Remove uses of AllObjectives (#30077)
Remove the uses of AllObjectives
2024-07-16 10:17:18 +03:00
Simon
911a94dba9
Add missing command description to replay_toggleui (#30071) 2024-07-16 11:04:31 +10:00
PJBot
09a05955d7 Automatic changelog update 2024-07-15 19:19:40 +00:00
Winkarst
33a303236c
Make addgamerule command process only valid game rules (#29912)
* addgamerule command processes only valid rules

* Update

* English moment
2024-07-15 21:18:33 +02:00
Simon
b35539db4a
Fix some markup related obsolete warnings in research and anomaly related systems (#30072)
Fix some Markup related obsolete warnings in Research and Anomaly related systems
2024-07-15 22:14:37 +03:00
VigersRay
47b9b00b4d Merge remote-tracking branch 'origin/master' 2024-07-15 18:04:32 +03:00
VigersRay
a3e61685c8 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-15 18:04:05 +03:00
GayBot
116a0c9805 Automatic changelog update 2024-07-15 18:03:18 +03:00
pacable
da73d87ab5
фикс крио (#199)
* фикс крио

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* убрал дебаг значение

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* Update StationCryoTeleportComponent.cs

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-07-15 18:02:13 +03:00
GayBot
cd6b86b384 Automatic changelog update 2024-07-15 18:01:45 +03:00
Rinary
eb38d4b522
Небольшые изменения (#200)
* init

* remove fan recipe
2024-07-15 18:00:39 +03:00
Pieter-Jan Briers
c0593fb328
Fix invalid UI hover/click sounds breaking client (#30067)
fixes #29561
2024-07-15 16:55:05 +02:00
Pieter-Jan Briers
eb3b2ae01a
Update host key for changelog RSS (#30068) 2024-07-15 16:32:12 +02:00
pacable
91f5b3a1b2
Правила фронтира и ласта (#196)
* правила фронтира

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* Правила ласт

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-15 01:27:43 +03:00
pacable
5d796011dc
кд на баны 15 секунд (#197)
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-15 01:27:25 +03:00
pacable
31aa79a1dd
Изменение имени сервера в лобби (#198)
* кд на баны 15 секунд

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* теперь сервер в лобби можно настроить через cvar

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-15 01:26:59 +03:00
lapatison
e734013636 Translate Upstream #2414 (#2415)
(cherry picked from commit 8f7b83f7a380f256e4441bd83857182389983702)
2024-07-15 01:25:25 +03:00
Morb0
e2a8492e9e Update locale
(cherry picked from commit d937534f479b69d8ae622d43d01cc92150b2e913)
2024-07-15 01:24:45 +03:00
VigersRay
fe8edf03d4 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
2024-07-15 01:24:12 +03:00
VigersRay
5fed5ad979 Куча разного говна которое давно должно было в билде. 2024-07-15 01:22:56 +03:00
Pieter-Jan Briers
b7d3964c56
Fix AccessLevelControl breaking (#30045)
#29987 did an oopsie

This broke the ID computer, station records, and maybe some others too.
2024-07-15 00:07:48 +02:00
PJBot
17c23f11c5 Automatic changelog update 2024-07-14 15:13:31 +00:00
lzk
3b85b1e43e
make scarves eatable again (#29959) 2024-07-15 01:12:25 +10:00
deltanedas
35cd013e88
make ninja shoes magboots (#28586)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-15 01:11:40 +10:00
PJBot
f6d827f5d9 Automatic changelog update 2024-07-14 14:10:48 +00:00
CookieMasterT
b6115b672a
Add petting cyborgs (#30037)
added petting borgs, adjusted interactions
2024-07-15 00:09:41 +10:00
themias
a0052c5b09
Prevent virtual item storage and popups (#30020)
* Prevent virtual item storage and popups

* fix typo

* add comment
2024-07-15 00:08:39 +10:00
Ed
1c74ffb8e4
Ambient music rules refactor (#29921)
* refactor

* dutypo
2024-07-14 23:58:48 +10:00
osjarw
7d9653fff7
Fix HTN/NPC better plan selection (#30017)
* recording commit

* Remove debugging/recording content
2024-07-14 20:28:46 +10:00
PJBot
f90538cca7 Automatic changelog update 2024-07-14 10:28:02 +00:00
Winkarst
07535e8ecf
Clumsy proof grappling gun (#29904)
Make grappling gun clumsy proof
2024-07-14 20:26:56 +10:00
SlamBamActionman
4f479b6c85
Fix RGB toys color when worn/in-hand (#30023)
rgbeeeeeeee
2024-07-14 20:26:34 +10:00
VigersRay
c292c6e0a2 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-14 13:26:05 +03:00
lzk
919b3ac9e6
Change wristwatch meta description (#30036) 2024-07-14 20:25:57 +10:00
VigersRay
9b6a3b293c Ну типа 2024-07-14 13:25:30 +03:00
lzk
011250f35e
Fix AGhostCommand naming (#29945) 2024-07-14 20:25:18 +10:00
Winkarst
960cc806cc
Update AccessLevelControl.xaml.cs to use ISawmill (#29987)
* Update AccessLevelControl.xaml.cs to use ISawmill

* Update

* Silly me

* Update
2024-07-14 20:24:26 +10:00
VigersRay
5aaf638614 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Tools/gen_build_info.py
2024-07-14 12:24:06 +03:00
ShadowCommander
bdf7293cfb
Clean itemmapper (#29983)
* File scoped namespace

* Format file

* Fix param name in doc comment

* Reflow doc comment

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-07-14 13:27:39 +10:00
osjarw
922be64290
NPC exits MeleeOperator on invalid EntityUid (#30005)
EntityUid 0 problem fix
2024-07-14 13:26:38 +10:00
Winkarst
5d1702d280
Update MainMenu.cs to use ISawmill (#29988)
* Update MainMenu.cs to use ISawmill

* Update

* Error
2024-07-14 13:05:39 +10:00
PJBot
68982953f3 Automatic changelog update 2024-07-14 03:00:52 +00:00
Luiz Costa
87467a358b
Fix lizards losing snouts when equipping a head bandana (#29979)
* say goodbye to no-snout lizards

* remove snout from plague doctor hat HideLayerClothing component
2024-07-14 12:59:45 +10:00
github-actions[bot]
a06309b964
Update Credits (#30026)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-07-13 20:26:39 -04:00
Pieter-Jan Briers
85fba9809a
Update changelog RSS configuration (#30024)
New server
2024-07-14 01:18:12 +02:00