Commit graph

39 commits

Author SHA1 Message Date
Morb0
07a34aaaae Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Species/human.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-08-23 09:38:36 +03:00
tosatur
8eb4e4fa2d
added a few chatsan entries (#31085)
* added a few chatsan entries

* added 2 more

* added 4 more and fixed errors

* fixed error again

* added allg

* removed fullstops
2024-08-20 00:03:07 +10:00
Morb0
b70efe1fa8 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Audio/ContentAudioSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/Datasets/Names/first_male.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
#	Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
#	Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
#	Resources/Textures/Structures/Windows/directional.rsi/meta.json
2024-03-08 16:05:59 +03:00
lzk
325349965d
Remove 07 from emote chatsan (#25767)
1
2024-03-03 01:10:44 +11:00
Morb0
92bd0148fe Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Resources/Locale/en-US/chat/sanitizer-replacements.ftl
#	Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00
James Simonson
44ae7d234c
Added "wink" and "tearfully smiles" emotes + more cry emote variations (#25129)
Added wink and tearfully smiles emote + more cries  variations
2024-02-13 16:43:20 +01:00
lzk
b4256f1cfa
Remove lol emote chat sanitize (#1630) 2023-12-12 11:29:37 +03:00
lzk
5e95c05bcf
Add more words & symbold in chat sanitize (#1605) 2023-12-08 17:23:55 +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
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
Whisper
e5f5a28829
adds "idk." to the text to emote list (#21015) 2023-10-15 14:06:55 -07:00
lzk
6a4dca04ea
Update chat sanitize for :O emote (#1493) 2023-10-11 21:28:47 +03:00
Krosus777
e204be44f3
Added more commands for quick emotes in chat (#1152) 2023-06-30 02:31:37 +03:00
lzk228
44fe900c6c
Add more cyrillic chat sanitizaion (#1050) 2023-05-10 15:46:49 +03:00
lapatison
0fb1889dfc
Add more chat sanitization (#704) 2023-01-29 18:17:06 -08:00
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08: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
router
2bd3a6c673
add more to chat sanitization (#11988) 2022-10-17 15:54:51 +11: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
Arthur
82c0b1c8e7 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-15 16:38:40 +03:00
wrexbe
bc68ac96dd
Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Arthur
657216f43d Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
2022-04-25 13:13:07 +03:00
Rane
955e7af2ad
Fix capitalization of emotes (#7766) 2022-04-24 17:15:40 -07:00
Morbo
57602284f0
Add new option of wide-eyed emote (#135) 2022-03-04 18:07:16 +03:00
Arthur
0a782deced Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-17 01:05:48 +03:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Arthur
ecf20dfdc3 Merge remote-tracking branch 'upstream/master' into fork-sync
# Conflicts:
#	.github/CODEOWNERS
2022-01-13 07:35:23 +03:00
Michael Phillips
86812c1ad7
Added Whisper system for talking with players 2 tiles away. (#5994)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-12 01:48:18 +11:00
Arthur
3c85584ba9 Merge remote-tracking branch 'upstream/master' into sync-fork
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Resources/Prototypes/Maps/game.yml
2022-01-07 22:55:32 +03:00
Morbo
946f01ac05
Revert "Fork sync (#40)" (#43)
This reverts commit fe139a9e93.
2022-01-07 20:28:59 +03:00
Morbo
fe139a9e93
Fork sync (#40)
* Fix use delay (#6031)

* Add small railing corner (#6036)

* Add more chat filters (#6034)

* Xeno improvements (#6032)

* Automatic changelog update

* Removed capsaicin oil from the chem dispenser (#6042)

* Automatic changelog update

* Add ability to resist out of welded lockers and locked closets (#5958)

* Enable lighting of Cigars with IsHotEvent

Subscribed to IsHotEvent in ThrusterSystem, added AfterInteractEvent to SmokingSystem.Cigar which will set SmokableState to Lit if IsHotEvent returns true

This should mean that cigs/Cigars should light on anything hot

* Revert "Enable lighting of Cigars with IsHotEvent"

This reverts commit db896e1f80940892a87d34aa7182b9c605fa53bc.

* Add the ability to kick your way out of welded or locked closets

Added a ResistLocker component/system that hooks into OnRelayMove to begin resisting out of lockers so that players aren't stuck in lockers forever

Also added check to EntityStorageComponent to not print out welded shut message if the entity attempting to open the locker is inside of it.

* Changes based on review

minor formatting changes

make components passed into AttemptResist nullable and resolve them inside of the function

Remove incorrectly named .ftl file

* Changes based on review

Ditched async DoAfter
Used PopupSystem over User.PopupMessage

Added Cancel token to ResistLockerComponent

Subscribed to EntRemovedFromContainer event to cancel DoAfter if the player is removed from a container

* I am in formatting hell, apparently

* Changes based on review

Added TryComp for the EntityStorageComponent instead of the event passed one

* Changes based on review

* Apply suggestions from code review

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Formatting changes based on review

* Shuffle functions around in LockSystem to properly trigger visualizer

Moved all the unlocking logic to a Lock method inside of LockSystem and TryUnlock calls this method if the user passes all of the access checks

* Formatting, replacing Resolve with TryComp and making AttemptResist arguments optional

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

* Check if the player is inside THE container not A container

me no read good

* ok ok I give my code is bad

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

* Automatic changelog update

* Make smoking cool again. (#6046)

* Automatic changelog update

* Fixes minor issues with Reach and Dart. (#6035)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Automatic changelog update

* Adds filled versions of coloured wardrobes (#6012)

* Automatic changelog update

* Add content to radiation closets and medicine lockers (#6006)

* Automatic changelog update

* Interrupt do-afters when the user gets incapacitated. (#6059)

* Fix foldable-pickup interactions. (#6057)

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Delete69 <95458399+Delete69@users.noreply.github.com>
Co-authored-by: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Rane <60792108+Elijahrane@users.noreply.github.com>
Co-authored-by: JustinTime <41876089+JustinTether@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: LittleBuilderJane <63973502+LittleBuilderJane@users.noreply.github.com>
Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com>
2022-01-07 20:25:22 +03:00
router
6b094aac8c
Add some cyrillic emoticon equivalents for conversion (#32)
* Add some cyrillic equivalents of emoji for conversion

* Fix dementia

* Update sanitizer-replacements.ftl
2022-01-06 19:13:48 +03:00
ZeroDayDaemon
de0c94414a
Add more chat filters (#6034) 2022-01-05 18:51:48 -07:00
router
e4cd2944cf
o7 -> @salutes (#6026) 2022-01-05 00:05:21 +11:00
Venomii
3c35cb1154
Added phrases "lmao" and "lol" to ChatSanitizationManager (#5774) 2021-12-14 12:33:46 +11:00
DrSmugleaf
2a3b7d809d Fix 3000 errors 2021-12-05 18:09:01 +01:00
Moony
4cd09c23f5
Removes smilies from existence. (kinda) (#5649) 2021-12-03 01:49:19 +01:00