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
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
Morb0
804c99fcc5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/CCVar/CCVars.cs
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel.png
2023-11-22 20:22:45 +03:00
Leon Friedrich
c46bad59fa
Rename SpriteView field ( #21794 )
2023-11-20 17:37:57 +11:00
Nemanja
de5319737e
ok final actions fixes fr this time ( #21683 )
2023-11-16 00:12:47 -05:00
Nemanja
2727f63bf3
small action bar fixes ( #21655 )
2023-11-14 18:35:43 -07:00
Morb0
3cb4017c90
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Audio/Announcements/license.txt
# Resources/Audio/Effects/Shuttle/licenses.txt
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-11-14 16:35:33 +03:00
Nemanja
4e84961ef8
Minimalist Action Bar ( #21352 )
2023-11-13 22:27:14 -05:00
Leon Friedrich
355e16f470
fix implant action icon bug ( #21597 )
2023-11-12 16:29:46 -07:00
Leon Friedrich
654cc7f071
Merge ActorSystem and IPlayerManager ( #21314 )
2023-11-11 13:08:10 +11:00
Vasilis
2f2d237f86
LOOC will appear on top of your head ( #21514 )
...
* Oh well
* Minor fixing up
* HOLY BINGLE I DID IT
* TOGGLE!
2023-11-09 02:18:58 -07:00
Morb0
611bfea5ff
Merge remote-tracking branch 'upstream/master' into update-sposnors
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Packaging/ContentPackaging.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Resources/Audio/Weapons/Guns/Gunshots/license.txt
# Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
2023-11-08 03:00:51 +03:00
Leon Friedrich
6a8023cf8b
Fix admin verb PVS issue ( #21406 )
2023-11-05 02:58:26 +11:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
Morb0
681762aca7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
2023-10-28 14:14:36 +03:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
ShadowCommander
4b10cab617
Change ListContainer to send null when selected is removed from the data ( #20595 )
2023-10-24 22:07:47 -04:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
Morb0
2af666368b
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/MassMedia/Systems/NewsSystem.cs
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-10-20 01:50:09 +03:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07:00
Morb0
55a91108c1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-10-15 17:52:02 +03:00
DrSmugleaf
5be0df32ad
Add admin Erase verb, add checkbox to erase from the ban panel ( #20985 )
2023-10-14 02:02:56 -07:00
Morb0
6f6cbb14af
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/Changelog/ChangelogManager.cs
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# SpaceStation14.sln
2023-10-14 00:39:46 +03:00
DrSmugleaf
db4ad40430
Add panic bunker UI and automatic panic bunker ( #20954 )
2023-10-13 11:56:12 -07:00
Leon Friedrich
fcd0d9ef0f
Add methods to transfer actions between containers ( #20901 )
2023-10-11 13:50:10 -04: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
metalgearsloth
edbfef22d6
Climbing refactor ( #20516 )
2023-10-10 16:41:11 -07:00
gus
9eede28d8c
Using capital letter for radio channel prefixes works now ( #20846 )
...
Co-authored-by: gus <august.eymann@gmail.ccom>
2023-10-08 22:07:54 -07:00
Leon Friedrich
1a5cf370e7
Slightly improve action ui performance ( #20799 )
2023-10-08 16:37:09 -04:00
Leon Friedrich
00642e87a3
Changes for SplitContainer Engine PR ( #20383 )
2023-10-09 03:28:04 +11:00
Morb0
34a8740819
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/build-test-release.yml
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
2023-10-02 02:18:19 +03:00
DrSmugleaf
445e6aabed
Fix AHelp progressively showing more AHelp panels ( #20591 )
2023-09-28 18:46:16 -07:00
Kara
80f36ea6d4
Glorfcode (force say on damage/stun/crit) ( #20562 )
2023-09-28 18:05:36 -07:00
Miro Kavaliou
c06586f942
Added a toggle fullscreen button (default F11) ( #20272 )
...
* Added a toggle fullscreen button (default F11)
* Removed un-needed comments
* Review Requested Changes
* Fixed Acidental Spacing Change
* bwoink, removed extraneous code
* nothing, litterally
2023-09-28 18:55:10 -05:00
Morb0
64f1e79a5a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/manifest.yml
2023-09-28 17:32:44 +03:00
Kara
66307df970
Revert "Guidebook can POP OUT YAYYYY" ( #20520 )
2023-09-26 07:49:27 -07:00
Morb0
13b3bfa217
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/update-wiki.yml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/Markings/MarkingPrototype.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/manifest.yml
2023-09-24 12:56:24 +03:00
Vasilis
eb4a9c4833
:( ( #20440 )
2023-09-23 13:44:49 -05:00
Leon Friedrich
684b334806
Action container rejig ( #20260 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-09-23 18:49:39 +10:00
Vasilis
e5162d4151
Guidebook can POP OUT YAYYYY ( #20268 )
...
* Let them eat cake
* Reviews
* Change amoled theme to gray
* Ok nevermind im big smart
2023-09-22 14:52:30 -05:00
Vasilis
413ba8cc9a
Remove cringe hardcodes for background ( #20374 )
2023-09-22 14:50:34 -05:00
DrSmugleaf
4c5e7a01f1
Make the lobby AHelp button red for admins when one is received ( #20390 )
2023-09-21 17:40:57 +10:00
deltanedas
4fbebb6917
Roundstart antag role restrictions revival ( #20108 )
...
Co-authored-by: Ray <vigersray@gmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-20 17:54:53 +10:00
Morb0
58ef40767e
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +03:00
