Commit graph

21 commits

Author SHA1 Message Date
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
metalgearsloth
269c93245d
Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +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
Simon
7d92125343
the voices don't stop (fix pda ring) (#21640) 2023-11-13 15:43:08 -07:00
Morb0
259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Resources/Prototypes/Catalog/Fills/Boxes/general.yml
#	Resources/Prototypes/Entities/Clothing/Back/satchel.yml
#	Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
Simon
d696793796
Fix PDA notifications when creating a news entry using the Mass-Media console. (#21320) 2023-10-29 21:37:40 +11: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
Leon Friedrich
f308adffaf
Move ActorComponent to shared (#21293) 2023-10-29 04:21:02 +11: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
Morb
d5e5cdeb12
Hotfix news content (#1424) 2023-09-17 13:06:35 +03:00
Morb
94de2bea3d
News fix (#1417) 2023-09-15 00:12:11 +03:00
metalgearsloth
5a0fc68be2
Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
Leon Friedrich
af79f369ae
Remove outdated access reader method. (#19765) 2023-09-03 11:05:22 +10:00
Pieter-Jan Briers
73996d17e4
Remove accidental using directives on transient dependencies. (#18999) 2023-08-11 16:56:40 -05:00
Chief-Engineer
4b8ec304d8
add news logs (#18670) 2023-08-05 12:17:36 +10:00
MishaUnity
87d06110d8
Mass-media console update (#18466)
* Add Console, PDA news tab, and ringstone popup

* Add English localization

* Add mass-media console board to Advanced Entertainment resrarch

* Fix misprint

* Deleting unused libraries

* Fix round restart problem

* Fixing restart problem

* Just another fix

* Сode optimization

* Code optimization

* Convert News read tab to cartridge

Convert the News read tab into a cartridge, and fix a couple of bugs

* Just another fix

* Some updates

* More fixing!!

Fix cooldown, add author label to read menu

* Again, fix cooldown bug

* Some minor changes

* Revert "Some minor changes"

This reverts commit 470c8d727629ac79994f70e56162adae8659e944.

* Some minor updates

* News write Ui update

* Just another fix

* See commit below comments

* More code readability, more!
2023-07-30 23:34:22 -06:00
MishaUnity
e4dcdc0c6e
convert News read tab to PDA Cartridge (#18368)
* Add Console, PDA news tab, and ringstone popup

* Add English localization

* Add mass-media console board to Advanced Entertainment resrarch

* Fix misprint

* Deleting unused libraries

* Fix round restart problem

* Fixing restart problem

* Just another fix

* Сode optimization

* Code optimization

* Convert News read tab to cartridge

Convert the News read tab into a cartridge, and fix a couple of bugs

* Just another fix

* Some updates

* More fixing!!

Fix cooldown, add author label to read menu

* Again, fix cooldown bug

* Some minor changes

* Revert "Some minor changes"

This reverts commit 470c8d727629ac79994f70e56162adae8659e944.

* Some minor updates
2023-07-28 13:59:03 -06:00
PrPleGoo
852f041581
Add auth to the mass-media console (#18345)
* process my own comments

* add fields and handling

* little cleanups

* localization

* u

* whoops
2023-07-27 14:25:55 -06:00
MishaUnity
325d2a39ee
add mass-media system (#18251)
* Add Console, PDA news tab, and ringstone popup

* Add English localization

* Add mass-media console board to Advanced Entertainment resrarch

* Fix misprint

* Deleting unused libraries

* Fix round restart problem

* Fixing restart problem

* Just another fix

* Сode optimization

* Code optimization
2023-07-26 12:49:38 -06:00