Commit graph

146 commits

Author SHA1 Message Date
Morb0
db07fb5098 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-02-18 02:20:00 +03:00
Pieter-Jan Briers
1ce2155315
Add new "OptionsVisualizer" (#25128)
This is a visualizer somewhat similar to the Generic. It allows configuring appearance info based on specific CVars the user has set. This allows YAML to easily configure alternatives for accessibility CVars like reduced motion.
2024-02-17 15:52:11 -05:00
Morb0
1e0bee212f Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/ServerInfo/Gameplay.txt
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
#	Resources/Textures/Clothing/Mask/bat.rsi/meta.json
#	Resources/Textures/Clothing/Mask/bear.rsi/meta.json
#	Resources/Textures/Clothing/Mask/bee.rsi/meta.json
#	Resources/Textures/Clothing/Mask/breath.rsi/meta.json
#	Resources/Textures/Clothing/Mask/clown.rsi/meta.json
#	Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
#	Resources/Textures/Clothing/Mask/ert.rsi/meta.json
#	Resources/Textures/Clothing/Mask/fox.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gas.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
#	Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
#	Resources/Textures/Clothing/Mask/joy.rsi/meta.json
#	Resources/Textures/Clothing/Mask/medical.rsi/meta.json
#	Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
#	Resources/Textures/Clothing/Mask/merc.rsi/meta.json
#	Resources/Textures/Clothing/Mask/mime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
#	Resources/Textures/Clothing/Mask/rat.rsi/meta.json
#	Resources/Textures/Clothing/Mask/raven.rsi/meta.json
#	Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
#	Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
#	Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
#	Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
Leon Friedrich
347655fac1
Freeze eventbus dictionaries (#22628)
* Freeze event bus

* Cleanup
2024-01-06 20:24:42 +11:00
Morb0
918f543c2c Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
#	Resources/Textures/Objects/Devices/nuke.rsi/meta.json
#	Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
2023-12-25 21:03:49 +03:00
Nemanja
00813171c1
Automatic holiday sprites (#22929) 2023-12-24 23:52:43 -07:00
mhamster
a47689ba43
MealsJsonGenerator typo fix (#1628) 2023-12-12 11:30:35 +03:00
mhamster
6702ec9832
[Wiki] MealRecipes json generator (#1566) 2023-11-21 17:16:03 +03:00
Morb0
75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Communications/CommunicationsConsoleSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
DrSmugleaf
a0341ec53e
Add test to load all config presets (#20705) 2023-10-06 19:31:08 -07:00
Morb
195c402ef1
[Major] Moving out Queue, Verifications and Sponsors (#1435) 2023-10-01 14:59:40 +03:00
mhamster
68201fc1e8
Fix wiki json autogen + entity autogen (#1441) 2023-09-24 17:29:13 +03:00
Morb0
6a241fbffd Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-29 19:36:13 +03:00
metalgearsloth
789c5e0a2b
Add fultons (#18958) 2023-08-29 16:34:05 +10:00
Morb0
afcb4ea5f3 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-03 02:32:11 +03:00
Moony
e2b22a4cd8
Toolshed (#17895)
* ogh

* i should save my work

* ogh

* hhcdfhjbghshbxdfhghshc
- lots of bugs in parsing still
- invocation is a stub

* expr parsing works

* awawa

* Saving work

* Improve APIs a bit all around, add shortcuts.

* awa

* awa

* AAAAAA

* save work

* Move shit to engine

* lord

* bql is kill

* forgot the fucking bike rack

* bql is kill for real

* pjb will kill me

* aughfhbdj

* adgddf

* gdsgvfvxshngfgh

* b

* hfsjhghj

* a

* tf you mean i have to document it

* follow C# standards

* Assorted cleanup and documentation pass, minor bugfix in ValueRefParser.

* Start porting old commands, remove that pesky prefix in favor of integrating with the shell.

* bw

* Fix valueref up a bit, improve autocomplete for it.

* awa

* fix tests

* git shut up

* Arithmetic commands.

* parse improvements

* Update engine.

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-08-02 16:09:08 -05:00
Morb0
23eef7660d Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-28 01:02:37 +03:00
metalgearsloth
b478d5326b
Remove component.Initialize calls (#18230) 2023-07-26 22:37:52 +10:00
faint
5828dca50b Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Server/Nuke/NukeSystem.cs
#	Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Science/scientist.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png
2023-07-21 16:32:31 +03:00
Riggle
579913b617
Better notes and bans (#14228)
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
2023-07-21 13:38:52 +02: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
0x6273
247c7a1d4d
Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
Morb0
c124b716a3 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Traits/TraitSystem.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Research/technologies.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/moose.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png
2023-05-20 13:51:12 +03:00
Leon Friedrich
be0d22ad5e
Move upload commands to engine (#16582) 2023-05-20 11:53:09 +10:00
Moony
e92a8fedab
Refactor stations to properly use entity prototypes. (stationsv3) (#16570)
* Update StationSpawningSystem.cs

Web-edit to allow feeding in an existing entity.

* Update StationSpawningSystem.cs

value type moment

* Update StationSpawningSystem.cs

* Oh goddamnit this is a refactor now.

* awawawa

* aaaaaaaaaaa

* ee

* forgot records.

* no records? no records.

* What's in a name?

* Sloth forcing me to do the refactor properly smh.

* e

* optional evac in test.

* tests pls work

* awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-05-19 15:45:09 -05:00
Morb0
45cde15648 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-05-07 12:51:16 +03:00
Pieter-Jan Briers
1c4a2594ce
Database thread pool use (#14498)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-02 10:36:39 +10:00
Morbo
3ed1fcd6da Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
2023-04-26 14:23:40 +03:00
metalgearsloth
7360ed0a7f
Add pointlight to flashbangs (#15785) 2023-04-26 13:51:48 +10:00
Morbo
1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Changelog/ChangelogManager.cs
#	Content.Client/Doors/AirlockVisualizer.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +03:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath (#15308)" (#15551) 2023-04-20 11:43:54 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
Morbo
5a14c570aa Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
#	Resources/Prototypes/typing_indicator.yml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
#	Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
#	Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png
#	Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png
#	Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png
2023-04-15 19:12:31 +03:00
DrSmugleaf
98b4af8df0
Remove inventory component references (#15249) 2023-04-12 10:20:47 +10:00
Morbo
47d49bf035 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
2023-04-11 22:36:33 +03:00
metalgearsloth
317a4013eb
Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
Morb
680b8e2e03
Discord linking (#963) 2023-04-07 03:25:38 -07:00
Morbo
82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Audio/Announcements/license.txt
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-03-07 18:54:29 +03:00
Pieter-Jan Briers
c5b3f62f6f
Update project files for configuration changes. (#14281) 2023-03-06 11:38:07 -08:00
Morbo
064729e6fe Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-02-08 01:12:17 +03:00
Visne
11dbc2eabc
Move TabletopItemVisualizerSystem into TabletopSystem (#13921) 2023-02-05 13:02:49 -07:00
Morbo
f989de7af5 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
#	Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
#	Resources/Prototypes/Roles/Jobs/Science/scientist.yml
2023-02-05 03:01:05 +03:00
TemporalOroboros
0edbc21ce8
Resolves TabletopItemVisualizer is Obsolete (#13911) 2023-02-03 15:47:29 +01:00
Morbo
35ea494981 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Doors/Components/AirlockComponent.cs
#	Content.Server/Fax/FaxMachineComponent.cs
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-01-17 22:57:53 +03:00
Leon Friedrich
22d72f56b5
Guidebook Revival (#13320)
* Fix some bugs in stations and do a little cleanup.

* Begin backporting the guidebook.

* wow that's a lot of work.

* More work, gives the monkey some more interactions.

* disco monkye.

* monky

* jobs entry.

* more writing.

* disco

* im being harassed

* fix spacing.

* i hate writing.

* Update Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

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

* builds again

* a

* pilfer changes from AL

* fix and remove unused code

* pilfer actual guide changes from AL

* localization

* more error logs & safety checks

* replace controls button with command

* add test

* todos

* pidgin parsing

* remove old parser

* Move files and change tree sorting

* add localization and public methods.

* Add help component/verb

* rename ITag to IDocumentTag

* Fix yml and tweak tooltips

* autoclose tooltip

* Split container

* Fancier-tree

* Hover color

* txt to xml

* oops

* Curse you hidden merge conflicts

* Rename parsing manager

* Stricter arg parsing

tag args must now be of the form key="value"

* Change default args

* Moar tests

* nullable enable

* Even fancier tree

* extremely fancy trees

* better indent icons

* stricter xml and subheadings

* tweak embed margin

* Fix parsing bugs

* quick fixes.

* spain.

* ogh

* hn bmvdsyc

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-01-16 02:42:22 -06:00
Morb
fd9c06a458
TTS (Text-To-Speech) (#618) 2023-01-10 18:01:20 -08:00
Morbo
6343d1e1f8 Merge remote-tracking branch 'upstream/master' into master-syndie
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
2022-12-20 14:15:13 +03:00
Willhelm53
a1dcc500a8
Puddle Visuals: ECS/Refactor and fixes (#11941)
* Don't stop me now, cuz I'm havin' such a good time (I'm havin' a ball!)

* YEET

* No changes to intended behaviour at this point. Pretty much just a refactor + bugfixes.

* tweaks to RandomizeState, removing an error caused by setting the state after setting the RSI

* Comments cleanup and removed IsSlippery. To re-add soon for this PR.

* test

* We don't actually use this PuddleGeneric anywhere

* cheeky

* Uncheeky, and tweaks based on #8203

* Recheeky

* A small price to pay for `checks passed`

* Beauty, like ice, our footing does betray; Who can tread sure on the smooth, slippery way

* Undo Slippery Checks

* Begin smoothing. Need to fix the animation-not-playing bug again

* Cleanup

* animation bugfix

* IgnoredComponents tests fix
2022-12-19 20:40:53 -06:00
Morbo
3f14ebc180 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/CCVar/CCVars.cs
2022-12-19 11:00:05 +03:00