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

106 commits

Author SHA1 Message Date
Arthur
6bf5869a78 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-12 23:39:05 +03:00
ike709
0349c843e3
Adds support for CC-BY-NC licenses (#6648) 2022-02-10 20:27:48 -07:00
ElectroJr
86fb89edb8 update codeowners & tiny door bugfix 2022-02-01 13:39:33 +13:00
Morbo
825836d5a5
Fix GitHub action wiki url (#81) 2022-01-24 09:09:11 +03:00
Morbo
fcc4273fae
Update GitHub action wiki url (#80) 2022-01-24 07:23:57 +03:00
Arthur
cda6bb26f1 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-01-22 22:07:12 +03:00
Kara D
eedaedc4fd
probably fix build-test not running on submodule update 2022-01-21 10:50:17 -07:00
Arthur
9f475b7972 Merge remote-tracking branch 'upstream/master' into upstream 2022-01-19 00:57:01 +03:00
Sam Weaver
adddd2fac6
FIXED: Chemistry JSON dump tool and companion GitHub Action (#6222) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2022-01-18 14:44:22 -07:00
Moony
5fd45fc82a
Revert "Chemistry JSON dump tool and companion GitHub Action (#6134)" (#6217) 
This reverts commit 40e2e78e0f.
 2022-01-17 16:06:19 -06:00
Sam Weaver
40e2e78e0f
Chemistry JSON dump tool and companion GitHub Action (#6134) 
* fuck

* oh boy

* Sorted every chem into guide groups

* WHY ARE YOU NOT ABSTRACT

* removes the target thing in favor of simply generating everything.

* eee

* Add group for med

* Update wiki JSON generation to use System.Text.Json

* Fix error on shutdown during wiki JSON generation

* First pass at automatic wiki workflow

* Add a temporary workaround while the build is continuing to give errors

* Update workflow to reference correct API url, track dependency.

* Compile wiki actions into one job rather than two

* Update page name to reference editable page

* Add other JSON file and parameterize root page path

* A few steps closer to using `System.Text.Json` to serialize properly

* Revert System.Text.Json and return to Newtonsoft.Json.

* Revert the revert. Return to System.Text.Json.

This reverts commit a5ea98dfdcfab3f605ac4d82d3b110f099324308.

* Add and register UniversalJsonConverter class.

* Narrow triggers for update-wiki GitHub action.

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2022-01-17 13:50:02 -06:00
Morbo
2523d736e8
Small fixes (#74) 2022-01-17 04:29:56 +03:00
Moony
9aed658f83
Paul, codeowner entries apply only once 
@PaulRitter you accidentally overrode my CODEOWNERS entry.
 2022-01-13 22:29:09 -06:00
Arthur
ecf20dfdc3 Merge remote-tracking branch 'upstream/master' into fork-sync 
# Conflicts:
#	.github/CODEOWNERS
 2022-01-13 07:35:23 +03:00
Paul Ritter
92d15bb25e
Update CODEOWNERS 2022-01-12 23:18:11 +01:00
Paul Ritter
bda5f0f19c
forgot a tidbid 2022-01-12 23:02:41 +01:00
Paul Ritter
5c74df9302
add myself to codeowners 2022-01-12 22:43:00 +01:00
ElectroJr
a666da6797 Taking responsibility for my mistakes (codeowners) 2022-01-11 15:44:53 +13:00
mirrorcult
81fb52c041
Auto-labeling actions for pull requests (#6117) 2022-01-10 16:06:08 -07:00
Morbo
afda24f6f5
Fix UTC publish time (#59) 2022-01-10 20:25:36 +03:00
Morbo
e4476c1ec0
Fix UTC time for publication job (#57) 2022-01-10 03:24:43 +03:00
Kara D
4be7c4a63e
commit farmer 2022-01-09 15:06:49 -07:00
Kara D
268e3e3baf
codeowners myself 2022-01-09 14:23:39 -07:00
Morbo
fbc0317fda
Merge pull request #54 from space-syndicate/fork-sync 
Fork sync
 2022-01-09 22:01:00 +03:00
Morbo
ccc008358d
Fix type in PULL_REQUEST_TEMPLATE (#55) 2022-01-09 21:35:47 +03:00
Vera Aguilera Puerto
809ccef6fb Add new entries to CODEOWNERS for myself. 
I won't get pinged for every single PR ever again, yay
 2022-01-09 19:26:53 +01:00
Arthur
7d4341c20d Merge remote-tracking branch 'upstream/master' into fork-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
 2022-01-09 20:18:57 +03:00
Moony
2dfdb99a4a
Move the vera/pjb fallback entry to the top. 2022-01-09 10:34:01 -06:00
Moony
3fd9b8efb7
Update CODEOWNERS 2022-01-08 23:10:03 -06:00
Moony
a3e73889b2
Adds myself as codeowner for various administration things. (#5592) 2022-01-08 16:52:03 -07:00
Kara D
8a84d30b05
update RSI diff workflow to space-wizards fork 2022-01-08 15:34:20 -07:00
Morbo
556dfddd61
Fix nightly publish time to UTC 2022-01-08 11:05:23 +03:00
Morbo
4fb647d19a
Remove fork sync GitHub action (#41) 2022-01-07 20:20:08 +03:00
Morbo
bd64d6543f
Use GitHub action of commits check in nightly publication (#42) 2022-01-07 20:19:47 +03:00
Morbo
a7b86a9c78
Disable forksync workflow auto merge (#36) 2022-01-06 19:13:28 +03:00
Morbo
9ddfc3081b
Translate GitHub PR template (#34) 2022-01-06 19:13:15 +03:00
Morbo
2b9bcc70b2
Update GitHub CODEOWNERS (#33) 2022-01-06 19:12:51 +03:00
Morbo
3c69e79394
Add nightly publish workflow (#37) 2022-01-06 19:11:43 +03:00
Arthur
d94ca3d20a Add fork sync GitHub action 2021-12-31 21:05:45 +03:00
Arthur
b100030ea8 Fix deploy target path 2021-12-22 20:06:10 +03:00
Arthur
1e7d69a823 Update builds server 2021-12-22 19:24:21 +03:00
Arthur
4e19c77642 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	Content.Client/Lobby/UI/LobbyGui.xaml
 2021-12-22 11:26:03 +03:00
Pieter-Jan Briers
b42412903b Don't allow concurrent publish actions. 
If two commits gets pushed in quick succession, and the first takes much longer to publish (for some reason), said build can be considered "latest".

This just happened and it broke the servers.
 2021-12-20 16:05:39 +01:00
Arthur
756fbc4685 Update builds path 2021-12-15 07:59:45 +03:00
Arthur
2e973513f6 Update publish & build info generation scripts 2021-12-15 06:42:56 +03:00
Vera Aguilera Puerto
1860ad4b99 Publish master builds again 2021-12-11 16:15:07 +01:00
Paul
38990d4f95 stable branch publish 2021-12-05 20:34:31 +01:00
Pieter-Jan Briers
76a8f4d7da
Change location of builds 
It's a symlink now, no I won't have to change this again when I'm done formatting the HDD.
 2021-11-27 17:14:40 +01:00
Kara D
7da2879220
Probably avoids the empty RSI diff bug 2021-11-17 22:59:05 -07:00
Pieter-Jan Briers
6f2cc733e7
Fix publish workflow 2021-11-09 15:19:32 +01:00