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
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
DrSmugleaf
41284a60e4
Fixed error when equipping the energy katana as a space ninja ( #20015 )
2023-09-11 19:04:02 +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
