Morb0
4ee0df9498
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Structures/stairs.rsi/meta.json
# Resources/Textures/Structures/stairs.rsi/stairs.png
# Resources/Textures/Structures/stairs.rsi/stairs_stage.png
2024-02-22 13:19:02 +03:00
James Simonson
99aa72e30d
Vending UI facelift ( #25377 )
...
* Convert to fancy window + added footer + add list spacing
* margin add
2024-02-19 15:18:26 -07:00
Morb0
32a8d1a21e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Server/Power/Generator/GeneratorSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png
2024-02-03 03:38:29 +03:00
Kara
e212b10ca2
Open some windows non-centered to avoid covering the player ( #24767 )
2024-02-01 23:49:48 +11:00
Morb0
3cb4017c90
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Audio/Announcements/license.txt
# Resources/Audio/Effects/Shuttle/licenses.txt
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-11-14 16:35:33 +03:00
themias
cf6eb200be
Remove need to toggle vending machine button ( #21543 )
2023-11-08 18:42:07 -07:00
Morb0
681762aca7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
2023-10-28 14:14:36 +03:00
Nemanja
0253270a9a
fix searching on vending machines ( #21233 )
2023-10-26 00:01:16 +11:00
Morb0
13b3bfa217
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/update-wiki.yml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/Markings/MarkingPrototype.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/manifest.yml
2023-09-24 12:56:24 +03:00
ike709
3ee729f3fd
Adds a search bar to vending machines ( #20326 )
...
* Adds a search bar to vending machines
* fix indentation
* whitespace again
---------
Co-authored-by: ike709 <ike709@github.com>
2023-09-20 15:40:41 -04:00
Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
metalgearsloth
99b77bc2d3
Remove lights compref ( #19531 )
2023-09-11 19:18:06 +10:00
faint
076d2e339b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
2023-07-10 07:03:24 +03:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
Morbo
13d74575f3
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-12-25 20:25:04 +03:00
Nemanja
faca40b8d5
more component ref removal + combining server/client comps ( #13178 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-25 05:28:21 +01:00
Morbo
bdd758ea49
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2022-12-21 20:29:22 +03:00
AJCM-git
c7ec03d2fb
TryGetData() Generics support content changes ( #13053 )
2022-12-20 14:24:55 -08:00
Morb
6ad4a10b29
Repository cleanup ( #631 )
2022-12-10 12:10:27 -08:00
Morb
a3661b0fe8
Change windows size ( #515 )
2022-11-04 08:20:44 -07:00
Mervill
69dd3a0454
Vending machines properly show their current state after an animation ( #12201 )
2022-10-30 17:12:05 +11:00
metalgearsloth
600c0e3255
Fix a few warnings ( #11576 )
2022-10-04 14:24:19 +11:00
Andreas Kämper
42f3155c85
Clean up vending machines and port their visualizer ( #10465 )
2022-08-31 05:12:09 -07:00
Leon Friedrich
921e2ee57d
BUI changes required for Engine PR ( #10608 )
2022-08-21 03:38:30 +10:00
Visne
58769634c7
Fix a bunch of compiler warnings ( #10518 )
2022-08-13 22:28:34 -07:00
metalgearsloth
45bd1edd5b
Revert "Update submodule to 0.34.0.0 ( #10356 )" ( #10359 )
2022-08-06 16:48:21 +10:00
Leon Friedrich
e06ea56eb2
Content BUI changes for engine PR ( #10308 )
2022-08-06 14:59:02 +10:00
Leon Friedrich
5449e7875e
Vending visualizer update ( #9962 )
2022-07-26 10:35:36 +10:00
Flipp Syder
8f223586d4
Vending machine changes ( #8060 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-10 12:22:58 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
Fishfish458
b837b186a5
Attempted Small Vending Machine Refactor ( #6157 )
...
Co-authored-by: fishfish458 <fishfish458>
2022-01-31 15:16:41 +11:00
wrexbe
cea1b21832
Fixing some warnings ( #6250 )
...
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2022-01-21 10:38:35 +01:00
wrexbe
5ceb2372bf
Clean up some warnings ( #6088 )
...
* Clean up some warnings
* Remove nullable enable
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-01-09 22:10:36 -06:00
Vera Aguilera Puerto
2699540526
Remove useless resolves from a buncha tests.
2021-12-08 12:46:30 +01:00
DrSmugleaf
2a3b7d809d
Fix 3000 errors
2021-12-05 18:09:01 +01:00
Vera Aguilera Puerto
5cd42c9ad6
Inline UID
2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
ee4ff9cfe8
Inline Name
2021-12-03 15:25:51 +01:00
Vera Aguilera Puerto
69b270017b
Inline TryGetComponent completely, for real
2021-12-03 14:17:01 +01:00
Vera Aguilera Puerto
0feebbff00
Inline HasComponent entirely
2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
b835bea086
Inline GetComponent
2021-12-03 11:55:25 +01:00
Vera Aguilera Puerto
f64df117be
Inline AddComponent
2021-12-03 11:33:40 +01:00
Swept
8e802b4305
Refactors Vending Menu to XAML-UI ( #4614 )
...
* Initial
* Some web-edit reviews
* Keep VV
* Applied Reviews
2021-09-19 17:21:05 +00:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00
Swept
fd2a081539
Slims down disposal unit ui and fixes thrown collisions ( #4122 )
...
* Cleans up disposal unit yaml and fixes inability to throw things in them.
* Comments out mailing units because they are beyond broken and need a refactor.
* Makes Disposal UI look better
* Localized the disposal unit
* Removes title line
* Removes changes to VendingMachineMenu, mistakenly committed.
* Applies code reviews
* Now uses BaseMachinePowered
2021-06-03 17:26:08 -07:00
mirrorcult
e4169ecf0d
Fix minsizes for all windows that needed it ( #3648 )
...
* fix minsizes
* fix scanner height, minsize->setsize for some
2021-03-15 09:38:08 +01:00
DrSmugleaf
902aa128c2
Enable nullability in Content.Client ( #3257 )
...
* Enable nullability in Content.Client
* Remove #nullable enable
* Merge fixes
* Remove Debug.Assert
* Merge fixes
* Fix build
* Fix build
2021-03-10 14:48:29 +01:00
Pieter-Jan Briers
b898443f28
WPF layout ( #3346 )
2021-02-21 12:38:56 +01:00
Acruid
ca4fd649fe
Massive Namespace Cleanup ( #3120 )
...
* Engine namespace changes.
* Automated remove redundant using statements.
* Simplified Graphics namespace.
* Apparently the container system stores full type names in the map file.😞 This updates those names.
* API Changes to LocalizationManager.LoadCulture.
* Update submodule to v0.3.2
2021-02-11 01:13:03 -08:00
Paul Ritter
68031990a2
Readds Iconcomponent ( #2142 )
...
* icon fix
* stuff
* directional texture rework
2020-09-28 20:53:47 +02:00
