NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-08 12:04:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
25089 commits 14 branches 0 tags 3 GiB
Commit graph

370 commits

Author SHA1 Message Date
Morb0
f062cbcec2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
#	LICENSE.TXT
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
#	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
#	Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
#	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
 2024-01-02 23:07:58 +03:00
Hannah Giovanna Dawson
84f544ff10
Clean out tags when attempting to speak/whisper/emote (#23055) 
A few bugs have popped up where (legal) string formatting tags
have been duplicated out into whisper and local.

Using the RemoveMarkup static we can sanitize attempted
speech to remove markup.
 2023-12-29 20:38:11 -04:00
Morb0
4426394d78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Datasets/Names/regalrat.yml
#	Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
 2023-12-23 02:53:18 +03:00
Leon Friedrich
b6bd82caa6
Use ECS prototype-reload events (#22613) 
* Use ECS prototype-reload events

* better constructors

* Maybe this fixes tests?
 2023-12-23 01:13:45 +11: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
caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/wrench.rsi/meta.json
 2023-12-08 13:54:31 +03:00
deltanedas
88119c6469
nar'sie fake (#20299) 
* import narsie sprite

* narsie_rises audio

* rename SmokeDissipateSpawnComponent to SpawnOnDespawnComponent

* add AnnounceOnSpawn system

* oop

* NAR'SIE HAS RISEN

* suffix

* base prototype, changes

* fix

* mapinit

* downscale

* new toys

* singuloose

* still not fix

* honki sprite

* add honki spawn animation

* revert spawnondespawn change

* really revert

* use LocId for announceonspawn

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-06 20:24:33 -05:00
Arthur Asimov
f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Datasets/Names/Operation_suffix.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
 2023-12-03 15:10:26 +03:00
Skye
751bed509e
Borgs can now speak while in Crit (#21802) 
* Borgs can speak while crit, also radio bug fix

* Revert "Borgs can speak while crit, also radio bug fix"

This reverts commit e1136ad781229cf5fc3cadcf70742168fc73d961.

* Borgs can speak in crit + radio bug fix

* Tied to a new generic component on SpeechComponent

* Ignoring Speech Block via Component uses an event!

* Remove debug logs and bypass if already true
 2023-12-01 19:25:20 -05:00
metalgearsloth
269c93245d
Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
Pieter-Jan Briers
8bf807a9b5
Basic rate limiting for chat messages (#21907) 2023-11-27 14:08:30 +11:00
Morb0
3cb4017c90 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Audio/Announcements/license.txt
#	Resources/Audio/Effects/Shuttle/licenses.txt
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/Textures/Structures/Storage/tanks.rsi/meta.json
 2023-11-14 16:35:33 +03:00
Leon Friedrich
654cc7f071
Merge ActorSystem and IPlayerManager (#21314) 2023-11-11 13:08:10 +11:00
Morb0
611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Packaging/ContentPackaging.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Resources/Audio/Weapons/Guns/Gunshots/license.txt
#	Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
 2023-11-08 03:00:51 +03:00
DrSmugleaf
c540b61390
Fix erase verb not removing chat messages in some cases (#21355) 
* Fix erase verb not removing chat messages in some cases

* Admin changelog

* Fix deleting messages with entity id 0
 2023-11-05 19:19:59 -07:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
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