]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Improved RCDs (#22799)
authorchromiumboy <50505512+chromiumboy@users.noreply.github.com>
Sun, 31 Mar 2024 04:29:47 +0000 (23:29 -0500)
committerGitHub <noreply@github.com>
Sun, 31 Mar 2024 04:29:47 +0000 (23:29 -0500)
commit02273ca0e7a4091bac88e585ecca5253dd0e7fd7
tree84804e464c7bea5fe1b6bcb6645d8a9afa7d74eb
parent4d2aa1a70a4226cc65399907484c68fdda9e5e5d
Improved RCDs (#22799)

* Initial radial menu prototyping for the RCD

* Radial UI buttons can send messages to the server

* Beginning to update RCDSystem

* RCD building system in progress

* Further updates

* Added extra effects, RCDSystem now reads RCD prototype data

* Replacing tiles is instant, multiple constructions are allowed, deconstruction is broken

* Added extra functionality to RadialContainers plus documentation

* Fixed localization of RCD UI strings

* Menu opens near cursor, added basic RCD

* Avoiding merge conflict

* Implemented atomized construction / deconstruction rules

* Increased RCD ammo base charges

* Moved input context definition to content

* Removed obsoleted code

* Updates to system

* Switch machine and computer frames for electrical cabling

* Added construction ghosts

* Fixed issue with keybind detection code

* Fixed RCD construction ghost mispredications

* Code clean up

* Updated deconstruction effects

* RCDs effects don't rotate

* Code clean up

* Balancing for ammo counts

* Code clean up

* Added missing localized strings

* More clean up

* Made directional window handling more robust

* Added documentation to radial menus and made them no longer dependent on Content

* Made radial containers more robust

* Further robustness to the radial menu

* The RCD submenu buttons are only shown when the destination layer has at least one children

* Expanded upon deconstructing plus construction balance

* Fixed line endings

* Updated list of RCD deconstructable entities. Now needs a component to deconstruct instead of a tag

* Bug fixes

* Revert unnecessary change

* Updated RCD strings

* Fixed bug

* More fixes

* Deconstructed tiles/subflooring convert to lattice instead

* Fixed failed tests (Linux doesn't like invalid spritespecifer paths)

* Fixing merge conflict

* Updated airlock assembly

* Fixing merge conflict

* Fixing merge conflict

* More fixing...

* Removed erroneous project file change

* Fixed string handling issue

* Trying to fix merge conflict

* Still fixing merge conflicts

* Balancing

* Hidden RCD construction ghosts when in 'build' mode

* Fixing merge conflict

* Implemented requested changes (Part 1)

* Added more requested changes

* Fix for failed test. Removed sussy null suppression

* Made requested changes - custom construction ghost system was replaced

* Fixing merge conflict

* Fixed merge conflict

* Fixed bug in RCD construction ghost validation

* Fixing merge conflict

* Merge conflict fixed

* Made required update

* Removed lingering RCD deconstruct tag

* Fixing merge conflict

* Merge conflict fixed

* Made requested changes

* Bug fixes and balancing

* Made string names more consistent

* Can no longer stack catwalks
100 files changed:
Content.Client/Input/ContentContexts.cs
Content.Client/RCD/AlignRCDConstruction.cs [new file with mode: 0644]
Content.Client/RCD/RCDConstructionGhostSystem.cs [new file with mode: 0644]
Content.Client/RCD/RCDMenu.xaml [new file with mode: 0644]
Content.Client/RCD/RCDMenu.xaml.cs [new file with mode: 0644]
Content.Client/RCD/RCDMenuBoundUserInterface.cs [new file with mode: 0644]
Content.Client/Stylesheets/StyleNano.cs
Content.Client/UserInterface/Controls/RadialContainer.cs [new file with mode: 0644]
Content.Client/UserInterface/Controls/RadialMenu.cs [new file with mode: 0644]
Content.Shared/Charges/Systems/SharedChargesSystem.cs
Content.Shared/Construction/Components/ComputerBoardComponent.cs
Content.Shared/RCD/Components/RCDAmmoComponent.cs
Content.Shared/RCD/Components/RCDComponent.cs
Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs [new file with mode: 0644]
Content.Shared/RCD/RCDEvents.cs [new file with mode: 0644]
Content.Shared/RCD/RCDPrototype.cs [new file with mode: 0644]
Content.Shared/RCD/Systems/RCDSystem.cs
Resources/Locale/en-US/rcd/components/rcd-component.ftl
Resources/Locale/en-US/ui/general.ftl [new file with mode: 0644]
Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
Resources/Prototypes/Entities/Effects/chemistry_effects.yml
Resources/Prototypes/Entities/Effects/rcd.yml
Resources/Prototypes/Entities/Markers/construction_ghost.yml
Resources/Prototypes/Entities/Objects/Tools/tools.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
Resources/Prototypes/Entities/Structures/Power/cables.yml
Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
Resources/Prototypes/Entities/Structures/Walls/grille.yml
Resources/Prototypes/Entities/Structures/Walls/railing.yml
Resources/Prototypes/Entities/Structures/Walls/walls.yml
Resources/Prototypes/Entities/Structures/Windows/mining.yml
Resources/Prototypes/Entities/Structures/Windows/plasma.yml
Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
Resources/Prototypes/Entities/Structures/Windows/uranium.yml
Resources/Prototypes/Entities/Structures/Windows/window.yml
Resources/Prototypes/Entities/Structures/catwalk.yml
Resources/Prototypes/RCD/rcd.yml [new file with mode: 0644]
Resources/Prototypes/tags.yml
Resources/Textures/Effects/rcd.rsi/construct.png [deleted file]
Resources/Textures/Effects/rcd.rsi/construct0.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/construct1.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/construct2.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/construct3.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/construct4.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/deconstruct2.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/deconstruct4.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/deconstruct6.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/deconstruct8.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/deconstructPreview.png [new file with mode: 0644]
Resources/Textures/Effects/rcd.rsi/meta.json
Resources/Textures/Interface/Radial/RCD/airlock.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/airlocks.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/bulb_light.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/cable_terminal.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/catwalk.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/computer_frame.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/computers_and_frames.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/deconstruct.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/directional.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/directional_reinforced.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/firelock.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/glass_airlock.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/grille.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/hv_coil.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/lighting.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/lv_coil.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/machine_frame.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/metal_tile.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/multicoil.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/mv_coil.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/plating.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/reinforced_wall.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/solid_wall.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/tube_light.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/walls_and_flooring.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/window.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/window_reinforced.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/back_hover.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/back_normal.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/button_hover.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/button_normal.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/close_hover.png [new file with mode: 0644]
Resources/Textures/Interface/Radial/close_normal.png [new file with mode: 0644]