Fix and update main repo readme (#2073)

* Remove git conflict marker and update build status badge to renamed workflow

* Add preliminary modularisation guide hyperlinks to README

* Add link to git/github cheatsheet
This commit is contained in:
Alex 'Avunia' Takiya
2020-12-07 20:19:04 +00:00
committed by GitHub
parent dda880b094
commit f9c248c09f
+4 -10
View File
@@ -1,20 +1,14 @@
## Skyrat 13 (/tg/station Downstream)
<<<<<<< HEAD
[![Build Status](https://github.com/Skyrat-SS13/Skyrat-tg/workflows/Run%20tests/badge.svg)](https://github.com/Skyrat-SS13/Skyrat-tg/actions?query=workflow%3A%22Run+tests%22)
[![Build Status](https://github.com/Skyrat-SS13/Skyrat-tg/workflows/CI%20Suite/badge.svg)](https://github.com/Skyrat-SS13/Skyrat-tg/actions?query=workflow%3A%22CI+Suite%22)
[![Percentage of issues still open](http://isitmaintained.com/badge/open/Skyrat-SS13/Skyrat-tg.svg)](https://isitmaintained.com/project/Skyrat-SS13/Skyrat-tg "Percentage of issues still open")
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/Skyrat-SS13/Skyrat-tg.svg)](https://isitmaintained.com/project/Skyrat-SS13/Skyrat-tg "Average time to resolve an issue")
![Coverage](https://img.shields.io/codecov/c/github/Skyrat-SS13/Skyrat-tg)
=======
[![Build Status](https://github.com/tgstation/tgstation/workflows/CI%20Suite/badge.svg)](https://github.com/tgstation/tgstation/actions?query=workflow%3A%22CI+Suite%22)
[![Percentage of issues still open](https://isitmaintained.com/badge/open/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Percentage of issues still open")
[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Average time to resolve an issue")
![Coverage](https://img.shields.io/badge/coverage---3%25-red.svg)
>>>>>>> 94f746b1a30... Improve naming in new GitHub actions (#54821)
[![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
* **Guide to Modularisation:** N/A
* **Git / GitHub cheatsheet:** https://www.notion.so/Git-GitHub-61bc81766b2e4c7d9a346db3078ce833
* **Guide to Modularisation:** [./modular_skyrat/readme.md](./modular_skyrat/readme.md)
* **Website:** https://www.tgstation13.org
* **Code:** https://github.com/tgstation/tgstation
* **Wiki:** https://tgstation13.org/wiki/Main_Page
@@ -30,7 +24,7 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th
## DEVELOPMENT FLOWCHART
![image](https://i.imgur.com/aJnE4WT.png)
[Modularisation Guide](.github)
[Modularisation Guide](./modular_skyrat/readme.md)
## DOWNLOADING
[Downloading](.github/DOWNLOADING.md)