Commit Graph

33 Commits

Author SHA1 Message Date
Morb0
70e63172f7 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	README.md
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
#	Resources/ServerInfo/Guidebook/Medical/Cloning.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
#	Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
#	Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
#	Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
#	Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
2024-02-12 12:53:34 +03:00
router
0a6eab23e5 Update README.md (#25067)
* Update README.md

* emo review

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-02-09 23:31:01 -05:00
Morb0
75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Communications/CommunicationsConsoleSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
iglov
b0ef355eff Just fix dev guide link at README (#20868) 2023-10-09 13:02:33 -07:00
Morbo
7fa98d7e4d Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Links/UILinks.cs
#	README.md
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
2022-09-30 17:57:03 +03:00
Pieter-Jan Briers
f656ceda99 Update Discord invite links. (#11493) 2022-09-24 12:41:02 -05:00
lapatison
356dfbc08a Мелкие правки README.md (#244)
* Update README.md

* Update README.md

Co-authored-by: Morber <14136326+Morb0@users.noreply.github.com>
2022-06-10 09:48:41 +03:00
ike709
d79da62a95 Clarify that the repo contains non-commercial assets (#8438)
* Clarify that the repo contains non-commercial assets

* Update README.md
2022-05-25 17:30:20 +10:00
Morbo
f0c20f712c Add features list (#194)
* Add CHANGES.md

* Typo README.md

* Remove uniq feature from CHANGES list
2022-04-17 13:45:55 +03:00
Morbo
04776c4323 Update README (#152) 2022-03-16 23:40:08 +03:00
mirrorcult
bdfab0263b Update README.md 2.0
just farming commits for the insights graph
2021-10-19 16:53:08 -07:00
mirrorcult
e3174601d7 Update README.md
webedit lol
2021-10-19 16:51:58 -07:00
Swept
61bde57b2b Update README.md 2021-08-14 15:00:07 +00:00
Paul Ritter
ce67371b12 Revert "Deprecates RUN_THIS.py in favor of manually doin' it (#3930)" (#3933)
This reverts commit 94082e07a7.
2021-05-05 14:30:46 +02:00
Swept
94082e07a7 Deprecates RUN_THIS.py in favor of manually doin' it (#3930) 2021-05-05 04:15:05 +00:00
Swept
20bbe2afb6 Adds a license 2021-04-17 23:11:48 +00:00
Swept
10ddbecd57 Refreshes the README 2021-04-17 22:30:14 +00:00
RedlineTriad
78507ac9a2 Remove leftover Travis files (#2334) 2020-10-21 15:11:04 +02:00
Víctor Aguilera Puerto
ef905cf3e2 Revert "Makes the repo sparkle (#2180)"
I don't like fun.
This reverts commit 67ba000528.
2020-10-18 12:42:50 +02:00
Swept
67ba000528 Makes the repo sparkle (#2180) 2020-10-06 09:06:50 +02:00
Pieter-Jan Briers
5a52e992ea New logo for the readme. 2020-06-02 13:26:29 +02:00
Injazz
2ec4ee2ca7 Replacing Github Wiki links with HackMD ones (#729)
* Change wiki links for HackMD links

Since we use HackMD now for documentation

* Delete any mention of GitHub Wiki

just let it die
2020-02-23 00:40:41 +01:00
Pieter-Jan Briers
0cc980b26a Bye Waffle. 2019-10-02 21:47:32 +02:00
Injazz
3b0ec7f695 Adds header to readme.md (#179)
* Adds header

* updates header link

Github hosted image now

* use commit instead of master
2019-04-04 15:06:39 +02:00
Pieter-Jan Briers
c06c9e92a5 Update readme to show build status again 2019-03-31 15:21:44 +02:00
Silver
13274d63b0 Update README.md 2019-03-29 15:48:29 -06:00
Silver
72c856722b Update README.md 2019-03-29 15:47:46 -06:00
Ivan
41357d44c1 Update README.md 2019-03-29 13:36:45 -06:00
Ivan
56a7b9a305 Update README.md 2019-03-29 13:35:55 -06:00
Pieter-Jan Briers
9b251d70e2 Readme & submodule update. 2018-06-09 15:48:54 +02:00
Pieter-Jan Briers
41bda76980 Minor stuff: (#58)
* Minor stuff:

* Making a file called DISABLE_SUBMODULE_AUTOUPDATE in BuildChecker/ makes it not always run git submodule update.
* Added .mypy_cache to .gitignore.
* Made default platforms x64 (from Any CPU).

* Make git hooks +x.
2018-04-19 20:15:36 +02:00
PJB3005
02c67c851d Basic content repo outline.
Code's here, no tooling to generate content packs yet, however.
2017-08-04 14:24:01 +02:00
Silver
c9662b79d4 Create README.md 2017-05-21 22:29:08 -06:00