Morb0
33942c412a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
DrSmugleaf
77e872fe8b
Add ahelp bwoink sound cvar ( #22439 )
2023-12-13 01:51:30 -07:00
Pieter-Jan Briers
16bd6802df
More UI fixes ( #22431 )
...
* Fix chat filter button
Oh look, the popup code was copy pasted between chat filter and channel selector.
Hilarious.
Anyways same stuff as 995f506aafFixes #22360
* Remove all further EnableAllKeybinds buttons.
Fixes #22346
Yeah none of these are valid use cases, why is this set...
2023-12-12 19:02:19 -07:00
Vasilis
3cb6b2c3b8
Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) ( #22430 )
2023-12-12 17:58:20 -08:00
metalgearsloth
d72506d54b
Hide verb expansion indicators on debug ( #22415 )
...
I forget if it's actually going to popup or not.
2023-12-12 17:03:46 -07:00
themias
9257703ef9
Fix construction graph ghost examine message ( #22424 )
2023-12-12 17:01:51 -07:00
KP
17270bb321
Fix glorfcode again ( #22420 )
2023-12-12 13:57:54 -08:00
Morb0
f22b645ff6
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
2023-12-12 11:00:46 +03:00
Nemanja
9de4c40c29
Miscellaneous inventory tweaks ( #22371 )
...
* pt 1
* Miscellaneous gridinv UX
2023-12-12 00:49:37 -07:00
Nemanja
6e91346ff3
artifact crusher ( #22301 )
2023-12-12 10:15:47 +11:00
Morb0
29a7082223
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
2023-12-11 21:56:43 +03:00
Nemanja
b37b988ce3
Even spaced hotbar ( #22252 )
...
* Fix spacing on hotbar
* more tweaksies
2023-12-11 04:37:51 -07:00
metalgearsloth
1bdf94da64
Audio fixes ( #22324 )
2023-12-11 21:26:55 +11:00
KP
1b5e5032f4
Fix Glorfcode ( #22271 )
2023-12-11 19:53:10 +11:00
Nairod
3589ad9d0c
Welder Blindness Effect Increase ( #22304 )
2023-12-10 15:10:07 -08:00
Morb0
32b4c85105
Add tts multiplier value
2023-12-10 10:54:29 +03:00
Morb0
6b2c649308
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Resources/Textures/Tiles/attributions.yml
2023-12-10 10:43:49 +03:00
chromiumboy
b70c0845d0
Crew monitor revisit ( #22240 )
2023-12-10 16:38:50 +11:00
metalgearsloth
b72c8553d8
Add audio multipliers back ( #22260 )
2023-12-09 15:18:15 +11:00
metalgearsloth
98d5f9f56b
Make audio sliders use gain not volume ( #21984 )
2023-12-09 14:03:08 +11:00
Pieter-Jan Briers
995f506aaf
Fix being unable to open chat channel drop-down. ( #22255 )
2023-12-09 13:15:06 +11:00
Nemanja
8112f84c33
Mark the last item stored in storage for smart-equip ( #22236 )
...
* mark the last item stored in grid inventory
* shift
2023-12-08 12:43:57 -06:00
Nemanja
736300d505
keybinds for opening bag/belt & context logic for opening storage window ( #22238 )
...
* keybinds for opening bag/belt & context logic for opening storage window
* no error por favor
2023-12-08 12:43:37 -06:00
Morb0
caf8ac8005
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/wrench.rsi/meta.json
2023-12-08 13:54:31 +03:00
Nemanja
b01f0b5f82
add tooltip with entity name on inventory hover ( #22203 )
2023-12-07 21:38:07 -05:00
Leon Friedrich
287d22cc49
Inventory slot enumerator rejig ( #21788 )
2023-12-08 08:20:51 +11:00
Nemanja
c047f19fdc
Inventory sprite rotation ( #22201 )
2023-12-07 11:59:16 +11:00
TemporalOroboros
f98322ad5d
T shaped pickaxe and grid UI fix ( #22197 )
2023-12-06 19:52:57 -05:00
deathride58
a4027a3344
Fixes speech bubbles now lacking names for the living ( #22191 )
2023-12-07 08:58:53 +11:00
Nemanja
9ca84ac3fb
Grid inventory fixes ( #22161 )
...
* Gridinv fixes
* eek
* oh yeah this too
* eek
2023-12-05 16:38:10 -07:00
deathride58
f0c76348bc
fixes ghosts completely lacking speech ( #22157 )
2023-12-05 14:40:03 -07:00
Arthur Asimov
cf021d6914
Fix upstream
2023-12-05 07:55:02 +03:00
Arthur Asimov
3da699ad32
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
2023-12-05 07:42:45 +03:00
deathride58
e32ede5882
Fancy speech bubbles - Names over speech bubbles, and 1:1 chat parity for emotes and LOOC! ( #21999 )
2023-12-04 16:10:49 -07:00
Nemanja
cc8984d096
Grid Inventory ( #21931 )
...
* Grid Inventory
* oh boy we keep cracking on
* auto insertion is kinda working? gross, too!
* pieces and proper layouts
* fix the sprites
* mousing over grid pieces... finally
* dragging deez nuts all over the screen
* eek!
* dragging is 90% less horrendous
* auto-rotating
* flatten
* Rotation at last
* fix rotation and change keybind for removing items.
* rebinding and keybinding
* wow! look at that! configurable with a button! cool!
* dragging is a bit cooler, eh?
* hover insert, my beloved
* add some grids for storage, fix 1x1 storages, fix multiple inputs at once
* el navigation
* oh yeah some stuff i forgor
* more fixes and QOL stuff
* the griddening
* the last of it (yippee)
* sloth review :)
2023-12-04 16:04:39 -07:00
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
Repo
b212809c58
Fix: the character preview ( #22106 )
2023-12-03 13:05:43 +11:00
coolmankid12345
0f7189e8b5
Ghetto Mindshield Icon ( #20958 )
...
* Looks like shit frfr
* White for sure
* New icon
---------
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
2023-12-02 12:21:10 -05:00
eoineoineoin
c3f8571d89
Avoid emptying and recreating all UI cards on every update ( #21990 )
...
By making the UI elements persistent, it allows tooltips to remain
on-screen when other elements are updated - in particular, the number
of research points, which is updated regularly.
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-11-29 14:49:44 -05:00
metalgearsloth
7ada1c6674
Update content to new ParallelManager ( #21813 )
2023-11-29 11:00:12 +11:00
Morb
63551a4471
[Secrets] VPN guard ( #1594 )
2023-11-28 18:52:28 +03:00
metalgearsloth
0d728b930b
Fix weather audio ( #21949 )
2023-11-28 23:35:38 +11:00
metalgearsloth
c172e66d7c
Fix ambient audio ( #21933 )
2023-11-28 14:09:25 +11:00
metalgearsloth
3423f11f79
Fix ahelps ( #21921 )
2023-11-28 00:42:03 +11:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
metalgearsloth
64343c289d
Revert Arch testmerge 2 ( #21901 )
2023-11-26 14:20:07 +11:00
metalgearsloth
855ab4d129
Update submodule to 182.1.0 ( #21900 )
2023-11-26 13:53:54 +11:00
Morb0
84c143160a
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# SpaceStation14.sln
2023-11-24 12:58:41 +03:00
metalgearsloth
d4bed09cdc
Revert the other arch changes ( #21871 )
2023-11-24 11:19:46 +11:00
Morb0
43a5b73f4e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# SpaceStation14.sln
2023-11-23 18:28:34 +03:00
