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

194 commits

Author SHA1 Message Date
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
wrexbe
741c5a3c60
Remove self from test co-owner (#13131) 2022-12-21 06:13:10 -08: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
Kara
a5d25fc75a
Condense PR template a bit (#13021) 2022-12-13 16:37:17 -08:00
Morb
2f365fc41a
GitHub files update (#633) 2022-12-10 22:48:56 -08:00
Morbo
f032966976 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/ISSUE_TEMPLATE/config.yml
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Recipes/Lathes/medical.yml
#	Resources/Textures/Structures/Machines/microwave.rsi/meta.json
 2022-12-07 08:34:29 +03:00
Kara
8cc2e2579e
Update issue & PR template (#12884) 
* Update issue & PR template

* p

* oop
 2022-12-04 18:22:56 -06:00
Paul Ritter
d6be5d2df3
im back (#12705) 2022-11-22 00:12:02 +01:00
Paul Ritter
03e8076915
Update CODEOWNERS (#12647) 2022-11-17 12:00:10 +01: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
wrexbe
aaf0b34d0b
Add self to code owners (#10634) 2022-08-15 20:32:40 -07: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
Arthur
e4ffbc56e9 Try remove only one label on approve 2022-07-31 21:11:52 +03:00
Arthur
df603cc904 Return Github wiki WIKI_PAGE_ROOT 2022-07-29 23:50:24 +03:00
Arthur
3474f82f03 Use Github secrets for wiki upload workflow 2022-07-29 20:42:29 +03:00
AJCM-git
c98cd0a836
Adding a PR guidelines link to the github PR tempalte (#10057) 2022-07-26 17:36:04 -07:00
Arthur
783a47a95c Use rsync to ignore duplicate uploads & move server info to secrets 2022-07-17 05:08:10 +03:00
Arthur
a1dac73500 Fix approve labeler workflow 2022-07-02 22:30:13 +03:00
Arthur
a5fa8904ec Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
 2022-06-24 04:58:34 +03:00
ike709
640e2dac89
Stop labeling draft PRs with merge conflicts (#9089) 2022-06-23 18:25:34 -07:00
Arthur
49afa5c89e Add workflow to remove statuses after approve 2022-06-23 15:33:16 +03:00
Morber
8831ce3b97
Fix labeler localization path 2022-06-21 01:24:26 +03:00
Arthur
038923bfe5 Add localization change label 2022-06-20 07:58:04 +03:00
wrexbe
81e3b2da88
Make tests faster (#8737) 
* Test changes

* Make finding the test tile a little smarter
 2022-06-19 20:22:28 -07:00
Arthur
5b9ec5ce3e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Interaction/SharedInteractionSystem.cs
 2022-06-18 07:08:37 +03:00
Arthur
2e47ff6266 Typo issue template 2022-06-16 01:57:03 +03:00
Arthur
42f236c8bc Add ids to blocks to issue template 2022-06-16 01:37:58 +03:00
Arthur
60743aca45 Rename issue template to bug_report 2022-06-16 01:27:06 +03:00
Arthur
39f0349d1e Return issue template 2022-06-16 01:26:11 +03:00
Arthur
1ab60cb3f2 Delete issue template 2022-06-16 01:25:54 +03:00
Arthur
8c737d761e Update Github issue template 2022-06-16 00:04:53 +03:00
ike709
381bcf7c91
Don't flag merge conflicts on draft PRs (#8821) 2022-06-14 17:20:27 +10:00
ike709
1af683ee90
Revert "Remove merge conflict comment" (#8820) 2022-06-13 18:45:23 +02:00