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

159 commits

Author SHA1 Message Date
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
wrexbe
a39233c6ff
Remove merge conflict comment (#8819) 2022-06-13 08:03:00 -07:00
Arthur
5e78fb6fff Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-06 04:32:53 +03:00
Moony
ab1b37ebbf
Add a merge conflict check. (#8626) 
* Add a merge conflict check.

This is directly copied from https://github.com/wixoaGit/OpenDream/pull/648

* Update .github/workflows/conflict-labeler.yml

Co-authored-by: ike709 <ike709@users.noreply.github.com>

Co-authored-by: ike709 <ike709@users.noreply.github.com>
 2022-06-04 20:34:48 -07:00
Arthur
fee8678a41 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Maps/game.yml
 2022-06-04 03:08:27 +03:00
wrexbe
040d1c3aa4
Fix debug tests with engine change (#8609) 2022-06-03 02:53:57 -07:00
DrSmugleaf
f98ac77179
More github action tests (#7301) 2022-05-30 19:52:27 -07:00
Arthur
78c140e58b Remove submodule update check workflow 2022-05-25 03:13:34 +03:00
Arthur
5aeb1ed4b8 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-25 02:29:09 +03:00
wrexbe
c4880d80d5
Fix github action test output spam (#8316) 2022-05-20 18:16:05 -07:00
Arthur
0c1b37b688 PR template typo 2022-05-20 12:17:31 +03:00
Arthur
da3072a8b4 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/manifest.yml
 2022-05-19 20:03:31 +03:00
Jacob Tong
09ae27f492
Update issue template (#8218) 2022-05-16 13:08:27 -07:00
Arthur
75c6f4d42f Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-07 21:32:57 +03:00
Paul Ritter
6ec5af5582
workflow (#7987) 2022-05-07 13:17:55 +02:00
Arthur
f8f6c9d1bf Enable auto publishing 2022-04-24 14:15:22 +03:00
Arthur
c5d52eb3be Temporary disable auto publish 2022-04-19 13:42:21 +03:00
Arthur
61d0c1889f Update publish workflow 2022-04-18 21:09:57 +03:00
Arthur
237bb2dd2b Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
 2022-04-06 07:11:02 +03:00
Vera Aguilera Puerto
e1eea793ea Allow publish workflow to be manually dispatched. 
Will help in situations where we need to push a hotfix so people can continue playing the game normally.
 2022-04-03 13:29:45 +02:00
Paul Ritter
f2d6fba6eb
point-release 2022-04-02 20:30:36 +02:00
DrSmugleaf
19d8824951
Add myself to CODEOWNERS 2022-03-26 15:45:35 +01:00
Pieter-Jan Briers
5954b7668c
Update my codeowners (#7287) 2022-03-26 12:46:21 +01:00
Morbo
ea305fedd7
Remove docfx (#162) 2022-03-26 03:30:37 +03:00
Zoldorf
c6517abea1
Update build-docfx.yml 2022-03-23 17:31:21 -06:00
Arthur
19502de5f4 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-03-23 21:26:58 +03:00
Zoldorf
1a6d2632cf
Update build-test.yml 2022-03-22 17:29:43 -06:00
Zoldorf
8a7b9b1597
Update update-wiki.yml 2022-03-22 17:28:22 -06:00
Arthur
c4e6cdfbbd Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-03-22 04:48:30 +03:00
Zoldorf
693669d9ec
Create build-docfx.yml 2022-03-21 17:25:21 -06:00
Zoldorf
5ecea909bc
:mistake: 2022-03-21 17:24:35 -06:00
Zoldorf
3b1b66b68a
Update build-test.yml 2022-03-21 15:54:01 -06:00
Zoldorf
9c8cfa9574
Update build-test.yml 2022-03-21 15:49:23 -06:00
ElectroJr
1714d6d8c3 CODEOWNERS update 2022-03-19 23:52:50 +13:00
DrSmugleaf
3b54fe1092
Add myself to CODEOWNERS 2022-03-19 11:27:05 +01:00
Arthur
fb4739aeab Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/species.yml
#	Resources/Server Info/Rules.txt
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/steel.png
#	Resources/Textures/Tiles/white.png
 2022-03-13 21:51:12 +03:00