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
DrSmugleaf
bb655ab4a5
Resize the non-admin AHelp window to be taller and less wide ( #20271 )
2023-09-17 04:04:20 -05:00
deltanedas
f7711edbe3
Objectives ecs rework ( #19967 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 16:18:10 +10:00
Leon Friedrich
411fc8e27b
Improve vv /c/enthover and add keybind ( #20127 )
2023-09-16 14:09:51 +10:00
Doru991
eaecdb4336
Cyborg health alert and damage examining ( #20084 )
...
* Option for alt health alert and no overlay
* Fancy borg health indicator
* Borg damage examine localization
* EENENGHHHH ENNNGHHH
* Requested code changes
* Legal sound
* Revert "Legal sound"
This reverts commit 35715c88898aeb78dfe800319852c230395fdd7e.
I misunderstood what Sloth meant
* Annoying buzzer is back
2023-09-14 23:14:47 -04:00
Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
DrSmugleaf
f23228bda9
Update dragon devour action icon ( #20020 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-12 22:05:04 -07:00
metalgearsloth
748ca93f5c
Fix context menu for admin menu ( #20030 )
2023-09-12 14:34:20 +10:00
metalgearsloth
d5bd1c6f86
Predict StorageComponent ( #19682 )
2023-09-11 21:20:46 +10:00
metalgearsloth
99b77bc2d3
Remove lights compref ( #19531 )
2023-09-11 19:18:06 +10:00
metalgearsloth
28bf3a6240
Remove SharedEye (but content) ( #19481 )
2023-09-11 16:15:23 +10:00
metalgearsloth
2a367af7ed
Fix ghost warps ( #20008 )
2023-09-11 15:43:24 +10:00
metalgearsloth
3c0439167a
Fix makeghostrole eui ( #19998 )
2023-09-11 14:31:45 +10:00
metalgearsloth
88dfc59038
Remove custom tooltip timings ( #19604 )
2023-09-11 13:53:35 +10:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
metalgearsloth
4d1c3ae66a
Revert "Remove IContainer and move functions to the container system.… ( #19975 )
2023-09-10 21:46:36 +10:00
Leon Friedrich
b45e53603d
Remove IContainer and move functions to the container system. ( #19834 )
2023-09-10 12:16:37 +10:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
Morb0
b1550d7db0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +03:00
metalgearsloth
4cfc578011
Revert "Remove most usages of obsolete TransformComponent methods (#1… ( #19714 )
2023-09-01 12:30:29 +10:00
deltanedas
7842f0d055
decouple briefing from traitor ( #19668 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-31 14:29:45 -07:00
Morb0
5a6058666e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/white_mono.png
2023-08-31 20:55:00 +03:00
Nemanja
4d677f0685
1v1 me first to 31 no powerups [Deathmatch Gamemode] ( #19467 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-08-30 18:06:15 -07:00
Morb0
2968d856bf
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-08-30 20:42:46 +03:00
Visne
1416942bea
Remove most usages of obsolete TransformComponent methods ( #19571 )
2023-08-30 12:05:19 +10:00
Morb0
1b513f0c1a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
Nemanja
3e93e963b5
Add support for custom controls in the character menu ( #19567 )
2023-08-27 18:24:24 +10:00
Visne
11a57be230
Remove usages of obsolete SpriteView.Sprite.set() ( #19500 )
2023-08-25 11:16:46 +10:00
Morb0
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
Visne
c7b21b631b
Remove unused dependencies ( #19490 )
2023-08-24 09:55:15 -08:00
Morb0
0b053a65ba
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
2023-08-17 06:19:53 +03:00
Leon Friedrich
be3fc7481e
Remove UI state enter/exit logic from DamageOverlayUi ( #19149 )
2023-08-14 23:10:55 -06:00
Leon Friedrich
cabc834e84
Fix combat action prediction ( #19152 )
...
* Fix action predictions
* Add ActionsAddedTest
2023-08-14 23:06:45 -06:00
Morb0
3306908b30
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off-real.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png
2023-08-15 03:07:16 +03:00
DrSmugleaf
9315a0fe81
Fix having to reopen ahelp and popped-out ahelp windows after rounds ( #19102 )
2023-08-14 15:03:35 -06:00
Morb0
83dcb2970d
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
2023-08-14 03:22:26 +03:00
DrSmugleaf
17808a54ef
Fix debug error when opening the ahelp ui before joining a game ( #19069 )
2023-08-13 16:56:25 -07:00
DrSmugleaf
35d7656784
Add ahelp typing indicator for admins ( #19060 )
...
* Add ahelp typing indicator for admins
* Lower typing updates throttle from 3 seconds to 1
* Add stopping typing when sending a message
* Lower typing indicator timeout from 15 to 10 seconds
2023-08-13 18:03:17 -05:00
Leon Friedrich
db33c5d916
Fix inventory UI not marking inputs as handled ( #19097 )
2023-08-13 14:55:17 -07:00
Morb0
f5c44e5bd0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/typing_indicator.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Effects/speech.rsi/alien0.png
# Resources/Textures/Effects/speech.rsi/alien1.png
# Resources/Textures/Effects/speech.rsi/alien2.png
# Resources/Textures/Effects/speech.rsi/alienroyal0.png
# Resources/Textures/Effects/speech.rsi/alienroyal1.png
# Resources/Textures/Effects/speech.rsi/alienroyal2.png
# Resources/Textures/Effects/speech.rsi/blob0.png
# Resources/Textures/Effects/speech.rsi/blob1.png
# Resources/Textures/Effects/speech.rsi/blob2.png
# Resources/Textures/Effects/speech.rsi/clock0.png
# Resources/Textures/Effects/speech.rsi/clock1.png
# Resources/Textures/Effects/speech.rsi/clock2.png
# Resources/Textures/Effects/speech.rsi/default0.png
# Resources/Textures/Effects/speech.rsi/default1.png
# Resources/Textures/Effects/speech.rsi/default2.png
# Resources/Textures/Effects/speech.rsi/guardian0.png
# Resources/Textures/Effects/speech.rsi/guardian1.png
# Resources/Textures/Effects/speech.rsi/guardian2.png
# Resources/Textures/Effects/speech.rsi/holo0.png
# Resources/Textures/Effects/speech.rsi/holo1.png
# Resources/Textures/Effects/speech.rsi/holo2.png
# Resources/Textures/Effects/speech.rsi/lawyer0.png
# Resources/Textures/Effects/speech.rsi/lawyer1.png
# Resources/Textures/Effects/speech.rsi/lawyer2.png
# Resources/Textures/Effects/speech.rsi/machine0.png
# Resources/Textures/Effects/speech.rsi/machine1.png
# Resources/Textures/Effects/speech.rsi/machine2.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/robot0.png
# Resources/Textures/Effects/speech.rsi/robot1.png
# Resources/Textures/Effects/speech.rsi/robot2.png
# Resources/Textures/Effects/speech.rsi/slime0.png
# Resources/Textures/Effects/speech.rsi/slime1.png
# Resources/Textures/Effects/speech.rsi/slime2.png
# Resources/Textures/Effects/speech.rsi/swarmer0.png
# Resources/Textures/Effects/speech.rsi/swarmer1.png
# Resources/Textures/Effects/speech.rsi/swarmer2.png
# Resources/Textures/Effects/speech.rsi/syndibot0.png
# Resources/Textures/Effects/speech.rsi/syndibot1.png
# Resources/Textures/Effects/speech.rsi/syndibot2.png
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/command.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/science.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
# Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
2023-08-13 05:40:29 +03:00
Pieter-Jan Briers
73996d17e4
Remove accidental using directives on transient dependencies. ( #18999 )
2023-08-11 16:56:40 -05:00
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
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
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
