NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 02:41:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
21874 commits 14 branches 0 tags 2.9 GiB
Commit graph

166 commits

Author SHA1 Message Date
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
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
Morb0
1f35458078 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Entities/Mobs/Player/diona.yml
#	Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png
#	Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/dark_plastic.png
#	Resources/Textures/Tiles/plastic.png
#	Resources/Textures/Tiles/steel_dirty.png
#	Resources/Textures/Tiles/white_plastic.png
 2023-08-05 05:10:09 +03:00
Leon Friedrich
5a9317027f
Warn on improperly disposed tests. (#18594) 2023-08-03 13:07:21 +10:00
Morb
7167fdb504
Disable Discord changelog (#1205) 2023-07-13 18:56:54 +03:00
faint
31f283cc8e Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-07-04 03:14:11 +03:00
Pieter-Jan Briers
7bfc322ff2
Publish changelogs via RSS (#17788) 2023-07-02 14:18:39 +02:00
Morbo
8febc3aac2 Copy secrets directories recursively 2023-04-16 11:09:13 +03:00
Morbo
cb971528e1 Just copy secret folders 2023-04-16 11:07:28 +03:00
Morbo
4efe21b213 Correct secrets setup 2023-04-16 10:55:20 +03:00
Morbo
8dec7bafe9 Call prototypes secret directory setup 2023-04-16 10:26:54 +03: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
Morbo
cdaecf70bc Add translation api secret to workflow 2023-03-01 14:11:34 +03:00
Morbo
0e5004268b Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
 2023-02-28 20:00:24 +03: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
Morbo
b93625f808 Fix publish workflow 2023-02-20 05:27:21 +03:00
Morb
fdfafd06e7
Add evil twin + Secrets (#823) 2023-02-18 23:49:55 -08:00
Morbo
8cdd0cda60 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Server Info/Guidebook/Controls/Controls.xml
 2023-02-12 03:57:54 +03: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
Morbo
8bff10af81 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-27 21:05:54 +03:00
metalgearsloth
0e8b8c0735
Don't run gh actions on draft prs (#13706) 2023-01-26 14:37:28 -08:00
Morbo
88d2445740 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/origin.yml
 2023-01-01 01:21:40 +03: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
Morbo
6343d1e1f8 Merge remote-tracking branch 'upstream/master' into master-syndie 
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
 2022-12-20 14:15:13 +03: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
Morb
2f365fc41a
GitHub files update (#633) 2022-12-10 22:48:56 -08:00
Morbo
efa9d6561f Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/workflows/build-docfx.yml
 2022-10-31 15:36:01 +03:00
0x6273
8c52dac3f3
Update setup-dotnet in gh actions (#12261) 2022-10-30 12:05:51 -07:00
Morbo
228c19c52c Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/white.png
 2022-10-28 17:19:32 +03:00
Moony
b03f17bda2
Update update-wiki.yml (#12189) 
let ME DISPATCH THE WORKFLOW E
 2022-10-25 14:52:50 -05:00
Morbo
a93a3fb752 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/bar.png
#	Resources/Textures/Tiles/clown.png
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/hydro.png
#	Resources/Textures/Tiles/kitchen.png
#	Resources/Textures/Tiles/laundry.png
#	Resources/Textures/Tiles/steel.png
#	Resources/Textures/Tiles/steel_dirty.png
#	Resources/Textures/Tiles/white.png
 2022-10-23 17:55:21 +03:00
DrSmugleaf
df8973593f
Run YAML schema validators on pull requests (#12156) 2022-10-22 20:05:05 -07:00
Morbo
ae8cb2688c Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-14 07:21:01 +03: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
Morbo
6b74e70360 Merge remote-tracking branch 'upstream/master' into test2 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Textures/Tiles/attributions.yml
 2022-08-16 00:21:46 +03:00
wrexbe
9add0e329f
Update Engine to 0.40.3.0, put yaml action back (#10600) 2022-08-14 14:25:48 -07:00
wrexbe
31b93dfd72
Fix for yaml attributes (#10599) 2022-08-14 14:05:27 -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
Arthur
d7f11d74b2 Fix changes workflow name 2022-08-06 03:06:23 +03:00
Arthur
1315833cc0 Add labeler workflow permissions 2022-08-06 03:01:52 +03:00
Arthur
0fdcab8109 Add workflow for auto change requested PR labels 2022-08-06 01:51:07 +03:00