Commit graph

4353 commits

Author SHA1 Message Date
Morb0
0546051cb0 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/tips.yml
2024-05-17 10:07:13 +03:00
deltanedas
b453b94148
fix ninja hacking not affecting sechud (#28021)
minor refactor and fix

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-16 16:51:06 -04:00
Pieter-Jan Briers
b35dc427e1
Fix sandbox check failure when compiling with latest .NET SDK. (#28077)
Roslyn now compiles char + string with string.Concat(ROS<char>). This means doing ref char -> ROS<char> which is not sandbox safe. Actually fixing this in the sandboxer is difficult so I'm gonna just pass on that for now.
2024-05-16 19:55:32 +02:00
Dexler
9b5dd1fab2
Disposal unit recharging state fix (#28059) 2024-05-15 16:55:01 -04:00
Morb0
49bb4deaba Fix upstream 2024-05-15 19:36:04 +03: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
Morb0
34bfec199a Add Secrets inventory loadout 2024-05-15 17:51:24 +03:00
DrSmugleaf
c94751f2d2
Fix the client not passing the weapon to can attack checks (#28040) 2024-05-14 23:26:02 -04:00
ShadowCommander
9ea06f3a39
Fix salvage magnet UI opening again when activating the console twice (#28010) 2024-05-14 19:59:46 -04:00
ShadowCommander
63c551b20d
Fix profile editor save buttons disappearing at small resolutions (#28001) 2024-05-14 14:03:06 +10:00
Brandon Li
bfed85aff2
Reagent dispenser UI (Again) (#27958)
* reagent dispenser: fancy window

* reagent dispenser: dispense button grid

* reagent dispenser: rearrange containers & info

* reagent dispenser: remove `reagent-dispenser-window-container-label`

* reagent dispenser: add `Scrollcontainer` on right side

* reagent dispenser: get rid of pointless actions

* reagent dispenser: cleanup actions and `inventory` field on bound ui state

* reagent dispenser: cool reagent cards & finishing touches

* reagent dispenser: final cleanup and formatting

* reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor

* reagent dispenser: cleanup code & address minor concerns

* reagent dispenser: text in reagent cards no longer clips

* reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably

* reagent dispenser mayybe this

* reagent dispenser: remove `using FastAccessors;`

* delete unused classes

* disable reagent button when container is empty

* Make things a bit bigger

* remove obsolete text color override
2024-05-13 17:46:16 -04:00
Morb0
7742fbbd86 Hide TTS selectors if CVar disabled 2024-05-13 17:45:26 +03:00
Morb0
80c6ccf4d2 Use shared sponsors manager 2024-05-13 17:45:23 +03:00
Kara
993eef1e7c
Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)
* PROJECT 0 WARNINGS: Resolve `'EntitySystem.Get<T>()' is obsolete` in content

* pass entman

* dog ass test

* webeditor
2024-05-12 20:34:52 -04:00
ShadowCommander
9c3dab0be3
Fix borg UI regenerating every tick (#27956)
* Fix UI elements being recreated when they didn't need to be

* Fix up comparison
2024-05-12 18:14:35 -04:00
nikthechampiongr
c8b55e5e44
Record deletion (#27883)
* Allow for Station Records interface for aghosts to delete records

* Fix record consoles not working when there are more than 2 crew members.

HOW DID NOONE NOTICE THIS SOONER???

* Stop being unconventional
2024-05-12 17:07:54 +02:00
no
37099e481e
Prevent admin-frozen players from ghosting or suiciding, add "Freeze And Mute" verb (#27813)
* prevent admin-frozen players from ghosting or suiciding

* Add "Freeze and Mute" admin verb

* Allow "Freeze And Mute" admin verb when player is already frozen but not muted

* Remove redundant scream handler (scream action just emotes, duh)

* AdminFrozenSystem: clean imports

* Update Content.Server/Chat/Commands/SuicideCommand.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Ghost.cs

* retrigger ci (empty commit)

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-05-12 10:35:30 -04: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
Kara
1596e04d0f
Resolve all non-obsoleting warnings in content (#27934)
* Resolve all non-obsoleting warnings in content

* Update ClientGameTicker.cs

* Update SkeletonAccentSystem.cs

* Update BwoinkSystem.cs
2024-05-11 20:13:58 -07:00
metalgearsloth
332f54a3ae
Lobby refactor + species loadouts support (#27576)
* Vox stuff

* Species loadouts and lobby refactor

The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.

* a

* Bulk changes

* a

* weh

* Character import / export

* finalise

* woops this stuff too

* Also datafield exporting

* comments

* Review
2024-05-12 09:18:21 +10:00
keronshb
999d044139
Magic Refactor + Wizard Grimoire (#22568)
* Brings over changes from the original magic refactor PR

* Adds Master Spellbook, spellbook categories, WizCoin currency, and locale

* Wiz€oin™

* Adds currency whitelist to Spellbook preset, grants contained actions on action added.

* Adds grant contained action and remove provided action.

* adds a way for actions to be upgraded to the store

* Adds Fireball 3 and fixes action upgrade logic so that it checks if the action can level or if the action can upgrade separately

* Fixes upgrade logic in ActionUpgradeSystem to allow for level ups without an actual upgrade. Fixed action upgrade logic in store system as well

* Removes current action entity from the bought entities list and adds new or old action entity

* Removes Current Entity

* Removes old comments, fixes TransferAllActionsWithNewAttached

* Removes TODO

* Removes Product Action Upgrade Event

* reverts changes to immovablerodrule

* Removes stale event reference

* fixes mind action grant logic

* reverts shared gun system change to projectile anomaly system

* forgor to remove the using

* Reverts unintended changes to action container

* Adds refund button to the store

* Refreshes store back to origin.

* Refund with correct currency

* Init refund

* Check for terminating and update interface

* Disables refund button

* Removes preset allow refund

* dont refund if map changed

* adds refunds to stores

* Adds method to check for starting map

* comments, datafields, some requested changes

* turns event into ref event

* Adds datafields

* Switches to entity terminating event

* Changes store entity to be nullable and checks if store is terminating to remove reference.

* Tryadd instead of containskey

* Adds a refund disable method, disables refund on bought ent container changes if not an action

* Removes duplicate refundcomp

* Removes unintended merges

* Removed another unintended change from merge

* removes extra using statement

* readds using statement

* might as well just remove both usings since it won't leave the PR

* Fixes Action upgrades from stores

* Changes to non obsolete method uses

* Shares spawn code between instant and world

* Adds action entity to action event, adds beforecastspellevent, adds spell requirements to magic component

* puts prereq check in spell methods, sets up template code for before cast event

* checks for required wizard clothes

* Networks Magic Comp and Wizard Clothes Comp. Renames MagicSpawnData to MagicInstantSpawnData.

* Removes posdata from projectiles

* Speech > RequiresSpeech

* Fixes ActionOnInteract

* checks for muted

* popup for missing reqs

* Validate click loc for blink spell

* Checks if doors are in range and not obstructed before opening

* Check ents by map coords

* Adds speak event

* Comments spellbooks

* Removes comments

* Unobsoletes smite spell

* Invert if

* Requirements loc

* Fixes spell reqs

* Inverts an if

* Comment updates

* Starts doafter work

* Removes doafter references

* Balances fireball upgrades to be more reasonable

* Enables refund on master spellbooks

* Spells to do

* update spellbook doafter

* knock toggles bolts

* Touch Spell comments

* Comments for pending spells

* more comments

* adds spider polymorph to spellbook

* TODOs for spells

* reorganizes spellbook categories and adds wands

* fixes spacing and adds limited conditions

* commented owner only for future store PR

* reenables owner only for the grimoire

* fixes grimoire sprite

* Adds wizard rod polymorph

* summon ghosts event

* Moves rod form to offensive category

* Adds charge spell and loc for rod polymorph

* Oops forgor the actual chages

* Item Recall comment

* Fixes UI

* removes extra field for wizard rod

* Cleanup

* New Condition (INCOMPLETE)

* Fix linter

* Fix linter (for real)

* fixed some descriptions

* adds regions to magic

* Adds a non-refund wizard grimoire, fixes blink to deselect after teleporting, reduces force wall despawn time to 12 seconds

* removes limited upgrade condition

---------

Co-authored-by: AJCM <AJCM@tutanota.com>
2024-05-11 19:06:49 -04:00
DrSmugleaf
8b88fe4bb7
Make projectiles not hit crit mobs unless clicked on (#27905) 2024-05-11 11:42:11 -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
metalgearsloth
5578bcc6f8
Fix votes using an audio entity (#27871)
* Fix votes using an audio entity

Just retains a source around and uses that. I think the audio limit is like 256 sources on the lower end so this is like whatever to persist.

* Restart

* weh
2024-05-10 21:21:06 -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
d6403daf00 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json
2024-05-11 01:41:28 +03:00
Brandon Li
98b2a79e77
Reagent dispenser UI (#27831)
* reagent dispenser: fancy window

* reagent dispenser: dispense button grid

* reagent dispenser: rearrange containers & info

* reagent dispenser: remove `reagent-dispenser-window-container-label`

* reagent dispenser: add `Scrollcontainer` on right side

* reagent dispenser: get rid of pointless actions

* reagent dispenser: cleanup actions and `inventory` field on bound ui state

* reagent dispenser: cool reagent cards & finishing touches

* reagent dispenser: final cleanup and formatting

* reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor

* reagent dispenser: cleanup code & address minor concerns

* reagent dispenser: text in reagent cards no longer clips

* reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably

* reagent dispenser mayybe this

* reagent dispenser: remove `using FastAccessors;`
2024-05-09 19:37:03 -07:00
Morb0
3fcd731834 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/criminal_records.yml
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
2024-05-09 13:47:39 +03: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
deltanedas
b33730db22
malf killer 9000 (robotics console) (#24855)
* create devicenet frequencies

* create borg transponder and give it to all nt borgs

* add robotics console

* actually implement battery charge display + some fix

* tab

* real explosion

* little safer

* disable destroy button clientside too when on cooldown

* m

* how do i do this when i review things...

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* webedit ops

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* ui updates

* oracle java

* do a thing

* update ui when a borg times out

* maybe fix test

* add IsLocked to LockSystem

* make destroying gib the chassis again, so emagging isnt sus

* use locking

* require using alt click to unlock so normal click is open ui

* the

* use LogType.Action

* take this L

* pocket lint?

* sharer

* pro ops

* robor pushmarkup

* m

* update and make it not use prototype anymore

* frame0

* update yaml

* untroll

* bad

* h

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-05-08 23:36:07 -07:00
deltanedas
24ab5c0982
ninja criminal records hacking (#24982)
* more humour

* spotted a troll

* add TryFindObjective to MindSystem

* replace copypaste bool conditions with CodeCondition

* use CodeConditionSystem in ninja + add handling for criminal hack

* add criminal records hacking

* update objectives

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-08 23:35:11 -07:00
deltanedas
1f67733775
fix mech energy display for 0 (#27828)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-08 22:55:15 -07:00
DrSmugleaf
15153d95a4
Fix the changelog window being very laggy until a tab is clicked (#27795) 2024-05-07 23:23:26 -07: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
exincore
7ffa74abd0
fix(ui): Fix shuttle control radius marking text vertical spacing (#27695) 2024-05-06 13:52:35 +10: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
Ty Ashley
b8144df7a5
Added new icons for the emote wheel (#27541)
* Added new icons for the emote wheel

* Corrected weh path

* Changed whistle to better match other vocal emotes. Modified honk icon to match dimensions of box. Corrected chirp and chitter emote icons.

* Cleaned up edges of icons

* Added attributions.yml to emotes folder
2024-05-05 20:12:30 -05:00
Morb0
4b39cd85a8 Move TTS preview to server 2024-05-03 17:52:05 +03:00
Errant
f64dd5f45f
Space Ninjas auto-toggle internals after spawning (#25083)
* fix engine version

* actually fix engine version

* Automatically activated breathing masks

* weh

* who needed that component anyway

* check if internals are already running

* Update Content.Server/Atmos/Components/BreathToolComponent.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Body/Systems/InternalsSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* prediction

* record struct event

* remove delayed activation, instead ensure that masks spawn last

* leftover

* engine version

* re-implement

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-05-03 11:24:21 +10:00
Morb0
f32f800a27 Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-05-02 12:59:23 +03:00
Leon Friedrich
a7e6337cbd
Replace NavMap dictionaries with int[] (#27602)
* Replace NavMap dictionaries with int[]

* Remove badly named const

* Remove unnecessary offset

* Prioritize airlocks
2024-05-02 12:51:21 +10:00
metalgearsloth
5053c8afdb
Fix effects (#27533)
* Fix effects

- Fix muzzle flash rotations.
- Fix effects so they update every frame.
- Fix effects tanking client performance.

* Fix merge artifact
2024-05-02 12:40:07 +10:00
metalgearsloth
7ba228732d
Optimise navmaps significantly (#27528)
* Optimise navmaps significantly

- Reduce the delta state size significantly.
- Remove AirtightChangedEvent because this will spam them out constantly.

* weh

* review

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2024-05-02 10:18:38 +10: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
Ciac32
b160c42926
Fix Loadout Editor not closing when Character Editor is closed. (#27539)
Remove duplicate UpdateRoleRequirements call screwing up update ordering
2024-05-01 13:28:13 +10: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
Magnus Larsen
f1c36af0a5
Fix Melee swing effect rotation (#27494)
* Melee swing effect: Allow rotation

* Make melee weapon effects follow the user
2024-04-30 21:56:41 +10:00
T-Stalker
d9d36b050a
Makes flares quieter (#27521)
* light

* flares quieter
2024-04-30 16:49:35 +10:00
Ed
91028a5149
remove Injector SolutionName constant (#27493)
remove stupid constant
2024-04-29 17:29:15 -04:00