Morb0
ce4a90a054
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png
# Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png
# Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png
# Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png
# Resources/Textures/Structures/Power/apc.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/panel.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-06-17 23:51:01 +03:00
DrSmugleaf
2ddebba0e9
Fix speech bubble occlusion being checked from the player's position instead of the eye's ( #29012 )
2024-06-15 17:35:05 -04:00
Morb0
da4af61aee
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Textures/Objects/Devices/nuke.rsi/meta.json
2024-06-15 10:39:49 +03:00
AJCM-git
c339773b5f
Fixes the ShowRulesCommand and the client not syncing rules correctly ( #28752 )
2024-06-15 00:41:25 -04:00
Morb0
9888f8fa57
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
# Content.Client/Lobby/LobbyUIController.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Medical.xml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/Service/Bartender.xml
# Resources/ServerInfo/Guidebook/Service/Chef.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-14 19:48:52 +03:00
Nemanja
50d83b9360
Cap scramble tag ( #28804 )
2024-06-09 16:01:05 -04:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) ( #28763 )
2024-06-09 14:58:10 -04:00
AJCM-git
346ac44a28
Open the guidebook when people with less than an hour playing join the round ( #28774 )
...
* Open the guidebook when people with less than an hour playing join the round
* Filter for gameplayState
* Fix tests
* tweaks
* saltern update (#28773 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Fix admin menu objects list (#28787 )
* Make `MakeAntag()` log errors instead of throwing exceptions (#28771 )
Make `MakeAntag()` log errors instead of throw
* add default page support for the guidebook (#28772 )
* Probably a better way to handle this
---------
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-06-09 12:26:48 -04:00
DrSmugleaf
0762f9da17
Fix action icons when dragging an active action to another slot ( #28692 )
2024-06-07 22:34:48 -07:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars ( #28655 )
...
* Fixes client having authority over rules popup cvars
* Delete duplicate migration
* Pre-update
* Post-update
2024-06-07 21:53:20 +02:00
AJCM-git
accf8adf97
Fixed the guidebook listing every single rule ( #28680 )
...
* Well i tried this way
* New approach (start)
* Did it
* makes spacelaw available, put it under sec
2024-06-07 06:28:55 -05:00
Leon Friedrich
e7f2ae52ab
Give jobs & antags prototypes a guide field ( #28614 )
...
* Give jobs & antags prototypes a guide field
* A
* space
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Add todo
* Fix merge errors
---------
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-06-06 05:05:58 -07:00
Nemanja
1333b48747
Convert rules to use guidebook parsing ( #28647 )
2024-06-06 03:11:26 -04:00
Repo
039fd932b2
Fix Admin Object tab sorting and search ( #28609 )
2024-06-06 02:41:11 -04:00
AJCM-git
be35a5d369
Header of Gas tank UI screen now fetched from Entity name and local ( #28545 )
2024-06-02 23:33:30 -04:00
Morb0
6a6bf86856
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/GameRules/events.yml
2024-06-02 19:57:53 +03:00
eoineoineoin
b44b159431
Replace Matrix3 with System.Numerics.Matrix3x2 ( #27443 )
...
Replace Matrix3 with Matrix3x2
2024-06-02 14:07:41 +10:00
Nemanja
21d0b1fd55
Guidebook Tables ( #28484 )
...
* PJB's cool table control (it probably doesn't work)
* ok wait wrong file
* Guidebook Tables
2024-06-01 20:58:33 -07:00
Morb0
28edee0fe2
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Commands/AdminWhoCommand.cs
# Content.Server/Administration/Commands/PlayTimeCommands.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
2024-06-01 23:06:19 +03:00
ShadowCommander
3ed1ee6a5b
Add search filter to the admin menu player tab ( #28030 )
2024-05-31 02:28:08 -04:00
Morb0
4bf8b9eed6
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
2024-05-29 01:14:59 +03:00
Pieter-Jan Briers
cf8fcb170a
Remove bogus C# finalizers ( #28315 )
...
Begging people to learn how this programming language works before throwing random syntax into a file.
None of these finalizers ever worked. I also checked whether they were memory leaks and needed *proper* shutdown logic, but they're all instantiated-once UI controls that last for the entire lifetime of the program so it's probably fine.
2024-05-27 17:52:23 -04:00
Morb0
ac51af0830
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
2024-05-26 13:10:11 +03:00
Leon Friedrich
12841da9a1
Fix storage UI interactions ( #28291 )
...
* Fix storage UI interactions
* Add VV support
2024-05-26 12:11:37 +10:00
Nemanja
8a95cb186c
Remove AlertType and AlertCategory ( #27933 )
2024-05-23 22:43:04 -04:00
Morb0
775cbf088c
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Objects/Misc/books.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2024-05-23 13:06:49 +03:00
Nemanja
868b6c202d
fix orphaned storage grid pieces getting stuck to the cursor ( #27960 )
...
* fix orphaned storage grid pieces getting stuck to the cursor
* instead of denying it, update it smartly
2024-05-17 00:51:28 -07:00
Morb0
d97a09543d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
2024-05-15 18:53:52 +03:00
Kara
855234aa30
Resolve 'TransformComponent.MapPosition' is obsolete in content ( #27939 )
...
* Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content
* build?
2024-05-12 10:31:54 -04:00
ike709
af4c6373f6
Adds Support for Guidebook Buttons in UIs ( #27891 )
...
* Adds Support for Guidebook Buttons in UIs
* read it from the component
* the code is perfect
* moony review
---------
Co-authored-by: ike709 <ike709@github.com>
2024-05-10 22:21:18 -04:00
DrSmugleaf
9741fda672
Add ActionPerformedEvent, ActionsSystem.SetIfBiggerCooldown, action id to action events and BackgroundOn field ( #27682 )
...
* Add ActionPerformedEvent and ActionsSystem.SetIfBiggerCooldown
* Add action id to action events and backgroundon field to action component
2024-05-10 20:04:01 -04:00
Morb0
b704ef0d5e
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
2024-05-09 13:28:43 +03:00
no
630a7a78ed
Add ghost role raffles ( #26629 )
...
* Add ghost role raffles
* GRR: Fix dialogue sizing, fix merge
* GRR: Add raffle deciders (winner picker)
* GRR: Make settings prototype based with option to override
* GRR: Use Raffles folder and namespace
* GRR: DataFieldify and TimeSpanify
* GRR: Don't actually DataFieldify HashSet<ICommonSession>s
* GRR: add GetGhostRoleCount() + docs
* update engine on branch
* Ghost role raffles: docs, fix window size, cleanup, etc
* GRR: Admin UI
* GRR: Admin UI: Display initial/max/ext of selected raffle settings proto
* GRR: Make a ton of roles raffled
2024-05-06 18:48:16 -07:00
Morb0
43aaffd30b
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
# Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
# Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
# Content.Server/Speech/EntitySystems/MothAccentSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Audio/Announcements/attributions.yml
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/train.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png
# Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png
2024-05-07 00:43:11 +03:00
DrSmugleaf
c20df3e39f
Fix AlertControl throwing an error if the sprite view entity is deleted multiple times ( #27690 )
...
* Fix AlertControl throwing an error if disposed multiple times
* Replace default check with deleted check
2024-05-05 21:38:55 -04:00
Morb0
f32f800a27
Merge remote-tracking branch 'upstream/master' into upstream-sync
2024-05-02 12:59:23 +03:00
deltanedas
ff762e56a7
add ghostnado button to warp menu ( #27556 )
...
* add ghostnado button to warp menu
* translator ops
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-01 06:59:35 -07:00
Morb0
d9142b3553
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/conflict-labeler.yml
# .github/workflows/labeler-pr.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
2024-04-30 21:12:31 +03:00
Leon Friedrich
6471f55a49
Action UI fixes ( #27468 )
2024-04-29 18:36:18 +10:00
Morb
16b3e2233a
Emotes Menu ( #26702 )
...
* Basic emote radial menu
* Move out from corvax
* Move to UI controller & add to top menu bar and key bind
* Make emote play
* Add name localization for emotes
* Localize chat messages
* Fix emote menu
* Add categories localization
* Fixes
* Fix
* Add emotes entity blacklist
* Fix entity whitelist required all logic
* Remove unused wagging emote
* Revert sprite
* Set default texture for emote icon
* Update Resources/keybinds.yml
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-04-28 21:38:23 -07:00
Morb0
9fa27cc2f2
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
2024-04-27 15:23:56 +03:00
Tainakov
6d6e7f0c98
[Admin QOL] +Adminchat flag ( #26930 )
2024-04-27 13:17:46 +02:00
Morb0
38506f90df
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/specific.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
2024-04-27 13:24:36 +03:00
Morb0
3e015c6f67
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
metalgearsloth
5896e68752
Content update for UI prediction ( #27214 )
...
* Content update for UI refactor
* Big update
* Sharing
* Remaining content updates
* First big update
* Prototype updates
* AUGH
* Fix UI comp ref
* Cleanup
- Fix predicted message, fix item slots, fix interaction range check.
* Fix regressions
* Make this predictive
idk why it wasn't.
* Fix slime merge
* Merge conflict
* Fix merge
2024-04-26 18:16:24 +10:00
Leon Friedrich
0ae942101a
Fix client-side replay error ( #27332 )
2024-04-26 17:30:03 +10:00
Tayrtahn
b292905216
Expand UseDelay to support multiple delays per entity; fix bible healing and bag pickup ( #27234 )
...
* Upgraded UseDelay to support multiple delays per entity
* Implement secondary delay for bibles.
Also some improvements to make it work nicely.
* Documentation is good
* Reserve the previous change; now Storage uses the special ID and Bible uses the default.
* .0
* Added VV support to UseDelayInfo
* Serialize better
* No register, just setlength
2024-04-25 22:25:52 -04:00
Pieter-Jan Briers
7b90c08a2c
Various item status fixes/tweaks ( #27267 )
...
* Always display item status panel fully
Initial feedback from the UI changes seems to be that a lot of people go "why is there empty space" so let's fix that.
* Fix item status middle hand being on the wrong side
I think I switched this around when fixing the left/right being inverted in the UI code.
* Minor status panel UI tweaks
Bottom-align contents now that the panel itself doesn't dynamically expand, prevent weird gaps.
Clip contents for panel
* Fix clipping on implanters and network configurators.
Made them take less space. For implanters the name has to be cut off, which I did by adding a new ClipControl to achieve that in rich text.
* Update visibility of item status panels based on whether you have hands at all.
This avoids UI for borgs looking silly.
Added a new "HandUILocation" enum that doesn't have middle hands to avoid confusion in UI code.
* Use BulletRender for laser guns too.
Provides all the benefits like fixing layout overflow and allowing multi-line stuff. Looks great now.
This involved generalizing BulletRender a bit so it can be used for not-just-bullets.
* Fix geiger word wrapping if you're really fucked
2024-04-25 00:01:31 +10:00
DrSmugleaf
b0e6ff6779
Add events for custom action target validation ( #27230 )
2024-04-22 01:39:50 -07:00
Pieter-Jan Briers
58f025ba80
THE RETURN OF ITEM STATUS ( #22986 )
...
* THE RETURN OF ITEM STATUS
Item status is now inline with the hands again. You can now see item status for both hands at once.
If you have more than 2 hands, the last active hand of that side is displayed in the respective item status.
The item status for the active hand is also highlighted.
Item status has been given a new look so it looks unique and matches every UI theme.
* Shrink item status to 125px
This is going to require fixing the existing controls. Do that later.
* New bullet item status rendering
sex
* Make gun item status look just a little bit nicer.
Avoid only one or two bullets ending up on a single row of an item status.
* Delete Eris theme files
* More improvements
Fixed the fact that left/right were flipped around when assigning status panel locations. Involved renaming all the UI textures.
Redid how content margins are set from the theme. Less complex and cleaner now.
Made the item name always left-aligned, just looks better since other UI elements don't adapt anyways.
* Compact down item status text
Now it fits 3 lines of text on one line. Yay.
This is achieved by compacting RichTextLabels by reducing their line height and giving them a negative bottom margin.
* Add item status sprites for Ashen theme.
* Add status control to show beaker/bucket/jug solution/transfer volumes
Also PollingItemStatusControl I'll be using that more.
* Fix welder item status, clean up welder code
The item status control implementation was ancient and bad. That's why it was buggy.
Removed all the complex dated networking stuff for welders, we just sync the solution contents now anyways so none of that is needed anymore. This moves a buncha stuff to shared and just removes code.
Cleanup. The code was doing some really dumb stuff.
* Spray bottles show contents in item status.
* cowtools
* Fix plasmafire and clockwork themes.
Actual git gaslighting wtf.
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-21 23:16:23 +10:00
