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 |
|
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 |
|
Leon Friedrich
|
921e2ee57d
|
BUI changes required for Engine PR (#10608)
|
2022-08-21 03:38:30 +10: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 |
|
20kdc
|
70cd3d18ca
|
Power Monitoring Console (#7849)
|
2022-05-04 10:59:40 -07:00 |
|