Morb0
|
4516e1ceef
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
|
2023-08-22 08:22:56 +03:00 |
|
Interrobang01
|
93f85751f7
|
Autocapitalize the word I in IC chat (#18633)
|
2023-08-21 21:43:37 -07:00 |
|
Morb0
|
0b053a65ba
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
|
2023-08-17 06:19:53 +03:00 |
|
Kara
|
7db8c781e7
|
Speech verbs & conditional markup modification (#18980)
|
2023-08-15 13:03:05 -07:00 |
|
Morb0
|
22283a01f1
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Content.Shared/Chat/SharedChatSystem.cs
|
2023-08-15 00:08:39 +03:00 |
|
Vordenburg
|
7582474f1a
|
Lint more const string prototypes (#18922)
|
2023-08-13 20:26:59 -04:00 |
|
faint
|
31f283cc8e
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
|
2023-07-04 03:14:11 +03:00 |
|
HerCoyote23
|
2a47302f1e
|
Add secondary prefix for selecting radio channel, '.' (#16964)
|
2023-07-03 18:55:08 +10:00 |
|
Morb0
|
82b4572421
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Shared/Chat/SharedChatSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
|
2023-06-28 16:02:06 +03:00 |
|
router
|
33f823e6be
|
Add alternative emotes channel (#15965)
|
2023-06-26 17:20:08 -04:00 |
|
ssdaniel24
|
e8a98a58da
|
Changed emote chat prefix (#850)
|
2023-03-02 09:36:41 -08:00 |
|
lapatison
|
d7f694eab2
|
Default channel key tweak (#848)
|
2023-02-24 22:49:53 -08:00 |
|
Leon Friedrich
|
75a559fa55
|
Update radio prefix parsing (#13777)
|
2023-02-19 04:27:56 +11:00 |
|
Alex Evgrashin
|
ef452b38a9
|
Audible emotes (#12708)
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
|
2023-01-25 08:29:41 -08:00 |
|
metalgearsloth
|
1ac5df5e4a
|
SpeechBubble occlusion (#8018)
|
2022-05-08 01:54:56 -07:00 |
|