Jabkas
7282ac2471
Merge remote-tracking branch 'upstream/master'
2024-05-27 08:43:42 +03:00
Jabkas
134f27b87d
Я ДОЛБАЁБ ОУ ОУ, Я СМОТРЮ АНИМЕ
2024-05-23 21:58:02 +03:00
Jabkas
7154b3ecd1
Хуй его знает. Поможет или нет. Может всё сломает к хуям
2024-05-23 21:45:11 +03:00
Remuchi
e2b6002076
Merge remote-tracking branch 'origin/master' into upstream
...
# Conflicts:
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Changeling/ChangelingRuleSystem.cs
# Content.Server/Changeling/ChangelingSystem.Abilities.cs
# Content.Server/Doors/Systems/DoorSystem.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
# Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
# Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
# Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
# Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
# Content.Server/_White/Keyhole/KeyholeSystem.cs
# Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
# Resources/Locale/ru-RU/White/stuff.ftl/runes-entities.ftl
# Resources/Locale/ru-RU/_white/cult/blood-spear.ftl
# Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
# Resources/Locale/ru-RU/_white/cult/cult.ftl
# Resources/Locale/ru-RU/_white/cult/gui.ftl
# Resources/Locale/ru-RU/cult/cult-structure.ftl
# Resources/Locale/ru-RU/cult/pylon.ftl
# Resources/Maps/White/Scoupidia.yml
# Resources/Maps/White/Void.yml
# Resources/Maps/White/WonderBox.yml
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.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/Furniture/dresser.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/Entities/Structures/stairs.yml
# Resources/Prototypes/_White/Entities/Objects/Misc/books.yml
2024-04-13 13:59:00 +07:00
Valtos
7616fba3f5
continue-on-error: true
2024-04-10 00:49:31 +03:00
Valtos
4f29ef8885
always true
2024-04-08 22:10:38 +03:00
Remuchi
0b2238b57a
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/Administration/Commands/AdminWhoCommand.cs
# Content.Server/Bed/Sleep/SleepingSystem.cs
# Content.Server/Body/Components/BloodstreamComponent.cs
# Content.Server/Body/Components/RespiratorComponent.cs
# Content.Server/Body/Systems/InternalsSystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Chat/Managers/IChatManager.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
# Content.Server/Electrocution/ElectrocutionSystem.cs
# Content.Server/Holosign/HolosignProjectorComponent.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs
# Content.Shared/Cuffs/SharedCuffableSystem.cs
# Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
# Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/box.yml
# Resources/Maps/centcomm.yml
# Resources/Maps/cluster.yml
# Resources/Maps/europa.yml
# Resources/Maps/marathon.yml
# Resources/Maps/meta.yml
# Resources/Maps/omega.yml
# Resources/Maps/origin.yml
# Resources/Maps/packed.yml
# Resources/Maps/reach.yml
# Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
# Resources/Prototypes/Entities/Clothing/Hands/colored.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
# Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
# Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
# Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
# Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
2024-03-30 10:36:17 +07:00
Pieter-Jan Briers
a30fb1fffa
Update close-master-pr.yml ( #26416 )
...
Fix name of "Close PRs on master" workflow
2024-03-24 23:47:30 +01:00
Pieter-Jan Briers
89db4409a4
Remove CRLF, enforce with workflow ( #26401 )
...
* Check for CRLF in actions workflow
Make emisse weep
* Copy paste bottom text
* I would like to thank StackOverflow for this spite PR.
* Mention file name in message because the workflow tab doesn't display it.
* dos2unix everything
2024-03-24 22:06:17 +01:00
Pieter-Jan Briers
0303e9cb36
Adds "untriaged" labeler workflow ( #26392 )
...
All new opened issues automatically get marked as "untriaged", so a maintainer can go through them properly.
2024-03-24 18:19:32 +01:00
Valtos
0aac8fa3d9
шагай обратно еблан контуженный блядь
2024-03-15 11:42:16 +03:00
Valtos
3a129a61e5
ДА ПОШЁЛ ТЫ В ПИЗДУ
2024-03-15 11:40:32 +03:00
Valtos
0a35d2945f
return changelogs
2024-02-24 18:09:14 +03:00
Valtos
6e64b67f90
remove changelogs
2024-02-24 18:08:46 +03:00
Valtos
eef70d9717
Update publish.yml ( #107 )
2024-02-21 11:07:26 +00:00
Aviu00
22db173b81
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
Vasilis
5d5c4c4772
Action for closing prs submitted by the submitters master branch ( #24094 )
...
* Action for closing master prs
* Spelling mistakes and better msg
* a
2024-02-02 01:05:01 +11:00
RavMorgan
44ad721a3a
Revert "Revert "self-hosted" ( #94 )" ( #98 )
...
This reverts commit 047171a475a56d94dacc10ba4c96222a543a2e15.
Co-authored-by: Mona Hmiza <>
2024-01-17 12:08:39 +03:00
RavMorgan
a8ac3c34bc
Revert "self-hosted" ( #94 )
...
* Revert "self-hosted"
2024-01-17 12:08:17 +03:00
RavMorgan
436eb398ce
self-hosted
2024-01-17 12:07:57 +03:00
RavMorgan
514c7d0513
Update labeler-pr.yml ( #92 )
2024-01-17 12:06:28 +03:00
RavMorgan
dcf55a24ed
Update validate-rsis.yml ( #90 )
...
RSI validator
2024-01-17 12:06:19 +03:00
rhailrake
df7aadd830
[feat] Species lock for jobs
2024-01-11 08:05:00 +03:00
Matt
40e4d43c3b
feat: add xsl stylesheet to changelogs ( #21930 )
2024-01-07 04:02:36 +01:00
Pieter-Jan Briers
d0e77303dd
.NET 8 compatibility ( #22461 )
2023-12-15 18:19:48 +01:00
Vasilis
d4490f7035
Fixed credits action failing ( #21733 )
2023-12-09 13:15:38 +11:00
metalgearsloth
b9c38879e5
Port python packaging to Content.Packaging ( #21458 )
2023-11-07 09:53:59 +11:00
Vasilis
eb833335d9
Github actions script to update ingame credits for contributors ( #20345 )
2023-10-09 16:42:53 -07:00
DrSmugleaf
90404450d4
Remove windows-latest CI runs, remove unused build-test-release.yml ( #20540 )
2023-09-28 15:46:26 -07:00
Kevin Zheng
f6d07b6b2e
Remove old wiki update workflow ( #20385 )
2023-09-22 14:54:50 -05: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
DrSmugleaf
f9c3e6e00c
Add CI workflow to build and run the map renderer on the Dev map ( #19548 )
2023-08-25 14:57:00 -07:00
Leon Friedrich
5a9317027f
Warn on improperly disposed tests. ( #18594 )
2023-08-03 13:07:21 +10:00
Pieter-Jan Briers
7bfc322ff2
Publish changelogs via RSS ( #17788 )
2023-07-02 14:18:39 +02:00
Pieter-Jan Briers
497be5a470
Project files CI changes ( #14466 )
2023-03-10 11:58:57 -08: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
Pieter-Jan Briers
587e173bcc
Oopsied the workflow file, awesome. ( #14293 )
2023-02-26 17:48:06 +01:00
Pieter-Jan Briers
61a671bbc6
Send changelog to Discord webhook. ( #14292 )
2023-02-26 17:45:06 +01: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
metalgearsloth
033e87aa3b
Don't run CI For PJBot ( #13188 )
...
I have no idea what I'm doing
2022-12-26 17:37:57 -06:00
Pieter-Jan Briers
14f8b4e6d5
Use new validate-rsis for workflow ( #12997 )
...
* Use new validate-rsis for workflow
* A
* Add python deps
* --ignore-installed
* Make it only work on RSI changes again.
* Fix a bunch of RSIs.
2022-12-20 06:31:17 +01:00
0x6273
8c52dac3f3
Update setup-dotnet in gh actions ( #12261 )
2022-10-30 12:05:51 -07:00
Moony
b03f17bda2
Update update-wiki.yml ( #12189 )
...
let ME DISPATCH THE WORKFLOW E
2022-10-25 14:52:50 -05:00
DrSmugleaf
df8973593f
Run YAML schema validators on pull requests ( #12156 )
2022-10-22 20:05:05 -07:00
Paul Ritter
ffbf2aa901
hotfix benchmarks ( #11855 )
2022-10-12 01:24:34 +02:00
Paul Ritter
216dba2e3b
removes unused benchmark action trigger ( #11852 )
2022-10-11 20:54:56 +02:00
Paul Ritter
4ef3891e9e
updates submodule & fixes content benchmarks & sets up ci ( #11851 )
2022-10-11 20:51:52 +02:00
wrexbe
9add0e329f
Update Engine to 0.40.3.0, put yaml action back ( #10600 )
2022-08-14 14:25:48 -07:00
