4032e0fb26
Merge branch 'stable' of https://github.com/space-wizards/space-station-14 into 2025-03-02-march-25-upstream-merge
2025-03-02 23:11:48 -05:00
634c4a7780
Fix window positions not saving ( #35055 )
...
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com >
2025-02-23 23:57:57 +11:00
fb457c9fcb
Merge commit '9a68cf0b0e67da5f5246ff7be8c35e0f0351015d' of https://github.com/space-wizards/space-station-14 into aug24-upstream-merge
2024-08-19 13:21:17 -04:00
b0cc97fb04
Fix Ripley control panel ( #30325 )
2024-07-24 23:23:52 -06:00
edb05e36bb
Reapply "Remove some BUI boilerplate" ( #30214 ) ( #30219 )
...
* Reapply "Remove some BUI boilerplate" (#30214 )
This reverts commit cb0ba66be3
2024-07-21 14:48:13 +10:00
cb0ba66be3
Revert "Remove some BUI boilerplate" ( #30214 )
...
Revert "Remove some BUI boilerplate (#28399 )"
This reverts commit cbf329a82d
2024-07-20 20:42:27 -04:00
cbf329a82d
Remove some BUI boilerplate ( #28399 )
...
* Remove some BUI boilerplate
- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.
* More
* moar
* weh
* done
* More BUIs
* More updates
* weh
* moar
* look who it is
* weh
* merge
* weh
* fixes
2024-07-20 15:40:16 +10:00
813b84deca
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into june24-upstream-merge
2024-06-16 20:54:14 -04:00
1f67733775
fix mech energy display for 0 ( #27828 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-08 22:55:15 -07:00
c59a450165
Merge remote-tracking branch 'upstream/master' into upstream_merge_sept23
...
# Conflicts:
# Content.Client/Ghost/GhostSystem.cs
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
# Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
# Content.IntegrationTests/Tests/CargoTest.cs
# Content.IntegrationTests/Tests/EntityTest.cs
# Content.Server/Botany/Systems/MutationSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
# Content.Server/Cloning/CloningSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Power/Components/ApcComponent.cs
# Content.Server/Power/EntitySystems/ApcSystem.cs
# Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
# Content.Server/Salvage/SalvageSystem.Expeditions.cs
# Content.Server/Salvage/SpawnSalvageMissionJob.cs
# Content.Server/Shuttles/Systems/ThrusterSystem.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/Warps/WarpPointComponent.cs
# Content.Shared/CCVar/CCVars.cs
# Content.Shared/Ghost/SharedGhostComponent.cs
# Content.Shared/StationRecords/SharedGeneralStationRecordConsoleSystem.cs
# Resources/Changelog/Changelog.yml
# Resources/Prototypes/Catalog/Cargo/cargo_food.yml
# Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
# Resources/Prototypes/Catalog/Fills/Crates/food.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
# Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
# Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
# Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
# Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
# Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
# Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
# Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
# Resources/Prototypes/Entities/Structures/Machines/research.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
# Resources/Prototypes/Entities/Structures/hydro_tray.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/ServerInfo/Rules.txt
2023-09-11 15:17:04 -04:00
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
11a57be230
Remove usages of obsolete SpriteView.Sprite.set() ( #19500 )
2023-08-25 11:16:46 +10:00
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
d549f5de91
Merge remote-tracking branch 'upstream/master' into july_23_upstream_merge
...
# Conflicts:
# Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml
# Content.Client/Configurable/UI/ConfigurationMenu.cs
# Content.Client/PDA/PdaNavigationButton.xaml.cs
# Content.Client/Shuttles/UI/RadarControl.cs
# Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
# Content.IntegrationTests/Tests/CargoTest.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
# Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
# Content.Server/Fluids/EntitySystems/DrainSystem.cs
# Content.Server/Salvage/SalvageSystem.Expeditions.cs
# Content.Server/Salvage/SpawnSalvageMissionJob.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs
# Content.Shared/Construction/Conditions/NoWindowsInTile.cs
# Content.Shared/Doors/Systems/SharedDoorSystem.cs
# Content.Shared/Fluids/Components/DrainComponent.cs
# Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
# Resources/Changelog/Changelog.yml
# Resources/ConfigPresets/Build/development.toml
# Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl
# Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl
# Resources/Maps/Dungeon/lava_brig.yml
# Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
# Resources/Prototypes/Catalog/Cargo/cargo_security.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/XenoArch/Effects/normal_effects.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Rules.txt
2023-07-23 22:41:25 -04:00
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
45742a2869
Frontier Station ( #1 )
...
base game mode
2023-06-30 22:46:08 -04:00
bc101e1fb5
H.O.N.K. mech ( #14670 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-05 23:21:13 +10:00
ec28358e06
Remove mech component references ( #15246 )
2023-04-09 15:20:55 -07:00
5a5a3afbb1
Remove some obsolete AppearanceComponent method usages ( #13726 )
2023-02-02 12:34:53 -04:00
913e1ee676
Exosuit: Ripley ( #12668 )
...
* mechs
* interaction relay
* atmos handling
* fuck around with interaction events
SPAGHETTI CODE OH MY GOD
* more sprites and whatever the hell
* more mech shit
* more shit for equipment
* starting equipment (for nukie mechs and such)
* equipment cycling
* starting with some of the ui
* a fat chunk of ui prototyping
* done tinkering with ui
* a bunch of ui stuff and what have yous
* cleaning up grabber and state handling
* make the ui actually functional + watch me port a million icons
I swear i'll prune the sprites later blease
* start on construction
* construction yo mamma
* remove some unused files
* fix a silly
* make the graph sane
* make it actually constructible.
* print the boards as well, bozo
* rebalance part prices
* eject action
also i appease the russians by remembering to localize
* Punch Shit
* make mech integrity and repairs work
* Make the UI more based
STOMP STOMP STOMP STOMP
* make equipment even more based
* batteries and other such delights
* make the ui look pimpin af
* make the construction mega based
* UI but so epic
* equipment
* some sweat tweaks
* damage rebalancing
* restructure tech
* fix some shit
* mechs inherit access
* make icons actually use sprite specifiers
* TRAILING COMMAA!!!!!
* fix a mild indentation sin
* undo this change because it isn't needed
* actually fix this
* secret webeditting shhhh
* place this tech here
* comments
* foo
2022-12-10 11:05:39 -06:00
Whatstone