Morb0
681762aca7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
2023-10-28 14:14:36 +03:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
Morb0
b8088a6cfd
Replace corvax chat filter with upstream implement
2023-10-22 18:52:05 +03:00
Morb0
429c0c2f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
2023-10-22 18:36:48 +03:00
Mr. 27
e2227c6b09
Make common netspeak get replaced in the chat ( #20180 )
...
* added more slang to the sanitization manager
* idk why this file is here
* Added new sanitization accent
* No longer is an acccent, instead is a dictionary
* Reverted back to a system similar to before, added the new netspeak from the dictionary
* Added some new words to the chat san
* Added (wdym --> what do you mean) to the chatsan
* merge conflict
* removed boolvalue
* remove space
* Upcoming
* Added MF and ETC to chatsan :))
* upcoming
* added FYI and WYD to speech-chatsan.ftl
* Made the chatsan accent string a const string with [ValidatePrototypeId<AccentPrototype>]
* forgot the ';' :(((
* fixed error throw [AccentPrototype] --> [ReplacementAccentPrototype]
2023-10-21 15:43:11 -04:00
Morb0
2af666368b
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/MassMedia/Systems/NewsSystem.cs
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-10-20 01:50:09 +03:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07:00
Morb0
1c61956e31
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/ServerInfo/Guidebook/Science/Science.xml
2023-10-18 13:22:26 +03:00
Kara
77964d4a6b
Kill SharedEntityExtensions and all popup extensions ( #20909 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-10-16 16:56:09 +11:00
Whisper
e5f5a28829
adds "idk." to the text to emote list ( #21015 )
2023-10-15 14:06:55 -07:00
Morb0
55a91108c1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-10-15 17:52:02 +03:00
DrSmugleaf
5be0df32ad
Add admin Erase verb, add checkbox to erase from the ban panel ( #20985 )
2023-10-14 02:02:56 -07:00
lzk
6a4dca04ea
Update chat sanitize for :O emote ( #1493 )
2023-10-11 21:28:47 +03:00
Morb0
d2a4a3b16b
Change default announce sound and decrease changes
2023-10-11 17:05:07 +03:00
Morb
a5504424c4
Update sposnors system ( #1475 )
2023-10-02 19:06:17 +03:00
Morb
195c402ef1
[Major] Moving out Queue, Verifications and Sponsors ( #1435 )
2023-10-01 14:59:40 +03:00
Morb0
111f0cd628
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/RoundEnd/RoundEndSystem.cs
2023-09-25 00:14:43 +03:00
Kara
fb175a520d
Ghost hearing action ( #19722 )
2023-09-24 16:34:08 -04:00
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
Leon Friedrich
a08c381018
Make replays record ghost chat ( #19957 )
2023-09-10 21:49:45 +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
Nemanja
4d677f0685
1v1 me first to 31 no powerups [Deathmatch Gamemode] ( #19467 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-08-30 18:06:15 -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
metalgearsloth
0b542098db
Remove ghost compref ( #19478 )
2023-08-25 18:50:46 +10:00
Morb0
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
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
81fe87f513
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
2023-08-21 09:44:38 +03:00
metalgearsloth
1313545719
Fix double-emotes ( #19279 )
2023-08-18 23:59:23 +10:00
metalgearsloth
0a945a6803
Merge pull request #19254
...
* Fix emote chirps
* named args time
2023-08-17 13:40:10 -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
f5c44e5bd0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/typing_indicator.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Effects/speech.rsi/alien0.png
# Resources/Textures/Effects/speech.rsi/alien1.png
# Resources/Textures/Effects/speech.rsi/alien2.png
# Resources/Textures/Effects/speech.rsi/alienroyal0.png
# Resources/Textures/Effects/speech.rsi/alienroyal1.png
# Resources/Textures/Effects/speech.rsi/alienroyal2.png
# Resources/Textures/Effects/speech.rsi/blob0.png
# Resources/Textures/Effects/speech.rsi/blob1.png
# Resources/Textures/Effects/speech.rsi/blob2.png
# Resources/Textures/Effects/speech.rsi/clock0.png
# Resources/Textures/Effects/speech.rsi/clock1.png
# Resources/Textures/Effects/speech.rsi/clock2.png
# Resources/Textures/Effects/speech.rsi/default0.png
# Resources/Textures/Effects/speech.rsi/default1.png
# Resources/Textures/Effects/speech.rsi/default2.png
# Resources/Textures/Effects/speech.rsi/guardian0.png
# Resources/Textures/Effects/speech.rsi/guardian1.png
# Resources/Textures/Effects/speech.rsi/guardian2.png
# Resources/Textures/Effects/speech.rsi/holo0.png
# Resources/Textures/Effects/speech.rsi/holo1.png
# Resources/Textures/Effects/speech.rsi/holo2.png
# Resources/Textures/Effects/speech.rsi/lawyer0.png
# Resources/Textures/Effects/speech.rsi/lawyer1.png
# Resources/Textures/Effects/speech.rsi/lawyer2.png
# Resources/Textures/Effects/speech.rsi/machine0.png
# Resources/Textures/Effects/speech.rsi/machine1.png
# Resources/Textures/Effects/speech.rsi/machine2.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/robot0.png
# Resources/Textures/Effects/speech.rsi/robot1.png
# Resources/Textures/Effects/speech.rsi/robot2.png
# Resources/Textures/Effects/speech.rsi/slime0.png
# Resources/Textures/Effects/speech.rsi/slime1.png
# Resources/Textures/Effects/speech.rsi/slime2.png
# Resources/Textures/Effects/speech.rsi/swarmer0.png
# Resources/Textures/Effects/speech.rsi/swarmer1.png
# Resources/Textures/Effects/speech.rsi/swarmer2.png
# Resources/Textures/Effects/speech.rsi/syndibot0.png
# Resources/Textures/Effects/speech.rsi/syndibot1.png
# Resources/Textures/Effects/speech.rsi/syndibot2.png
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/command.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/science.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
2023-08-13 05:40:29 +03:00
Kara
7b51cebfea
Deathgasp + last words / succumbing / fake deathgasp as crit actions ( #18993 )
2023-08-11 22:56:34 -07:00
Morb0
0cffa43345
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
# Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
# Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png
# Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
# Resources/Textures/Decals/bricktile.rsi/dark_box.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_e.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_n.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_s.png
# Resources/Textures/Decals/bricktile.rsi/dark_end_w.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_e.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_n.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_s.png
# Resources/Textures/Decals/bricktile.rsi/dark_line_w.png
# Resources/Textures/Decals/bricktile.rsi/meta.json
# Resources/Textures/Decals/bricktile.rsi/steel_box.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_e.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_n.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_s.png
# Resources/Textures/Decals/bricktile.rsi/steel_end_w.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_e.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_n.png
# Resources/Textures/Decals/bricktile.rsi/steel_line_w.png
# Resources/Textures/Decals/bricktile.rsi/white_box.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_se.png
# Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png
# Resources/Textures/Decals/bricktile.rsi/white_end_e.png
# Resources/Textures/Decals/bricktile.rsi/white_end_n.png
# Resources/Textures/Decals/bricktile.rsi/white_end_s.png
# Resources/Textures/Decals/bricktile.rsi/white_end_w.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_se.png
# Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png
# Resources/Textures/Decals/bricktile.rsi/white_line_e.png
# Resources/Textures/Decals/bricktile.rsi/white_line_n.png
# Resources/Textures/Decals/bricktile.rsi/white_line_s.png
# Resources/Textures/Decals/bricktile.rsi/white_line_w.png
# Resources/Textures/Decals/minitile.rsi/dark_box.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_se.png
# Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/dark_end_e.png
# Resources/Textures/Decals/minitile.rsi/dark_end_n.png
# Resources/Textures/Decals/minitile.rsi/dark_end_s.png
# Resources/Textures/Decals/minitile.rsi/dark_end_w.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_se.png
# Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/dark_line_e.png
# Resources/Textures/Decals/minitile.rsi/dark_line_n.png
# Resources/Textures/Decals/minitile.rsi/dark_line_s.png
# Resources/Textures/Decals/minitile.rsi/dark_line_w.png
# Resources/Textures/Decals/minitile.rsi/meta.json
# Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_se.png
# Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/steel_end_e.png
# Resources/Textures/Decals/minitile.rsi/steel_end_n.png
# Resources/Textures/Decals/minitile.rsi/steel_end_s.png
# Resources/Textures/Decals/minitile.rsi/steel_end_w.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_se.png
# Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/steel_line_e.png
# Resources/Textures/Decals/minitile.rsi/steel_line_n.png
# Resources/Textures/Decals/minitile.rsi/steel_line_s.png
# Resources/Textures/Decals/minitile.rsi/steel_line_w.png
# Resources/Textures/Decals/minitile.rsi/white_box.png
# Resources/Textures/Decals/minitile.rsi/white_corner_ne.png
# Resources/Textures/Decals/minitile.rsi/white_corner_nw.png
# Resources/Textures/Decals/minitile.rsi/white_corner_se.png
# Resources/Textures/Decals/minitile.rsi/white_corner_sw.png
# Resources/Textures/Decals/minitile.rsi/white_end_e.png
# Resources/Textures/Decals/minitile.rsi/white_end_n.png
# Resources/Textures/Decals/minitile.rsi/white_end_s.png
# Resources/Textures/Decals/minitile.rsi/white_end_w.png
# Resources/Textures/Decals/minitile.rsi/white_inner_ne.png
# Resources/Textures/Decals/minitile.rsi/white_inner_nw.png
# Resources/Textures/Decals/minitile.rsi/white_inner_se.png
# Resources/Textures/Decals/minitile.rsi/white_inner_sw.png
# Resources/Textures/Decals/minitile.rsi/white_line_w.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/bar.png
# Resources/Textures/Tiles/clown.png
# Resources/Textures/Tiles/dark.png
# Resources/Textures/Tiles/dark_diagonal.png
# Resources/Textures/Tiles/dark_diagonal_mini.png
# Resources/Textures/Tiles/dark_herringbone.png
# Resources/Textures/Tiles/dark_mini.png
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/dark_offset.png
# Resources/Textures/Tiles/dark_pavement.png
# Resources/Textures/Tiles/dark_pavement_vertical.png
# Resources/Textures/Tiles/hydro.png
# Resources/Textures/Tiles/kitchen.png
# Resources/Textures/Tiles/laundry.png
# Resources/Textures/Tiles/steel.png
# Resources/Textures/Tiles/steel_diagonal.png
# Resources/Textures/Tiles/steel_diagonal_mini.png
# Resources/Textures/Tiles/steel_herringbone.png
# Resources/Textures/Tiles/steel_mini.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/steel_offset.png
# Resources/Textures/Tiles/steel_pavement.png
# Resources/Textures/Tiles/steel_pavement_vertical.png
# Resources/Textures/Tiles/white.png
# Resources/Textures/Tiles/white_diagonal.png
# Resources/Textures/Tiles/white_diagonal_mini.png
# Resources/Textures/Tiles/white_herringbone.png
# Resources/Textures/Tiles/white_mini.png
# Resources/Textures/Tiles/white_mono.png
# Resources/Textures/Tiles/white_offset.png
# Resources/Textures/Tiles/white_pavement.png
# Resources/Textures/Tiles/white_pavement_vertical.png
2023-08-02 15:13:51 +03:00
Errant
9b10f7f557
Stealthier whispers ( #17898 )
...
* Stealth whisper take 2
* weh
* fix whisper maxrange
* make variables more distinct
2023-08-01 17:43:02 +03:00
Morb0
23eef7660d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-07-28 01:02:37 +03:00
Nemanja
8b0d6a4d45
Prevent using LOOC in crit ( #18297 )
...
* Prevent crit players from using LOOC
* fix comment
2023-07-26 00:02:48 -06: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
ef0248cd78
Remove static ILocalizationManager resolves. ( #17392 )
2023-06-17 11:57:32 +10:00
Leon Friedrich
a8eee5878a
Misc replay related changes ( #17102 )
2023-06-05 14:33:49 +10:00
