Vigers Ray
95b86d7a4b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenu.xaml
# Content.Client/Construction/UI/ConstructionMenu.xaml.cs
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/Warps/WarpPointSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
# Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# Resources/Locale/en-US/_strings/plants/mutations.ftl
# Resources/Locale/en-US/_strings/stack/stacks.ftl
# Resources/Locale/en-US/_strings/teleportation/teleportation-menu-gui.ftl
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
# Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Power/powercells.yml
# Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/vim_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/station_maps.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
# Resources/Prototypes/Recipes/Construction/structures.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/cleanbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Recipes/Reactions/medicine.yml
# Resources/Prototypes/Roles/Jobs/CentComm/official.yml
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json
2025-05-04 23:13:12 +03:00
chromiumboy
f213753e2b
Sentry turrets - Part 5: Reuseable UI components ( #35149 )
...
* Initial commit
* Updated how monotone buttons are styled
* Removed unnecessary textures
* Updated attributions
* Addressing reviewer comments
* Adjusted monotone checkbox styling
2025-05-03 12:19:08 -05:00
metalgearsloth
bd69fc612a
Predicted internals ( #33800 )
...
* Predicted gas pumps
I wanted to try out atmos and first thing I found.
* a
* Atmos device prediction
- Canisters
- Tanks
- Internals
AirMixes aren't predicted so nothing on that front but all the UIs should be a lot closer.
* Remove details range
* Gas tank prediction
* Even more sweeping changes
* Alerts
* rehg
* Popup fix
* Fix merge conflicts
* Fix
* Review
2025-05-02 18:22:29 +10:00
Nemanja
55ef51a84b
Fix listcontainer constantly disposing children ( #37089 )
2025-05-01 15:32:37 +10:00
Vigers Ray
b378fdc706
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/PAI/SharedPAISystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Locale/en-US/_strings/access/components/genpop.ftl
# Resources/Locale/en-US/_strings/doors/components/turnstile.ftl
# Resources/Locale/en-US/_strings/power/battery.ftl
# Resources/Locale/en-US/_strings/store/pai-catalog.ftl
# Resources/Locale/en-US/_strings/tools/simple-tool-usage.ftl
# Resources/Locale/en-US/_strings/ui/controls.ftl
# Resources/Locale/en-US/_strings/weapons/ranged/upgrades.ftl
# Resources/Prototypes/Access/misc.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Fun/toys.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Recipes/Lathes/Packs/science.yml
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Store/currency.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/borg_types.yml
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png
# Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png
# Resources/migration.yml
2025-04-28 01:29:55 +03:00
Vigers Ray
286a1f2265
QoL Истории ахелпа ( #1984 )
2025-04-27 22:34:04 +03:00
Pieter-Jan Briers
ffe130b38d
Battery (SMES/substation) interface ( #36386 )
...
* Add ENERGYWATTHOURS() loc function
Takes in joules (energy), displays as watt-hours.
* Add simple OnOffButton control
* Re-add Inset style class
This was sloppily removed at some point?? Whatever, I need it.
* Add helper functions for setting title/guidebook IDs on FancyWindow
Reagent dispenser uses these, more in the next commits.
* Add BuiPredictionState helper
This enables me to implement coarse prediction manually in the battery UI.
Basically it's a local buffer of predicted inputs that can easily be replayed against future BUI states from the server.
* Add input coalescing infrastructure
I ran into the following problem: Robust's Slider control absolutely *spams* input events, to such a degree that it actually causes issues for the networking layer if directly passed through. For something like a slider, we just need to send the most recent value.
There is no good way for us to handle this in the control itself, as it *really* needs to happen in PreEngine. For simplicity reasons (for BUIs) I came to the conclusion it's best if it's there, as it's *before* any new states from the server can be applied. We can't just do this in Update() or something on the control as the timing just doesn't line up.
I made a content system, BuiPreTickUpdateSystem, that runs in the ModRunLevel.PreEngine phase to achieve this. It runs a method on a new IBuiPreTickUpdate interface on all open BUIs. They can then implement their own coalescing logic.
In the simplest case, this coalescing logic can just be "save the last value, and if we have any new value since the last update, send an input event." This is what the new InputCoalescer<T> type is for.
Adding new coalescing logic should be possible in the future, of course. It's all just small helpers.
* Battery interface
This adds a proper interface to batteries (SMES/substation). Players can turn IO on and off, and they can change charge and discharge rate. There's also a ton of numbers and stuff. It looks great.
This actually enables charge and discharge rates to be changed for these devices. The settings for both have been set between 5kW and 150kW.
* Oops, forgot to remove these style class defs.
2025-04-27 21:08:34 +10:00
Nemanja
abb9e373bd
Fix storage ui hovering over the hotbar ( #36770 )
2025-04-25 00:10:43 +02:00
Zachary Yona
063bbfa77c
Ashen hud item status slot fix ( #31411 )
...
* new patchMargin variable added, horizontals fixed
* All sides now work, system is fully integarated
---------
Co-authored-by: Zachary Yona <magicalusf@gmail.com>
2025-04-22 14:40:58 -04:00
Vigers Ray
e2aab392db
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/PDA/PdaSystem.cs
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/borg_types.yml
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png
2025-04-20 02:52:59 +03:00
Kyle Tyo
8dc2cb8874
Minor dependency and variable cleanup. ( #36730 )
...
removal of misc unused or extra dependency definitions.
2025-04-19 18:11:34 +02:00
pathetic meowmeow
8e24308714
Make two inventories not dance around as much when opening/closing them ( #35041 )
...
* Make two inventories not dance around as much when opening/closing them
* Use .Any
2025-04-19 10:40:49 -04:00
Vigers Ray
0e350ab6d3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Actions/ActionsSystem.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
# Content.Server/GameTicking/GameTicker.GamePreset.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Actions/BaseActionComponent.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Weapons/Reflect/ReflectComponent.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# README.md
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/ai_factions.yml
2025-04-19 00:46:30 +03:00
Tayrtahn
c155740ac5
Cleanup warnings in SimpleRadialMenu ( #36690 )
2025-04-18 18:28:24 +02:00
Ciarán Walsh
ab1bcfe391
Implement client-side theming for OutputPanel scroll-down button. ( #35913 )
...
* Implement client-side theming for OutputPanel scroll-down button.
* Use OutputPanel constant for button class name
* Remove unused string
* Enable scroll button for ChatBox
* Update RobustToolbox
* Update to merged RT version
2025-04-18 17:42:59 +10:00
metalgearsloth
7d2ef2bd47
Action charges refactor ( #33993 )
...
* Action charges refactor
- Fixes the slight godmoding of baseactioncomponent.
- Gets back 1ms of server time.
* chorg
* Remove FrameUpdate
* Fixes
* More fixes
* Combine
* Fixes
* Updates
* weh
* Last fixes
* weh
* Fix naughty
* YAML fixes
* This one too
* Merge conflicts
* This thing
* Review
* Fix this as well
* Icon fix
* weh
* Review
* Review
* seamless
* Review
2025-04-18 13:45:48 +10:00
Nemanja
c3e43a78f3
Fix another storedSprite bug ( #36662 )
2025-04-18 12:15:31 +10:00
metalgearsloth
e1a21728e7
Storage fixes ( #36533 )
...
* Storage fixes
- Add size event.
- Fix reclaim not running always.
* Block the toggles
* Standardise and popup explaining
* Disable item toggles in bags
* Fix verb popping up even if we can't activate
* Conflicts
* Validate
* Stop drags if source closes
* Really fixes
* Real fix
* Revert this
2025-04-18 12:11:31 +10:00
Vigers Ray
f71f04558f
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
# Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
2025-04-17 23:48:59 +03:00
Kyle Tyo
7d64599d2d
Action buttons are now usable in the action window. ( #35642 )
...
* Update ActionUIController.cs
* renamed some inconsistent arguments.
* removed a redundant check.
* revert some variable renames to reduce the diff.
2025-04-17 20:08:09 +10:00
Vigers Ray
a5a2bbd386
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
# 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/Hands/Gloves/fingerless.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Mobs/Aliens/Xenos/purple_snake.rsi/meta.json
2025-04-17 06:26:03 +03:00
Ed
5a69877fe7
storedOffset bugfix ( #33606 )
...
* Update ItemGridPiece.cs
* Update SharedItemSystem.cs
* Update ItemGridPiece.cs
* EmoGarbage Review
---------
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-16 20:42:22 -04:00
Vigers Ray
6020a6fd5b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Zombies/SharedZombieSystem.cs
# Content.Shared/Zombies/ZombieComponent.cs
# Resources/Locale/en-US/_strings/research/technologies.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
# Resources/Prototypes/Polymorphs/polymorph.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/Prototypes/Research/experimental.yml
2025-04-17 00:07:59 +03:00
Errant
fb388d2265
Role subtypes ( #35359 )
2025-04-16 19:04:48 +02:00
Vigers Ray
77d4af8975
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Atmos/EntitySystems/FlammableSystem.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs
# Content.Shared/Damage/Systems/StaminaSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Resources/Locale/en-US/_strings/chat/ui/chat-window.ftl
# Resources/Locale/en-US/_strings/damage/damage-popup-component.ftl
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/XenoArch/Effects/normal_effects.yml
# Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png
# Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
# Resources/migration.yml
2025-04-15 04:03:44 +03:00
eoineoineoin
7c4b34c1de
Command to open chatbox in a new window ( #33548 )
...
* Command to open chatbox in a new window
* Add command for users with AdminChat permission
* Add command button to admin tools window
2025-04-14 17:37:58 +02:00
Vigers Ray
d92d143236
Merge remote-tracking branch 'space-wizards/master'
2025-04-12 00:57:03 +03:00
Vigers Ray
62eabda73c
фиксы ахелпа
2025-04-12 00:52:19 +03:00
Pieter-Jan Briers
e6e60dead4
Revert "Feature/shader radial menu" due to shader issue ( #36470 )
2025-04-11 23:30:52 +02:00
Vigers Ray
fb40dab956
Фиксы сохранения ахелпов в БД
2025-04-11 00:58:32 +03:00
Vigers Ray
a136c69a08
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Humanoid/MarkingPicker.xaml.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Resources/Prototypes/Shaders/shaders.yml
2025-04-10 16:34:22 +03:00
J
3c307f3b36
Various UI warnings cleanup ( #36169 )
...
* Various UI warnings cleanup
* Revert unnecessary change
* Redoing SpriteSystem as it's non-injectable
* Missed one
* Better entity instantiation
* General cleanup of warnings changes
* Wrong class name!
2025-04-10 20:47:05 +10:00
Fildrance
56710697a9
Feature/shader radial menu ( #35152 )
...
* it works! kinda
* so it works now
* minor cleanup
* central button now is useful too
* more cleanup
* minor cleanup
* more cleanup
* refactor: migrated code from toolbox (as it was rejected as too specific)
* feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame
* refactor: major reworks!
* renamed DrawBagleSector to DrawAnnulusSector
* Remove strange indexing
* Regularize math
* refactor: re-orienting segment elements to be Y-mirrored
* refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button
* refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius.
* refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters
* refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly
* fix: enabled any functional keys pressed when pushing radial menu buttons
* fix: radial menu sector now scales with UIScale
* fix: accept only one event when clicking on radial menu ContextualButton
* fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always
* feat: simple radial menu prototype for easier creation
* refactor: cleanup, restored emote filtering, button models now have class hierarchy
* refactor: remove usage of closure from 'outside code'
* refactor: remove non existing type from UiControlTest
* refactor: remove unused using
* refactor: revert ability to declare radial menu layers in xaml, scale 32px sprites using scale in radial menu
* refactor: whitespaces
* refactor: subscribe for dispose on existing radial menus
* feat: now simple radial menu button models can have custom color for each sector background (and hover background color). Also added OpenOverMouseScreenPosition inside SimpleRadialMenu
* fix: AI door menu now can be closed by verb if it gets unpowered
* overlay and its registration
* radial menu shader but it requires wierd offset
* remove unused file
* smol cleanup
* remove unused code
* neat internal subsctors in radial menu shaders
* refactor finalize visual style
* comments, simplify, extract variable and other minor refactors on radial-menu shader
* refactor: extract more data from radial menu with sector to radial container for shader drawing
* replaced DrawSeparators for RadialMenuTextureButtonWithSector with DrawBorder (no reason to make them separate), also now colors are properly applied
* refactor: simplify hiding border, extended xml-doc for simple radial menu settings
* refactor: remove duplication of radial menu shaders, use ValueList to collect ClearExistingChildrenRadialButtons buttons to remove
* refactor: remove linq
* fix: fix AI radial action serialization using invalid type
* refactor: fix duplicate ShowDeviceNotRespondingPopup for AI by properly checking if it can interact
* refactor: removed *if* blocks from shader, replaced with branchless logic
* refactor: whitespaces, changed list to array in simple radial button preparing methods
* fix: merge duplicated code
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2025-04-10 20:42:53 +10:00
Vigers Ray
b619ca174a
Ахелпы сохраняются в базе данных
2025-04-08 05:09:44 +03:00
Vigers Ray
abca732f32
фикс апстрима
2025-04-03 03:17:38 +03:00
Vigers Ray
3ca70f5dc8
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Chat/UI/EmotesMenu.xaml.cs
# Content.Client/UserInterface/Controls/RadialMenu.cs
# Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
# Resources/ServerInfo/Guidebook/Security/Security.xml
2025-04-03 00:33:21 +03:00
Fildrance
19f3497b35
refactor: simple radial menu for easier creation ( #34639 )
...
* it works! kinda
* so it works now
* minor cleanup
* central button now is useful too
* more cleanup
* minor cleanup
* more cleanup
* refactor: migrated code from toolbox (as it was rejected as too specific)
* feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame
* refactor: major reworks!
* renamed DrawBagleSector to DrawAnnulusSector
* Remove strange indexing
* Regularize math
* refactor: re-orienting segment elements to be Y-mirrored
* refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button
* refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius.
* refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters
* refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly
* fix: enabled any functional keys pressed when pushing radial menu buttons
* fix: radial menu sector now scales with UIScale
* fix: accept only one event when clicking on radial menu ContextualButton
* fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always
* feat: simple radial menu prototype for easier creation
* refactor: cleanup, restored emote filtering, button models now have class hierarchy
* refactor: remove usage of closure from 'outside code'
* refactor: remove non existing type from UiControlTest
* refactor: remove unused using
* refactor: revert ability to declare radial menu layers in xaml, scale 32px sprites using scale in radial menu
* refactor: whitespaces
* refactor: subscribe for dispose on existing radial menus
* feat: now simple radial menu button models can have custom color for each sector background (and hover background color). Also added OpenOverMouseScreenPosition inside SimpleRadialMenu
* fix: AI door menu now can be closed by verb if it gets unpowered
* refactor: simplify hiding border, extended xml-doc for simple radial menu settings
* refactor: remove linq
* fix: fix AI radial action serialization using invalid type
* refactor: fix duplicate ShowDeviceNotRespondingPopup for AI by properly checking if it can interact
* refactor: whitespaces, changed list to array in simple radial button preparing methods
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2025-03-31 12:57:47 +03:00
metalgearsloth
0c98ad8b38
Fix 1x1 storage windows ( #35985 )
2025-03-29 19:57:28 +01:00
Vigers Ray
014e6ac131
Культ крови ( #847 )
...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: Babaev <129369024+babaevlsdd@users.noreply.github.com>
2025-03-29 14:46:54 +03:00
Vigers Ray
d0f5e8d361
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/validate-rgas.yml
# .github/workflows/validate-rsis.yml
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Options/UI/OptionsMenu.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Mindshield/MindShieldSystem.cs
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Content.Server/Standing/StandingStateSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/Markings/MarkingManager.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Implants/Components/SubdermalImplantComponent.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/VendingMachines/VendingMachineComponent.cs
# Resources/Audio/Lobby/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/forceghost.ftl
# Resources/Locale/en-US/_strings/clothing/components/fire-protection-component.ftl
# Resources/Locale/en-US/_strings/components/storage-voice-control-component.ftl
# Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/lathe/lathe-categories.ftl
# Resources/Prototypes/Access/command.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
# Resources/Prototypes/Catalog/thief_toolbox_sets.yml
# Resources/Prototypes/Datasets/Names/Operation_prefix.yml
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.yml
# Resources/Prototypes/Datasets/Names/arachnid_last.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/Names/clown.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Datasets/Names/fake_human_first.yml
# Resources/Prototypes/Datasets/Names/fake_human_last.yml
# Resources/Prototypes/Datasets/Names/first.yml
# Resources/Prototypes/Datasets/Names/first_female.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/Names/hologram.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Datasets/Names/moth_first_female.yml
# Resources/Prototypes/Datasets/Names/moth_first_male.yml
# Resources/Prototypes/Datasets/Names/moth_last.yml
# Resources/Prototypes/Datasets/Names/mushman_first.yml
# Resources/Prototypes/Datasets/Names/mushman_last.yml
# Resources/Prototypes/Datasets/Names/ninja.yml
# Resources/Prototypes/Datasets/Names/ninja_title.yml
# Resources/Prototypes/Datasets/Names/regalrat.yml
# Resources/Prototypes/Datasets/Names/reptilian_female.yml
# Resources/Prototypes/Datasets/Names/reptilian_male.yml
# Resources/Prototypes/Datasets/Names/revenant.yml
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Datasets/Names/wizard_first.yml
# Resources/Prototypes/Datasets/Names/wizard_last.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/corporations.yml
# Resources/Prototypes/Datasets/criminal_records.yml
# Resources/Prototypes/Datasets/rat_king_commands.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Head/specific.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
# Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Procedural/salvage_loot.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Species/arachnid.yml
# Resources/Prototypes/Species/diona.yml
# Resources/Prototypes/Species/moth.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/game_presets.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Interface/Misc/program_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
# Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/migration.yml
# Tools/actions_changelogs_since_last_run.py
2025-03-25 11:30:01 +03:00
Dakota
a8a73a611e
feat: Ghost Role Button only turns red when new ghost roles are added ( #35970 )
...
* feat: Ghost Role Button only turns red when new ghost roles are added
* fix: Make _prevNumberRoles private
2025-03-21 11:15:39 +11:00
metalgearsloth
9292e3a43c
Sloth's subfloor vismask adventure ( #35347 )
...
* Add a subfloor vismask
Significantly cuts down on sent entity count.
* More optimisations
* Fix command
* Fixes
* namespace cleanup
* Review
* Vismasks
* Content update
* Bandaid
* awewa
* Revert these
* reh
* Update Content.Shared/SubFloor/TrayScannerComponent.cs
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-03-21 00:57:04 +11:00
Evelyn Gordon
e0d6944822
Ensure speech bubble cap is always respected ( #32223 )
...
Ensure speech bubble cap is respected, even when messages are sent very fast
2025-03-10 13:28:08 +01:00
Coolsurf6
913894a041
Changed Damage Overlay to check Burn Damage ( #34535 )
...
* updated BruteLevel to be PainLevel with burn damage checks in DamageOverlayUiController.cs
* dehardcoded pain level by adding damage groups to paindamagegroups to affect
* re-added the name for painDamageGroups
* fixed overlay default and added minimum limit to component check first
* renamed to PainDamageGroups and removed obsolete tag
2025-03-03 12:11:58 +01:00
metalgearsloth
a8ebcac5c9
Predict vending machine UI ( #33412 )
2025-03-02 13:47:52 +11:00
Vigers Ray
10888fd269
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
# Content.Server/StationEvents/Events/PowerGridCheckRule.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/CCVar/CCVars.Game.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
# Resources/Locale/en-US/_strings/guidebook/cooking.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/antagonist.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/migration.yml
2025-02-26 22:01:48 +03:00
pathetic meowmeow
ab9c78b066
Make escape key work as expected with multiple open inventories ( #35040 )
2025-02-25 17:40:39 +01:00
Winkarst
b912dedbfc
New Feature: Admin Only messages in AHelp ( #35283 )
...
* Feature
* Update
* Update
* Update
* Update Resources/Locale/en-US/administration/bwoink.ftl
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Yes
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2025-02-22 09:45:50 -08:00
Vigers Ray
dc2ccc2378
Merge remote-tracking branch 'space-wizards/master'
2025-02-20 20:21:27 +03:00
metalgearsloth
abb20c0256
Remove storage hotbar GUI bandaid ( #35054 )
...
* Remove storage hotbar GUI bandaid
With BUI deferred opens it also happened to fix this issue which is nice.
* Update Content.Client/Storage/StorageBoundUserInterface.cs
2025-02-20 17:51:01 +01:00
