Morbo
ea68e39611
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/RulesCorvax.txt
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-04-19 02:54:06 +03:00
DrSmugleaf
07c5a844c7
Make the admin menu openable in the lobby ( #15444 )
2023-04-16 16:06:01 +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
ShadowCommander
3b21421ef1
Add EscapeContext keybind ( #15301 )
...
* Add EscapeContext
Escape context input closes windows if there are any open. If there are not any windows it opens the game menu.
* Add fluent for Escape Context
* Move EngineContext keybind to content
* Readd WindowCloseAll
* Fix EscapeContext not opening the game menu after using WindowCloseAll
WindowCloseAll does not clear the CloseRecentWindowUIController.recentlyInteractedWindows, which caused HasClosableWindow to return true because the list still had items.
Changed HasClosableWindow to check if windows in the list are still open and clear them if they aren't.
* Clean up EscapeContextUIController
2023-04-13 18:10:44 -07:00
metalgearsloth
be4e69b0c0
Station maps ( #13027 )
2023-04-13 16:21:24 +10:00
DrSmugleaf
98b4af8df0
Remove inventory component references ( #15249 )
2023-04-12 10:20:47 +10:00
DrSmugleaf
c25d7ba7bd
Fix not showing ahelp relay label to players ( #15327 )
2023-04-12 10:19:09 +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
Skye
af34c497c2
UI: Close window hotkeys ( #15227 )
2023-04-08 19:19:32 -07:00
DrSmugleaf
b947856431
Remove hands component reference ( #15197 )
2023-04-07 11:21:12 -07:00
Morbo
8cc2a785fc
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-04-04 23:53:11 +03:00
Leon Friedrich
19277a2276
More DoAfter Changes ( #14609 )
...
* DoAfters
* Compact Clone()
* Fix mice and cuffables
* Try generalize attempt events
* moves climbabledoafter event to shared, fixes issue with climbable target
* Fix merge (cuffing)
* Make all events netserializable
* handful of doafter events moved
* moves the rest of the events to their respective shared folders
* Changes all mentions of server doafter to shared
* stop stripping cancellation
* fix merge errors
* draw paused doafters
* handle unpausing
* missing netserializable ref
* removes break on stun reference
* removes cuffing state reference
* Fix tools
* Fix door prying.
* Fix construction
* Fix dumping
* Fix wielding assert
* fix rev
* Fix test
* more test fixes
---------
Co-authored-by: keronshb <keronshb@live.com>
2023-04-02 21:13:48 -04:00
Morbo
a3760d5656
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Server Info/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-04-02 09:15:19 +03:00
metalgearsloth
4cb3e464ac
Fix lobby votes ( #15041 )
2023-04-02 01:00:48 +11:00
Moony
eee96125df
Revert "Moony z level hack ( #15031 )" ( #15032 )
...
This reverts commit 1f6663912b
2023-03-31 21:50:11 -05:00
Moony
1f6663912b
Moony z level hack ( #15031 )
...
* save work
* Adds Z levels
* a
* ladders + parallax scroll
* zoom out not in
* oops, sandbox
* oops i broke the law
* run ci
* fuck
---------
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-03-31 21:49:10 -05:00
Morbo
bfe04b191e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
2023-03-30 09:49:30 +03:00
metalgearsloth
030ecc6964
Fix vote stacking ( #14951 )
2023-03-29 20:18:56 +11:00
metalgearsloth
4cbd5ef1ca
Fix vote popup ( #14940 )
2023-03-29 19:36:30 +11:00
DrSmugleaf
ed45440256
Always show ahelp relay message when the relay is enabled ( #14931 )
2023-03-28 14:27:21 -07:00
metalgearsloth
a09c4e7bd1
Stretch top bar for separated hud ( #14873 )
2023-03-27 19:51:40 -07:00
Morbo
908aa1a039
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Kitchen/UI/GrinderMenu.xaml
2023-03-27 07:49:16 +03:00
metalgearsloth
5b9705bc4d
Add margins to chat ( #14875 )
...
* Add margins to chat
* a
2023-03-26 09:57:29 -05:00
metalgearsloth
93fd38cf68
Fix default chat alert being off-screen ( #14868 )
2023-03-26 08:16:27 -05:00
Morbo
c58729755f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
2023-03-24 05:48:43 +03:00
Chief-Engineer
88fb6ccebc
Add admin alerts ( #13589 )
2023-03-23 11:10:49 -04:00
AJCM-git
7a6fddce4f
Moves guidebook UI logic to a UI Controller, some tweaks ( #14601 )
2023-03-22 23:41:43 -04:00
Morbo
892634065a
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
2023-03-14 05:18:41 +03:00
Flipp Syder
349eae0b70
Removes IOnStateChanged calls from GameplayStateLoadController ( #14617 )
2023-03-12 21:02:14 -04:00
Morbo
a33dfe1de8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/ISSUE_TEMPLATE/config.yml
2023-03-11 07:49:26 +03:00
Flipp Syder
3eb8f70985
Screen load event for GameplayState ( #14316 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-03-11 14:25:56 +11:00
Flipp Syder
12192ada0b
removes previous bruteforce method ( #14548 )
...
instead checks if the final size of the container is supposed to be bigger than zero: if it is, then it will continue to attempt to set the split fraction until the size is no longer zero, then it will do it once last time before stopping
2023-03-09 10:33:13 -06:00
ShadowCommander
e4fbcf3a63
Expand the viewport when the game window is resized instead of the chat window in the Separated HUD layout ( #13694 )
2023-03-10 00:56:43 +11: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
Morb
f57c54cc90
Fix chat size cvar float parse ( #14468 )
...
* Fix chat size float parse
* Use dot separator
* Return comma value separator
2023-03-07 09:38:54 -06:00
Flipp Syder
ec3a519a46
Store chat size ( #14299 )
2023-03-06 11:06:57 -08:00
Morbo
0e5004268b
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
2023-02-28 20:00:24 +03:00
Visne
62b87bc876
Remove black margin in separated HUD ( #13724 )
2023-02-28 08:11:38 -08:00
Morbo
e5fda096d9
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Resources/Prototypes/Maps/box.yml
2023-02-25 07:37:50 +03:00
DrSmugleaf
a13bdc0431
Fix AHelp window being recentered when opened through the verb ( #14219 )
2023-02-22 23:26:02 +11:00
DrSmugleaf
a11d82c479
Make admin ahelp window remember its last position ( #14209 )
2023-02-21 20:31:27 +01:00
Morbo
5b7d8e95d5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
2023-02-19 02:37:09 +03:00
Leon Friedrich
75a559fa55
Update radio prefix parsing ( #13777 )
2023-02-19 04:27:56 +11:00
Morbo
cdfcfe6722
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-01-22 00:07:21 +03:00
eoineoineoin
a4c0ba502f
Fix action callbacks when switching ui layout ( #13366 )
...
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-01-20 07:21:42 -08:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11: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
Kara
4e6bb1f46e
Ahelp popout button ( #13547 )
2023-01-17 11:47:52 -07: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
