tau
|
b8c68d44ce
|
Tests changes (#300)
* Revert "Респрайт муринов (#245)"
This reverts commit d267583601.
* Test offmed add
* Offmed brang
|
2025-10-14 00:27:27 +03:00 |
|
JerryImMouse
|
f76d1edf27
|
Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts:
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# 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/job_icons.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png
# 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/chili.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json
# Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
|
2025-03-27 23:01:47 +05:00 |
|
Myra
|
57e3f0494e
|
Upgrade GitHub actions in Workfows to node20 (#33668)
|
2025-03-23 13:54:56 +01:00 |
|
Morb0
|
6106783f01
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# .github/labeler.yml
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.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/last.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Mobs/Vox.xml
# Resources/ServerInfo/Guidebook/Science/APE.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
|
2024-12-26 00:30:02 +03:00 |
|
Myra
|
fb6e85e87e
|
Test can now run on stable prs (#33914)
Make tests also run on stable and staging
|
2024-12-17 20:40:57 +01:00 |
|
Nikolai Korolev
|
ecb6540c61
|
Upgrade Github actions in Workfows to node20
|
2024-11-30 22:35:11 +00:00 |
|
Morb0
|
1b513f0c1a
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
|
2023-08-29 05:58:14 +03:00 |
|
DrSmugleaf
|
d1eea3f6f6
|
Update CI to use .NET 7.0.x, setup-dotnet 3.2.0, checkout 3.6.0 (#19552)
|
2023-08-25 15:33:01 -07:00 |
|
Morbo
|
60dd232b44
|
Ignore IanComradeBot in workflows
|
2023-04-04 15:40:13 +03:00 |
|
Morbo
|
a33dfe1de8
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/ISSUE_TEMPLATE/config.yml
|
2023-03-11 07:49:26 +03:00 |
|
Pieter-Jan Briers
|
497be5a470
|
Project files CI changes (#14466)
|
2023-03-10 11:58:57 -08:00 |
|
Morbo
|
82a466f4ff
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Resources/Audio/Announcements/license.txt
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
|
2023-03-07 18:54:29 +03:00 |
|
Moony
|
028fa395d8
|
fix bors config (#14389)
i did an oops
|
2023-03-04 23:56:55 +00:00 |
|
Moony
|
7232bf4ba4
|
Configure and enable bors (#14383)
* Update build-test-debug.yml
* Update build-test-release.yml
* Update test-packaging.yml
* Update validate_mapfiles.yml
* Update yaml-linter.yml
* Update validate-rsis.yml
* Update validate-rgas.yml
* Create bors.toml
|
2023-03-03 22:55:05 -06:00 |
|
Morb
|
fdfafd06e7
|
Add evil twin + Secrets (#823)
|
2023-02-18 23:49:55 -08:00 |
|
Moony
|
202680ac56
|
Enable merge group checks for our workflows. (#14005)
* Enable merge group checks for our workflows.
* Update build-test-release.yml
* Update validate-rgas.yml
* Update validate-rsis.yml
* Update validate_mapfiles.yml
* Update yaml-linter.yml
* Update test-packaging.yml
|
2023-02-09 16:35:34 +00:00 |
|
metalgearsloth
|
0e8b8c0735
|
Don't run gh actions on draft prs (#13706)
|
2023-01-26 14:37:28 -08:00 |
|
DrSmugleaf
|
df8973593f
|
Run YAML schema validators on pull requests (#12156)
|
2022-10-22 20:05:05 -07:00 |
|
Paul Ritter
|
f69fb1d9ce
|
Validates yaml schemas from engine (#10133)
Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
|
2022-08-13 22:46:53 -07:00 |
|