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
metalgearsloth
0c4e2650dd
Minor decal change ( #21860 )
2023-11-24 00:35:49 +11:00
metalgearsloth
76fe97b7c2
Use GetHashCode for client construction ( #21857 )
2023-11-24 00:19:30 +11:00
metalgearsloth
93bd9972f1
Content arch ( #20107 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-11-23 14:34:37 +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
metalgearsloth
985da52191
Decal fix ( #21761 )
...
- Don't send stale chunks for deleted grid as client just errors it anyway.
- Store some allocations in fields.
2023-11-21 21:35:57 -07:00
Chronophylos
e24e0bdaf5
add localization for pda footer text ( #21749 )
2023-11-21 20:06:43 -05:00
Velcroboy
a698a85f34
Make shuttle walls/windows constructable ( #19255 )
2023-11-20 17:20:24 -08:00
Leon Friedrich
c46bad59fa
Rename SpriteView field ( #21794 )
2023-11-20 17:37:57 +11:00
Leon Friedrich
4c09e645f3
Make T-ray entity query use lookup flags ( #21793 )
2023-11-20 16:09:06 +11:00
Nemanja
de5319737e
ok final actions fixes fr this time ( #21683 )
2023-11-16 00:12:47 -05:00
metalgearsloth
816ee2e1ab
Gateway destinations ( #21040 )
...
* Gateway generation
* Gateway stuff
* gatewehs
* mercenaries
* play area
* Range fixes and tweaks
* weh
* Gateway UI polish
* Lots of fixes
* Knock some items off
* Fix dungeon spawning
Realistically we should probably be using a salvage job.
* wahwah
* wehvs
* expression
* weh
* eee
* a
* a
* WEH
* frfr
* Gatwey
* Fix gateway windows
* Fix gateway windows
* a
* a
* Better layer masking
* a
* a
* Noise fixes
* a
* Fix fractal calculations
* a
* More fixes
* Fixes
* Add layers back in
* Fixes
* namespaces and ftl
* Other TODO
* Fix distance
* Cleanup
* Fix test
2023-11-14 19:23:40 -07: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
eb0c86f803
Storage CanInsert() tweaks ( #21623 )
2023-11-13 23:43:03 +11:00
Leon Friedrich
355e16f470
fix implant action icon bug ( #21597 )
2023-11-12 16:29:46 -07:00
Leon Friedrich
c9e2a91f13
Fix ghost FOV bug ( #21614 )
2023-11-13 05:36:00 +11:00
Leon Friedrich
9af95742df
Fix replay spectating bugs ( #21573 )
2023-11-10 23:45:46 -07:00
Leon Friedrich
654cc7f071
Merge ActorSystem and IPlayerManager ( #21314 )
2023-11-11 13:08:10 +11:00
Nemanja
ac5e9cd70b
Fix borg mobstates ( #21307 )
...
* Add dead states to borgs
* this?
* ack
2023-11-09 16:14:06 -07: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
themias
cf6eb200be
Remove need to toggle vending machine button ( #21543 )
2023-11-08 18:42:07 -07:00
Morb0
7d7c9e5f4c
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png
2023-11-09 01:09:14 +03:00
