Morb0
23eef7660d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-07-28 01:02:37 +03:00
Vordenburg
cf1f2d0e03
Limit the width of the action bar ( #17216 )
2023-07-27 18:20:07 +10:00
Hebi
756699ffcc
Filtering reagents ( #18211 )
...
* Making it work
* Refactoring
* Autoformat revert
* Implementing suggestions
* Changed to file scoped namespaces.
2023-07-26 02:05:09 -06:00
Leon Friedrich
a4fc332846
Fix some some bugs when client-side prediction is disabled ( #18241 )
2023-07-24 19:59:31 +10:00
faint
bf4e12fdf3
Merge remote-tracking branch 'wizards/master' into upstream-sync
2023-07-23 14:29:20 +03:00
metalgearsloth
e755509fc7
More miscellaneous compiler warning fixes ( #18228 )
2023-07-23 16:03:57 +10:00
faint
076d2e339b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
2023-07-10 07:03:24 +03:00
Leon Friedrich
e96560956c
Fix high UI scale chat. ( #17914 )
2023-07-09 16:30:26 -06:00
eoineoineoin
08d6a42983
Minor visual fixups from StyleboxTexture scaling ( #17763 )
2023-07-09 04:57:47 +10:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
Justin Trotter
72b6c2b54b
reformatted syndicate objectives for readability ( #17745 )
...
* reformatted syndicate objectives for readability
* used richtextlabels instead of labels, narrowed window size back to original
2023-07-04 18:33:11 -06:00
Morb0
82b4572421
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Chat/SharedChatSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2023-06-28 16:02:06 +03:00
router
33f823e6be
Add alternative emotes channel ( #15965 )
2023-06-26 17:20:08 -04: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
Leon Friedrich
b03d9a90ab
Add support for client-side replays ( #17168 )
2023-06-19 03:23:31 +10:00
Vordenburg
18837c305d
Fix action bar not filling with mappables ( #17218 )
...
* Fix action bar not filling with mappables
* Update Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-15 13:21:52 -06:00
Nemanja
ba9a369d0e
Guidebook links ( #17162 )
...
* Guidebook links
* warning!
2023-06-07 02:51:11 -05:00
Leon Friedrich
a8eee5878a
Misc replay related changes ( #17102 )
2023-06-05 14:33:49 +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
6269548835
Make SlotControl textures nullable ( #16519 )
2023-05-17 10:18:52 +10:00
Skye
fac42ef0c0
Fix action numbers (/handle UI default theme update) ( #15840 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-15 13:45:56 +10:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
Leon Friedrich
883d6646ea
Make guidebook start with some entries collapsed ( #16181 )
2023-05-07 13:12:29 +10:00
AJCM-git
d5b3585c09
Small tweak and cleanup of spells and actions ( #15943 )
2023-05-01 18:29:18 +10:00
Leon Friedrich
49a22ed29d
Set SpriteView sizes in various controls. ( #15935 )
2023-04-30 16:46:45 +10:00
Morbo
50c80d2bd2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeComponent.cs
# Resources/Prototypes/Voice/disease_emotes.yml
2023-04-29 14:53:32 +03:00
Vasilis The Pikachu
e4dced38fc
Add looc and emote focus binds ( #15588 )
2023-04-29 16:15:42 +10:00
Leon Friedrich
cedec8d415
Ensure EUIs close themselves ( #15860 )
2023-04-29 13:16:24 +10:00
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
