Morb
|
6ad4a10b29
|
Repository cleanup (#631)
|
2022-12-10 12:10:27 -08:00 |
|
Morbo
|
f9229d979c
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
|
2022-12-02 06:42:59 +03:00 |
|
Pieter-Jan Briers
|
cd6d4cb83c
|
Fix logging of admin announcements in admin logs. (#12778)
|
2022-11-27 15:10:21 -06:00 |
|
Morb
|
e025a5ded1
|
Rework sponsor markings (#593)
|
2022-11-27 08:13:01 -08:00 |
|
Morbo
|
513e6cf6ef
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Server/Chat/Managers/ChatManager.cs
|
2022-11-25 04:31:52 +03:00 |
|
Leon Friedrich
|
6af331c9ff
|
Remove StoredChatMessage (#12623)
|
2022-11-22 22:52:19 +11:00 |
|
Morbo
|
626f4679a1
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Maps/lighthouse.yml
# Resources/Prototypes/Maps/saltern.yml
|
2022-11-21 07:15:24 +03:00 |
|
keronshb
|
21c1cb57ce
|
Makes adjustment to macro bomb implants and how mobstate trigger handles suicide (#12682)
|
2022-11-20 20:51:44 -06:00 |
|
Morbo
|
a1416bc4f7
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-11-15 22:24:03 +03:00 |
|
Morb
|
9c9af7567e
|
Sponsors markings (#552)
|
2022-11-15 11:22:06 -08:00 |
|
Leon Friedrich
|
0b5a58001c
|
IListener and IRadio purge (#11980)
|
2022-11-15 15:09:27 +11:00 |
|
Morbo
|
228c19c52c
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Tiles/dark.png
# Resources/Textures/Tiles/white.png
|
2022-10-28 17:19:32 +03:00 |
|
Taran
|
e59bf8acd9
|
Increases VoiceRange To 10 From 7 (#12254)
|
2022-10-28 14:25:47 +11:00 |
|
Morb
|
c6b5cead6e
|
Hotfix sponsor OOC messages (#474)
|
2022-10-19 04:22:54 -07:00 |
|
Morbo
|
4513b14d32
|
Fix sponsor chat message update var
|
2022-10-18 21:32:44 +03:00 |
|
Morbo
|
3af5b83703
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Maps/cluster.yml
|
2022-10-18 21:23:46 +03:00 |
|
Leon Friedrich
|
3aeba9a63e
|
Fix chat sanitization and entity name escaping (#12015)
|
2022-10-17 23:59:09 -07:00 |
|
router
|
2bd3a6c673
|
add more to chat sanitization (#11988)
|
2022-10-17 15:54:51 +11:00 |
|
Morb
|
7ae33c14b3
|
Sponsor cat marking reward (#437)
|
2022-10-09 17:59:41 -07:00 |
|
Morbo
|
8bf73a47fd
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
|
2022-10-10 03:16:56 +03:00 |
|
ninruB
|
7e14a3ca48
|
Small chat sanitization tweak. (#11637)
|
2022-10-09 12:21:27 -07:00 |
|
Morbo
|
0ba0f53712
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Locale/en-US/job/job-names.ftl
|
2022-10-08 18:14:19 +03:00 |
|
Paul Ritter
|
79854e59a4
|
adds a source uid to most damage & mobstate events (#11559)
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
|
2022-10-08 12:15:27 +02:00 |
|
Morbo
|
7fa98d7e4d
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Links/UILinks.cs
# README.md
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
|
2022-09-30 17:57:03 +03:00 |
|
Flipp Syder
|
0385f1387c
|
Voice mask (#10458)
|
2022-09-29 12:22:27 +10:00 |
|
Morb
|
55b8f54f33
|
Sponsor priority join (#428)
|
2022-09-26 19:32:39 -07:00 |
|
Morb
|
b49688dc01
|
Награды спонсорам (#402)
|
2022-09-19 11:16:58 -07:00 |
|
Morbo
|
7d12bbd1a1
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Maps/game.yml
|
2022-08-31 23:44:39 +03:00 |
|
Tomás Alves
|
f8c18c0b41
|
SanitizeMessagePeriod: Add Period at the end of sentences (#10710)
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
|
2022-08-31 05:42:46 -07:00 |
|
Morbo
|
d3dd038355
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-08-26 23:50:25 +03:00 |
|
Leon Friedrich
|
1e9e93a33c
|
Fix typing indicator input validation. (#10818)
|
2022-08-25 23:44:43 +10:00 |
|
Morbo
|
6b74e70360
|
Merge remote-tracking branch 'upstream/master' into test2
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/Textures/Tiles/attributions.yml
|
2022-08-16 00:21:46 +03:00 |
|
Morb
|
fac3c2e4c5
|
Revert "Revert "Upstream sync""
|
2022-08-15 14:19:44 -07:00 |
|
Tomás Alves
|
67e4061fcd
|
SanitizeMessageCapital: Check Empty String (#10616)
|
2022-08-15 06:48:51 -07:00 |
|
Visne
|
58769634c7
|
Fix a bunch of compiler warnings (#10518)
|
2022-08-13 22:28:34 -07:00 |
|
Morb
|
105ee80f09
|
Revert "Upstream sync"
|
2022-08-13 08:05:52 -07:00 |
|
Morbo
|
89253944ce
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Maps/infiltrator.yml
|
2022-08-12 23:56:12 +03:00 |
|
Flipp Syder
|
0f9e31c988
|
Listener fix for speech (#10240)
|
2022-08-11 19:25:29 +10:00 |
|
Arthur
|
3077dd134c
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-08-08 02:41:55 +03:00 |
|
Júlio César Ueti
|
ee969c9799
|
Adds even more important Admin Logging (#10268)
|
2022-08-08 09:21:56 +10:00 |
|
Arthur
|
f4c7e873d4
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/Textures/Tiles/attributions.yml
|
2022-08-05 20:32:27 +03:00 |
|
Julian Giebel
|
bba5850da4
|
Fix the fix for accents on radio (#10242)
|
2022-08-02 06:46:10 -07:00 |
|
Arthur
|
5dc1b98364
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# Resources/Textures/Tiles/copyright.txt
|
2022-08-02 12:21:43 +03:00 |
|
Justin Trotter
|
15944898b1
|
accents on radio (#10226)
|
2022-08-02 12:33:30 +10:00 |
|
Arthur
|
b877259791
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
|
2022-07-29 17:59:17 +03:00 |
|
Leon Friedrich
|
c7ad6b709e
|
Audio System Rejig (#9635)
|
2022-07-29 12:13:12 +10:00 |
|
Kara
|
258ec0cac1
|
Clothing/item ECS & cleanup (#9706)
|
2022-07-27 03:53:47 -07:00 |
|
Kara
|
7e57dd987e
|
Chat fixes (#10051)
|
2022-07-26 16:49:23 -07:00 |
|
Rane
|
5ad13e0637
|
Redirect dead player LOOC to deadchat (#10009)
|
2022-07-26 06:58:19 -07:00 |
|
Arthur
|
0052df0cf5
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Maps/infiltrator.yml
|
2022-07-15 15:39:41 +03:00 |
|