18228 Commits

Author SHA1 Message Date
Nairod
67f4802fe4 Service and External Cadet Access (#25784) 2024-03-03 11:29:59 +11:00
MACMAN2003
862ab5ca9f Cleanup chairs.yml (#25682)
cleanup chairs.yml

not sure if i did this correctly
2024-03-03 03:06:15 +03:00
PJBot
b412ad47cf Automatic changelog update 2024-03-02 23:58:47 +00:00
exincore
c8cc806a8f feat(inventory): Add secondary smart-equip star (#25696)
* feat(inventory): Add secondary quick-remove star

* style: Fix end of file newline

* feat(inventory): Change secondary smart-equip star to silver star

* feat(inventory): Decrease secondary quick-equip star luminosity to better match the primary
2024-03-02 18:57:42 -05:00
PJBot
10cf94859b Automatic changelog update 2024-03-02 20:41:10 +00:00
lapatison
4f7facbd73 Small news manager localisation (#25718)
* loc

* per review

* Update Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-03-02 21:39:29 +01:00
Brandon Hu
bc2dee9f70 fix(seizures): remove seizures from the game (#25722)
* fix(seizures): remove seizures from the game

* Reduced animation time to 2 seconds
2024-03-02 15:17:46 -05:00
deltanedas
7f060eb129 make thief a subgamemode (#25740)
* add SubGamemodes comp/sys

* remove RuleChance from thief rule

* use SubGamemodes for adding thief rule instead of adding ThiefRule component to random gamemodes

* clean up thief rule prototype

* add better logging + end rule if it fails to start

* march 1st incident

* preset ops

* the dreaded

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-02 11:33:24 -05:00
ffaa0c6815 Merge remote-tracking branch 'upstream/master' into upstream 2024-03-02 18:40:57 +03:00
b768af5485 - fix: tajaran and vulp sprite fix 2024-03-02 17:27:51 +03:00
PJBot
709881f912 Automatic changelog update 2024-03-02 14:24:05 +00:00
Waylon Cude
2e60d3300b Make the MRE wrapper count as trash (#25760)
This is a trash item for the most part, and should get picked up by the
janitor's trash bag
2024-03-03 01:23:00 +11:00
RavmorganButOnCocaine
e185a5d7b4 Automatic changelog update 2024-03-02 14:18:55 +00:00
Remuchi
477dedc014 [Feat] Mindslave - имплант подчинения (#152)
* tweak: стандартизация названий имплантеров

* add: mindslave implant

* add: briefing, uplink listing, overlay icons

* add: new mindslave overlay icons by JustNemo

* remove: ненужный файлик удалён

* fix: фикс доставания импланта подчинения
2024-03-02 21:17:52 +07:00
RavmorganButOnCocaine
ba1384faff Automatic changelog update 2024-03-02 14:17:29 +00:00
Remuchi
ad525c86c6 [Fix] Разные фиксы (#161)
* fix: фикс отображений в ахелпе

* fix: нотисы в чат больше не отправляют сообщение в консоль

* fix: исправлена текстура секретной двери

* fix: ошибки перевода при вылизывании ран
2024-03-02 21:16:27 +07:00
PJBot
6476b623d0 Automatic changelog update 2024-03-02 14:08:11 +00:00
Errant
ecd2d5a644 Alerts for breathing plasma/tritium (#24484)
* Alert autoremove v0

* Code cleanup and timing

* comment

* Tritium, code compression

* not resolving manually

* reduced lookups, new comp

* fix-fix yes

* use RemCompDeferred, handle OnUnpaused

* missed a todo

* entitysystem resolve

* remove unnecessary component updates

* remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan

* Code cleanup

* comments

* combines AutoRemove input into Clear

* minor logic adjustment that does not really change anything but is less ambiguous
2024-03-03 01:07:05 +11:00
PJBot
e7a806a443 Automatic changelog update 2024-03-02 13:58:50 +00: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
Aviu00
21000c5b1f Collars
(cherry picked from commit 045439676ee03c51d377d318624d46ff84ae07d8)
2024-03-02 16:25:20 +03:00
Aviu00
a935aa2242 Shock collar
(cherry picked from commit e34770d7e5399195b8f762e545eddab8a3c2dd4f)
2024-03-02 16:08:39 +03:00
d5b3f707d1 - fix: some message for interactions 2024-03-02 15:55:41 +03:00
RavmorganButOnCocaine
1592296094 Automatic changelog update 2024-03-02 09:11:03 +00:00
Aviu00
d0e3d191eb - fix: Fix ling transform & closet skeleton. (#160) 2024-03-02 16:10:00 +07:00
RavmorganButOnCocaine
50031ab5a9 Automatic changelog update 2024-03-02 09:09:35 +00:00
Aviu00
3c3c4ed6f0 - fix: Holy water fix. (#159)
* - fix: Holy water fix.

* - tweak: Move bible check to CultSystem.

* - tweak: Remove unused.
2024-03-02 16:08:32 +07:00
Flareguy
a5200cc185 removes the free syndicate headset from the syndicate footsoldier (#25764) 2024-03-01 23:45:04 -07:00
PJBot
1c628b24c7 Automatic changelog update 2024-03-02 06:44:35 +00:00
Nemanja
9cdffb7b6e move space heaters into cargo (#25735)
* move space heaters into cargo

* AAA!!! the indentation1!!!

* remove crate
2024-03-01 23:43:29 -07:00
PJBot
0fde3b045e Automatic changelog update 2024-03-02 06:43:16 +00:00
brainfood1183
2135fdf776 Origin Station Update 01.03.2024 (CMO bedsheet) (#25756) 2024-03-01 23:43:10 -07:00
rosieposie
55b0cb1934 Additional Signage (#25766)
initial commit
2024-03-01 23:42:06 -07:00
RavmorganButOnCocaine
55c0f5052f Automatic changelog update 2024-03-02 05:59:24 +00:00
Valtos
4c8e398b3d new tts voices (#158) 2024-03-02 05:58:21 +00:00
Valtos
39b317a2b4 fuck (#157) 2024-03-02 05:58:15 +00:00
Nairod
c38b44ea69 Security Belts for Cadets (#25753) 2024-03-01 18:24:13 -05:00
PJBot
7a7e0e8db6 Automatic changelog update 2024-03-01 22:56:58 +00:00
IlyaElDunaev
81b016433f Detective's rubber stamp (#25676)
Stamp Detective
2024-03-01 17:50:17 -05:00
Tunguso4ka
8dedbf22a4 New item: Expensive coat (#25724)
Expensive coat
2024-03-01 16:22:52 -05:00
PJBot
a4804dbabe Automatic changelog update 2024-03-01 21:22:43 +00:00
Nairod
5d941920c8 CryoSleep Access Fix (#25752)
Cryo Access Fix
2024-03-01 16:21:37 -05:00
PJBot
a0d159bac6 Automatic changelog update 2024-03-01 12:50:55 +00:00
Aviu00
f672eb7b41 Ling transform sting fix (#155)
* - fix: Fix broken transform sting.

* - fix: Fix more fun stuff.

* - fix: Even more fun.
2024-03-01 18:39:29 +07:00
RavmorganButOnCocaine
94f81e7c75 Automatic changelog update 2024-03-01 08:52:20 +00:00
Remuchi
9430e2d53c Всякое по мелочи (#148)
* fix: у мартышек снова отображается одежда

* fix: с зеркалом снова можно взаимодействовать

* tweak: шлюзы культа теперь работают как двери, а не шлюзы

* remove: убрано отображение текущего патрона у револьверов

* add: новые плитки для мапперов
2024-03-01 15:51:17 +07:00
RavmorganButOnCocaine
95589e29c1 Automatic changelog update 2024-03-01 08:45:30 +00:00
Aviu00
71ca698a7c Spells stuff (#153)
* -add: Create and remove blood spells using verbs.

* - add: Blood spells now have charges and disappear.

* - add: Localize spells.

* - add: New blood spells.
2024-03-01 15:44:27 +07:00
PJBot
0ba9df26a0 Automatic changelog update 2024-03-01 02:49:49 +00:00
deltanedas
ad3f3a5d36 make suicide actions require confirming (#24609)
* add ActionAttemptEvent

* add ConfirmableAction compsys

* make suicide actions confirmable

* use new trolling techniques

* better query and dirty them

* death

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-01 13:48:43 +11:00