cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,949 Commits 8 Branches 0 Tags
9e48422df960990e2dd9a1e3a3e9fef52c42c718
Commit Graph

46 Commits

Author SHA1 Message Date
Kashargul
9e48422df9 Merge branch 'master' into prmirror-bot-control 2024-10-26 03:41:58 +02:00
CHOMPStation2
95a4a5c1dd [MIRROR] Adds Juke Build (#9006) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-24 02:30:54 +02:00
Selis
029b35e9b5 Tiny readme update to test workflow (#7831) 2024-02-25 20:54:01 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Raeschen
258d8c141b Attempt to fix changelog bot on a changelog that fails 2 (#6679) 2023-07-30 08:55:07 +02:00
Raeschen
dcfabbb663 Attempt to fix changelog bot on a changelog that fails (#6678) 2023-07-30 08:50:49 +02:00
Razgriz
196d055731 Use this PR for messing with the mirror bot 2022-02-20 14:53:21 -07:00
CHOMPStation2
09c686d59c readme update 2022-01-09 01:48:09 +00:00
CHOMPStation2
ea4737e36f Readme test 2022-01-09 01:47:17 +00:00
CHOMPStation2
97325411ff Readme test 1 2022-01-08 18:44:18 -07:00
Razgriz
1707a6d22b Update README.md 
Because it needs more confusion.
 2021-02-15 03:05:48 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
cf9b39b4a9 Set up GitHub action for nanomap generation 2020-09-25 03:25:07 -07:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
izac112
5dcbf556bd test pr 2020-05-18 22:49:59 +02:00
izac112
9b79131024 Update README.md 2020-05-16 17:50:26 +02:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai Sieyes
fabbdd8c8d Update ships, add ATTRIBUTIONS.md 2020-05-04 14:27:46 -04:00
Shadow Quill
aa3a467eef Updates the link 2020-04-19 16:38:54 -05:00
Razgriz
042314bb8c Update README.md 2020-04-11 21:55:54 -07:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
izac112
3d346e99fd Update README.md 2020-03-08 07:20:19 +01:00
Arokha Sieyes
3f782d1ea2 Sprites 'n stuff 2020-03-06 13:03:53 -05:00
Izac Joof Forsgren
41c52b9ef9 Update README.md 2020-02-23 22:11:30 +01:00
izac112
a0ab995551 updates README.md to actually refer to us 2020-02-23 20:52:07 +00:00
Aronai Sieyes
48414f790f Update README.md for repo 2018-02-11 16:20:51 -05:00
killer653
c1b72fd9b6 Polaris Sync 2017-09-15 21:18:16 -04:00
Spades
cba691a0da Update README.md 2017-08-14 04:07:02 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
d38345e2bc Amends README.md 
Clarifies the licensing portion to reflect what the changelog header says, since otherwise people might think that the sounds and sprites are also under AGPL3, which would conflict with what the changelog header says.
 2017-08-01 11:20:07 -04:00
Arokha Sieyes
cc83aadca1 Updated README.md to reflect name 2016-05-07 14:18:24 -04:00
lorwp
e9cd26ef70 Add Hyphen to README.md links 2016-01-27 17:46:38 +11:00
lorwp
f9569df3c5 Change 'Links pending' on README.md to links to the Forums and Wiki 2016-01-27 13:07:22 +11:00
Neerti
7b3d1b24d1 Changes the readme to reference the correct name. Also this should allow Travis to test the code. 2015-04-06 02:38:07 -04:00
Mloc-Hibernia
96de9bba3b clear up licensing situation 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2015-01-06 16:25:22 +00:00
ccomp5950
708a3b3fa7 More license stuffs. 2015-01-05 14:30:08 -05:00
ccomp5950
6461beaf58 Changes Baystation12 to now be licensed under AGPL. 
See c4fbe8df34/LICENSE-GPL3.txt (L552) for why this is allowed.

The purpose is to close the loop hole of private downstream sources not sharing their code as we share ours.  As we share code with /tg/ it is also in our best interests to relicense so that this sharing of code doesn't become a one way street.
 2015-01-05 05:55:00 -05:00
Jeremy Liberman
85ede45151 Add note in README about ignoring baystation12.int 2014-03-31 20:03:46 -05:00
Mloc-Argent
21152fac09 Moved every config file into an "example" directory, to help prevent git screwing with local testing environments. 
Details have been added to README.md.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-16 19:55:23 +01:00
Mloc
6e13f5fbf0 Readme clone URL fix. 2013-07-26 18:31:11 +01:00
Mloc
caba54c87c Updated readme. 2013-06-01 17:17:20 +02:00
Mloc
8b6ccd9ee2 last change promise 2013-05-02 13:39:13 +02:00
Mloc
8bcfd0dd98 Merge branch 'master' of github.com:Baystation12/Baystation12 2013-05-02 12:34:33 +01:00
Mloc
83cc031f46 markdown is pretty cool 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-02 12:34:12 +01:00
Mloc
f66ad2504d whoops 2013-05-02 13:26:48 +02:00
Mloc
0369f1f576 Made readme use markdown. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-02 12:25:05 +01:00