Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
Morb0
5a6058666e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/white_mono.png
2023-08-31 20:55:00 +03:00
DrSmugleaf
3f3ba6ac62
Move minds, roles, jobs and objectives to shared ( #19679 )
2023-08-30 21:46:11 -07:00
Morb0
1b513f0c1a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
DrSmugleaf
15c0211fb2
Refactor minds to be entities with components, make roles components ( #19591 )
...
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2023-08-28 16:53:24 -07:00
Krosus777
e204be44f3
Added more commands for quick emotes in chat ( #1152 )
2023-06-30 02:31:37 +03:00
Morb0
636bea81df
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
# Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.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
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-06-19 21:06:28 +03:00
ShadowCommander
dd7032a860
Mind ECS ( #16826 )
2023-06-19 04:33:19 +10:00
Leon Friedrich
b03d9a90ab
Add support for client-side replays ( #17168 )
2023-06-19 03:23:31 +10:00
Leon Friedrich
a8eee5878a
Misc replay related changes ( #17102 )
2023-06-05 14:33:49 +10:00
lzk228
44fe900c6c
Add more cyrillic chat sanitizaion ( #1050 )
2023-05-10 15:46:49 +03:00
Morbo
50c80d2bd2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeComponent.cs
# Resources/Prototypes/Voice/disease_emotes.yml
2023-04-29 14:53:32 +03:00
Chief-Engineer
6c7be60a10
Add admin alerts for explosions ( #15786 )
2023-04-27 11:55:16 -07:00
Leon Friedrich
4d71b1b81e
Revert "Mind ecs" ( #14881 )
2023-03-27 08:24:00 +11:00
ShadowCommander
bfc4da9377
Mind ecs ( #14412 )
2023-03-26 14:31:13 -04:00
Morbo
c58729755f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
2023-03-24 05:48:43 +03:00
Chief-Engineer
88fb6ccebc
Add admin alerts ( #13589 )
2023-03-23 11:10:49 -04:00
lapatison
0fb1889dfc
Add more chat sanitization ( #704 )
2023-01-29 18:17:06 -08:00
Morbo
6343d1e1f8
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
2022-12-20 14:15:13 +03:00
Chief-Engineer
fdb1181298
Add ability to prevent ghosting ( #12906 )
...
* add ability to prevent ghosting to MindComponent.cs
* make minds preserve properties in certain transfer scenarios
* Revert "make minds preserve properties in certain transfer scenarios"
This reverts commit 333cae0db0faf4ef81767b93332271d944c90a0e.
* move PreventGhosting to the actual mind
2022-12-19 21:55:45 -06:00
Chief-Engineer
5ece9bd9e8
Modify admin chat ( #13050 )
...
* split admin chat into new channel
* add ability to play audio when a chat message is received and add audio to admin chat
* give client control of AdminChat sound and volume + suppress sound for senders
2022-12-19 21:39:01 -06:00
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
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
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
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
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
Visne
58769634c7
Fix a bunch of compiler warnings ( #10518 )
2022-08-13 22:28:34 -07:00
Arthur
421895e321
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-07-08 20:58:22 +03:00
Nemanja
836c0bb1c4
Zombie Mode [New Game Mode] ( #8501 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-07-06 13:42:51 +10:00
Arthur
5e78fb6fff
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-06-06 04:32:53 +03:00
Veritius
33faf00112
Fix comms consoles not working ( #8644 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-04 02:09:04 -07:00
Arthur
fee8678a41
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/Prototypes/Maps/game.yml
2022-06-04 03:08:27 +03:00
Veritius
237cb3d0b4
Communications Console: The ECSining ( #8374 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-03 21:37:35 +10:00
wrexbe
1e0babbd50
Make AdminLogsSystem an IoC manager ( #8492 )
...
* Make log not entity system
* Fixes
2022-05-28 23:41:17 -07:00
