Zekins3366
57ebc7d2e3
Merge remote-tracking branch 'upstream/master'
2025-11-22 17:13:39 +03:00
Dmitry
da0796d7d3
merge remote stable upstream
2025-11-10 21:59:58 +07:00
Zekins3366
c8fca5f092
Merge remote-tracking branch 'upstream/master'
2025-10-31 14:03:21 +03:00
Connor Huffine
050dae8aa7
Remove unused dependencies ( #41213 )
2025-10-31 10:37:10 +00:00
sleepyyapril
7c0ba70b74
Fix TryProccessRadioMessage Typo ( #41139 )
...
fix proccess typo
2025-10-27 10:44:11 +00:00
Dmitry
c682eb80b4
merge remote master, upstream
2025-10-26 22:31:58 +07:00
slarticodefast
1469b9484d
Add virtual chat API methods in Shared ( #40895 )
...
* move chat stuff to shared
* refactor: using cleanup +whitespaces + xml-doc
* review
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2025-10-19 19:08:27 +00:00
slarticodefast
ee9d1032bb
Move ChatSystem.Emotes to shared ( #40866 )
...
* move to shared
* entity effect to shared
* refactor: whitespaces+xml-doc typo fixups
* refactor: a little bit more of xml-doc typos fixups
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2025-10-13 18:06:01 +00:00
Zekins3366
64b65430a6
Merge remote-tracking branch 'upstream/master'
2025-10-02 22:47:17 +03:00
Dmitry
f01a60f5c7
upstream 9.1
2025-09-17 06:41:33 +07:00
Pieter-Jan Briers
0c97520276
Fix usages of TryIndex() ( #39124 )
...
* Fix usages of TryIndex()
Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115 )
This then resulted in TryIndex() getting modified to log errors (94f98073b0#39098 )
This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.
Fixes #39115
Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.
* fix tests
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-09-09 18:17:56 +02:00
Zekins3366
2ebf22f2ae
Merge remote-tracking branch 'upstream/master'
2025-09-07 21:56:10 +03:00
Dmitry
00d1d28309
chatsystem fix
2025-09-07 23:21:27 +07:00
Dmitry
871b3b3123
upstream
2025-09-07 22:54:54 +07:00
Zekins3366
3d48cd88c5
somefix
2025-09-02 20:05:59 +03:00
Zekins3366
aa7045cac1
soundisolation
2025-08-30 22:30:27 +03:00
Tayrtahn
5ea928863f
Cleanup warnings in ChatSystem ( #36773 )
...
* Cleanup warnings in ChatSystem
* fix after merge
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2025-08-17 08:39:23 -04:00
Dmitry
57307b718c
upstream master sync
2025-08-11 18:16:45 +07:00
Nemanja
1374ceea47
Move some Station methods into shared ( #38976 )
2025-08-08 11:22:34 -04:00
Laserkaier
a7cbd31060
Resomi Great Againt #125 from Laserkaier/resomkaat
...
Resomi Great Again
2025-08-06 14:22:36 +03:00
Zekins3366
30f52f0a6a
Merge remote-tracking branch 'upstream/master'
2025-08-06 13:46:37 +03:00
slarticodefast
2c40a950f7
Trigger Refactor ( #39034 )
2025-08-03 21:20:37 +02:00
Zekins3366
8676603e2b
Merge branch 'master' of https://github.com/corvax-team/ss14-wega
2025-07-21 20:48:14 +03:00
Dmitry
60c835f02c
master 21.7 syns
2025-07-21 00:27:46 +07:00
Dmitry
4948a136f1
stable upstream syns
2025-07-17 14:36:21 +07:00
Perry Fraser
bd853b60de
fix: ghosts shouldn't see whisper obfuscation ( #38202 )
2025-07-14 00:30:53 -07:00
Centronias
05436d3dcc
Component for clothes to suppress emotes and scream action in general, and the muzzle to suppress vocal emotes in particular ( #32588 )
...
* Component for clothes to suppress scream noise
GaggedComponent + AddGaggedClothingComponent and relevant systems to make them work.
Currently only stifles the scream _action_, not all emotes
because if a mime can silently emote, so can gagged you!
* fix comments
* swap to inventory relay
and make it more general such that specific emotes or emotes of a given category can be blocked
* power gloves shouldn't block snapping
* easy fixes
* blockable emote event
* pr comments, switch to using emote event mostly
* pr comments
add beforeEmoteEvent
add emote blocker name to popup
maybe some other stuff, I forget
* get rid of emoteevent's source because I don't need it anymore
* smol clean
* formatting, style, and one minor thing where having a muzzle in your pocket would gag you
2025-07-11 13:18:15 -04:00
Eduard
7c7dd649b8
Merge pull request #99 from corvax-team/strangulation
...
Strangulation - Удушение
2025-07-11 11:25:47 +03:00
Tayrtahn
c565b44965
Replace ValidatePrototypeId uses with ProtoId or EntProtoId ( #38814 )
...
* The easy ones
* For certain values of easy
* Easy test
* Hair
* Fix sandbox violations
* Sort usings
2025-07-07 21:57:05 +02:00
Tayrtahn
75db49f9c0
Clean up all missing EntitySystem proxy method uses ( #38353 )
2025-06-26 16:50:49 -07:00
Zekins
0e9bfc9ef1
Reapply "geneticstart"
...
This reverts commit 8a6ae35cfb
2025-03-24 02:15:37 +03:00
Zekins
8a6ae35cfb
Revert "geneticstart"
...
This reverts commit 718e5e7af4
2025-03-24 02:06:54 +03:00
Zekins
1152848cfa
Merge branch 'master' of https://github.com/corvax-team/ss14-wega
2025-03-24 01:56:46 +03:00
Zekins
718e5e7af4
geneticstart
2025-03-24 01:54:24 +03:00
Zekins
4448faf35f
Merge remote-tracking branch 'upstream/master'
2025-03-23 02:07:10 +03:00
Zekins
7d6f564344
Merge remote-tracking branch 'upstream/master' into upstream
2025-03-18 02:40:46 +03:00
Zekins
e718269cf3
upstream
2025-02-27 00:26:34 +03:00
pathetic meowmeow
fabfdd0673
Refactor audio system to send collection IDs over the network ( #33610 )
2025-02-23 23:14:56 +11:00
lzk228
0af3e04fd8
Merge commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Doors/Systems/AirlockSystem.cs
# Content.Server/Holopad/HolopadSystem.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/convex.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/plasma.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
# Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/icon-on.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
# Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
# Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
# Resources/Textures/Objects/Storage/boxes.rsi/box.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/candle.png
# Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
# Resources/Textures/Objects/Storage/boxes.rsi/clown.png
# Resources/Textures/Objects/Storage/boxes.rsi/darts.png
# Resources/Textures/Objects/Storage/boxes.rsi/disk.png
# Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
# Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
# Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
# Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
# Resources/Textures/Objects/Storage/boxes.rsi/flare.png
# Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
# Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
# Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
# Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
# Resources/Textures/Objects/Storage/boxes.rsi/headset.png
# Resources/Textures/Objects/Storage/boxes.rsi/heart.png
# Resources/Textures/Objects/Storage/boxes.rsi/holo.png
# Resources/Textures/Objects/Storage/boxes.rsi/implant.png
# Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
# Resources/Textures/Objects/Storage/boxes.rsi/internals.png
# Resources/Textures/Objects/Storage/boxes.rsi/latex.png
# Resources/Textures/Objects/Storage/boxes.rsi/light.png
# Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
# Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
# Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
# Resources/Textures/Objects/Storage/boxes.rsi/meson.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
# Resources/Textures/Objects/Storage/boxes.rsi/pda.png
# Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
# Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
# Resources/Textures/Objects/Storage/boxes.rsi/swab.png
# Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
# Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/vials.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
# Resources/Textures/Objects/Tiles/tile.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
2025-02-19 03:00:13 +01:00
Winkarst
0d33e6182c
Split `ReplacementAccentPrototype and ReplacementAccentComponent` in different files ( #35107 )
...
* Split ReplacementAccentPrototype and ReplacementAccentComponent
* Fixes
* Fixes
* inheritdoc
2025-02-12 12:21:12 +01:00
Zekins
364c9aa222
update
2024-12-22 09:44:16 +03:00
Morb0
be480aced1
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
2024-10-30 16:38:56 +03:00
Thomas
d4da9923ea
Fix Emote Chat Sanitizer ( #32940 )
...
* Fix bug?
* Fix :)
* aaaa
* AAAA!!!
* comment
* Nicer code
* What's a pull requestWhat's a pull request?
2024-10-24 16:10:13 +11:00
Thomas
876c44cd66
Sanitize shorthand emotes throughought the whole message ( #28645 )
...
* Rename ChatSanitizationManager to ChatEmoteSanitizationManager
The prior name was kind of confusing as there's a emote one and
then now there's also chat expansion happening in the accent system,
so knowing which I actually need to edit is useful.
So, I just need to keep myself not confused.
* Rename smileyToEmote and remove punctuation duplicates
The name SmileyToEmote is just... Bad.
Plus, I needed to remove the punctuation duplicates as that would
break any kind of regex parsing that I tried.
* Switch to regex from checking end of string
I also changed from System.Globalization to ILocalizationManager.
Writing that regex was definitely an experience.
* Document regex and the manager
* Rename it back
* Simplify regex
2024-10-17 16:01:32 +02:00
Morb0
3ab6d3ef71
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.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/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
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
Leon Friedrich
f1f1fc1dc3
Add interaction rate limits ( #32527 )
...
* Move PlayerRateLimitManager to shared
* Add interaction rate limits
* uncap tests
2024-09-29 22:19:00 +10:00
beck-thompson
fe2145d3b9
Voice Mask refactor ( #30798 )
...
* First commit
* Added base.Initialize()
* Voice wire fix (Electricty name)
* Various minor cleanups
* Localized default voice mask name
* Added VoiceOverride stuff
* Removed unused stuff
* Typo
* Better localized stuff
* Typo / spelling stuff / comments
* Blessed
2024-09-26 18:55:59 +02:00
Pieter-Jan Briers
1450d76337
Fix OOC not re-enabling if restartroundnow is used ( #32401 )
...
The ChatSystem code for re-enabling OOC only ran during PostRound, which gets skipped over when doing restartroundnow. Now it does this on PreRoundLobby too.
2024-09-24 09:38:09 +10:00
Morb0
0f339baab5
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Stations/base.yml
2024-09-01 22:20:47 +03:00
Winkarst
88dcc831c1
Remove calls to FormattedMessage obsolete methods ( #31706 )
...
* Remove FormattedMessage obsolete methods
* Oops
2024-09-01 13:00:53 +02:00
