Commit Graph

18 Commits

Author SHA1 Message Date
Toast
28885c6dc8 Fixed Crew Transfer
IT JUST WORKS, IT JUST WORKS,
LITTLE LIES, STUNNING SHOWS,
PEOPLE BUY, MONEY FLOWS, IT JUST WORKS
2019-12-20 17:54:19 -05:00
quotefox
65856b1a8e Merge pull request #96 from SynnGraffkin/Extended-Plus
Initiate crew transfer vote instead of forcing a shift end at 2 hours.
2019-12-12 01:48:16 +00:00
Toast
94b33ed771 Revert "Revert "This is painful""
This reverts commit 95e35dc714.
2019-12-03 19:32:04 -05:00
quotefox
95e35dc714 Revert "This is painful"
This reverts commit 0da5609e9a.
2019-12-03 03:55:20 +00:00
quotefox
b533ea8b9c Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-12-03 03:50:03 +00:00
quotefox
816ce5b8fe Fixes to cloning. Revert. 2019-12-03 03:48:56 +00:00
Toast
f784e6b786 IT IS ALIVE 2019-11-30 17:19:36 -05:00
Toast
0da5609e9a This is painful 2019-11-29 01:14:04 -05:00
Toast
67e19268df Crew Transferred 2019-11-24 04:53:05 -05:00
quotefox
47c8a174fa Fix to jukebox 2019-11-16 01:51:45 +00:00
Azarak
80db742296 Merge branch 'master' into pr/1 2019-11-08 21:11:46 +01:00
shellspeed1
0ab8a91ea9 Adds bluespace hotel 2019-11-06 18:15:11 -08:00
Azarak
1544eafb4f TG GENETICS AAAAAAAA
aaaaaaaa
2019-11-04 23:20:16 +01:00
quotefox
b9a598bbd9 Merge pull request #36 from shellspeed1/Organ-updates-for-stasis-beds
Massive organ overhaul and some new surgeries ported from cit orginally created by Fermi. Mergeable
2019-10-18 21:47:14 +01:00
shellspeed1
470ec5d62b whew 2019-10-14 18:46:06 -07:00
Nam
49630602ce 3 hour shifts
potentially
2019-10-08 02:03:43 -07:00
shellspeed1
05df413ed7 overlay 2019-09-27 12:37:40 -07:00
Quotefox
7091cdbe8c Uploading all files. 2019-09-23 18:26:34 +02:00