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
Pieter-Jan Briers
55c61b9c35
Config presets system. ( #12824 )
2022-12-16 23:26:24 +01:00
Morb
37451fc974
Revert "Join min playtime ( #604 )" ( #615 )
2022-12-03 05:14:08 -08:00
Morbo
612d79c8fa
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Links/UILinks.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Shared/CCVar/CCVars.cs
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png
2022-12-03 07:09:10 +03:00
Pieter-Jan Briers
a6045e4538
Launcher info links. ( #12781 )
2022-12-02 17:23:43 -08:00
Nemanja
64f57aceb2
genericize ui fragments ( #12810 )
2022-12-02 16:46:58 -06:00
Morb
2409fea950
Join min playtime ( #604 )
2022-11-29 20:15:56 -08:00
Morb
fb3f24652e
Revert "Revert "Server join queue ( #583 )"" ( #602 )
2022-11-29 06:41:12 -08:00
Morb
e025a5ded1
Rework sponsor markings ( #593 )
2022-11-27 08:13:01 -08:00
Morb
97973e2ed9
Revert "Server join queue ( #583 )"
...
This reverts commit 84605eacb8
2022-11-27 04:09:27 -08:00
Morb
84605eacb8
Server join queue ( #583 )
2022-11-25 23:38:46 -08:00
Morb
9c9af7567e
Sponsors markings ( #552 )
2022-11-15 11:22:06 -08:00
Morbo
d7d2dd96c0
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Content.Client/PDA/PDAMenu.xaml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
2022-11-09 03:02:01 +03:00
Julian Giebel
e11cf969fa
PDA UI refactor and cartridges ( #11335 )
...
* Work on cartridges
* Work on PDA UI
* Work on PDA UIs program list
* Work on PDA UI borders
* Add DeviceNetworkingComponent to the pda base prototype
* Fix submodule version
* Fix cartridge loader ui key
* Fix pda menu xaml
* Implement relaying ui messages
* Finish implementing the notekeeper cartridge
* Fix submodule version
* Fix errors from merging master
* Fix test failing
* Implement setting preinstalled programs
* Add some documentation to CartridgeLoaderSystem
* Add more doc comments
* Add localization to program names
* Implement review suggestions
* Fix background programs receiving events twice when active
2022-11-08 14:00:20 -06:00
Morbo
783fd6fb2b
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-11-03 00:14:00 +03:00
Francesco
e2ac0f5322
fix: Wiki now displays the proper names and descriptions for chemistry recipes and the rest instead of the localization keys. ( #12359 )
2022-11-02 15:38:56 -05:00
Morbo
8ffba84896
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-10-21 19:51:57 +03:00
Kara
169ba3106b
Fix #12075 ( #12118 )
2022-10-21 01:54:18 -07:00
Morbo
57d8a459bb
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Humanoid/Sex.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
2022-10-16 02:03:26 +03:00
Leon Friedrich
efac113469
Improve stripping UI ( #9768 )
2022-10-16 04:00:04 +11:00
Morbo
ae8cb2688c
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-10-14 07:21:01 +03:00
Jezithyr
571dd4e6d5
Hud refactor ( #7202 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-10-12 10:16:23 +02:00
Morb
7ae33c14b3
Sponsor cat marking reward ( #437 )
2022-10-09 17:59:41 -07:00
Morbo
7fa98d7e4d
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Links/UILinks.cs
# README.md
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.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
2022-09-30 17:57:03 +03:00
metalgearsloth
f51248ecaa
Melee refactor ( #10897 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-29 15:51:59 +10:00
Morb
55b8f54f33
Sponsor priority join ( #428 )
2022-09-26 19:32:39 -07:00
Morb
b49688dc01
Награды спонсорам ( #402 )
2022-09-19 11:16:58 -07:00
Pieter-Jan Briers
7cd0677708
Content-side changes for packaging. ( #9382 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-09-14 19:39:55 +10:00
metalgearsloth
0286b88388
NPC refactor ( #10122 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-06 00:28:23 +10:00
keronshb
cd78c5451d
Ensnaring Component and Bola Update ( #9968 )
2022-08-25 00:50:31 +10:00
Leon Friedrich
3c7c2cd7c1
Fix IoCManager test error ( #10597 )
2022-08-14 13:17:50 -07:00
Leon Friedrich
c535214aa2
Fix restart error ( #10591 )
2022-08-14 12:54:11 -07:00
wrexbe
2c13a2c93c
Ignore missing components that end with "Visuals" ( #9613 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-08-08 18:50:54 +10:00
Kara
b947151d9a
Bucket solution fills + ECS SolutionContainerVisualizer ( #10289 )
2022-08-07 01:50:52 -07:00
Pieter-Jan Briers
e852ada6c8
Play time tracking: Job timers 3: more titles: when the ( #9978 )
...
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-08-07 16:00:42 +10:00
Steven K
68a5fcb7f8
PlantHolderVisualizer component system refactor ( #10091 )
...
* Converted PlantHolderVisualizer to component and system.
* Cleaned up Botany folder.
* Converted initialization of HydroTrayVisualizer under PlantHolderVisualizerSystem to it's own GenericVisualizer.
* Cleaned up hydro_tray.yml.
2022-07-30 19:18:49 -07:00
ModeratelyAware
3e28b7f236
Converted FireExtinguisherVisualizer to generic visualizer ( #10058 )
2022-07-26 17:40:13 -07:00
metalgearsloth
aad6a22a6a
ECS NPCs ( #9941 )
...
* ECS
* A
* parity
* Remove dummy update
* abs
* thanks rider
2022-07-25 14:57:33 +10:00
Rane
188934a748
Portable scrubbers ( #9417 )
2022-07-15 05:46:30 -07:00
Leon Friedrich
bad837fb85
Generic morgue visualizer ( #9696 )
2022-07-13 22:25:44 -07:00
Nemanja
5edf2ccad5
EntityStorage ECS ( #9291 )
2022-07-14 09:11:59 +10:00
