 LetterJay
|
e722c485ca
|
dupe fix
|
2016-08-15 15:57:29 -05:00 |
|
|
LetterJay
|
364628945f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-6th-Port
|
2016-08-15 15:49:14 -05:00 |
|
|
LetterJay
|
e6ae35efd4
|
should fix the in-suit issue was well as missing flavor text.
|
2016-08-15 15:49:03 -05:00 |
|
|
PoojawaandGitHub
|
b7c36f6b72
|
Merge pull request #20 from Poojawa/admin-qol
Admin qol
|
2016-08-15 09:24:16 -05:00 |
|
|
Poojawa
|
cf48200c69
|
Admin QoL
Moves absuive verbs to a seperate panel to reduce likelihood of being
pressed.
|
2016-08-15 09:23:25 -05:00 |
|
|
Poojawa
|
3f5302a0c6
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-08-15 05:30:44 -05:00 |
|
|
LetterJay
|
e34852e32b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-6th-Port
|
2016-08-15 00:17:53 -05:00 |
|
|
LetterJay
|
4fda0af454
|
changelog
|
2016-08-15 00:16:56 -05:00 |
|
|
LetterJayandGitHub
|
c12dd326f6
|
Merge pull request #18 from LetterJay/master
Taurs
|
2016-08-15 01:10:07 -04:00 |
|
|
LetterJay
|
0dea335be0
|
changelog
|
2016-08-15 00:08:12 -05:00 |
|
|
LetterJay
|
c53fabaf5e
|
fixes taurs
re-enables taurs
|
2016-08-15 00:05:24 -05:00 |
|
|
Poojawa
|
c138bc35ae
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-08-14 13:54:13 -05:00 |
|
|
Poojawa
|
28d11be7da
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-08-14 07:27:04 -05:00 |
|
|
TalkingCactusandGitHub
|
b546571538
|
Merge pull request #13 from unusualcrow/master
Lobby/Title screen music
|
2016-08-11 16:57:30 -04:00 |
|
|
unusualcrow
|
18b5e9b63d
|
Previous music readded at same rarity
|
2016-08-11 15:35:49 -04:00 |
|
|
unusualcrow
|
d52732787b
|
Quality decrease for compression
|
2016-08-11 14:53:21 -04:00 |
|
|
unusualcrow
|
27ef133f12
|
Lobby/Title screen music
Some new tunes for the lobby
1: System Shock 2 - Operations 2
2: David Bowie: - Space Oddity Instrumental
3: Transistor OST - Old Friends
|
2016-08-11 14:42:55 -04:00 |
|
|
LetterJay
|
5768e2f6b3
|
should fix missing underclothing
|
2016-08-11 00:02:50 -05:00 |
|
|
TalkingCactusandGitHub
|
bd5dfb7190
|
Merge pull request #10 from TalkingCactus/master
Sprites
|
2016-08-10 17:37:43 -04:00 |
|
|
TalkingCactus
|
7926e506ed
|
adds wolf sprites
not implemented yet
|
2016-08-10 17:15:29 -04:00 |
|
|
TalkingCactus
|
cd410a3947
|
fixes more displaced icons
|
2016-08-10 16:12:28 -04:00 |
|
|
TalkingCactus
|
887968827b
|
fixes displaced tajaran sprites
|
2016-08-10 16:01:11 -04:00 |
|
|
TalkingCactus
|
c540dfdad0
|
imports most missing sprites from the 5th port
|
2016-08-10 15:56:18 -04:00 |
|
|
TalkingCactus
|
8837451eb9
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-08-10 13:58:41 -04:00 |
|
|
LetterJay
|
3877d09a17
|
removes other stupid races, more icon fixes.
|
2016-08-10 09:44:35 -05:00 |
|
|
LetterJayandGitHub
|
b62cfad8b0
|
Merge pull request #7 from Poojawa/qol2
Qol2
|
2016-08-10 09:58:27 -04:00 |
|
|
Poojawa
|
10d5c98584
|
QoL 2
Pump logging fixed, shuttle sound effects sync properly.
Voreconstants wip code commented out for now.
|
2016-08-10 08:45:31 -05:00 |
|
|
Poojawa
|
2d86e3a452
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-08-10 08:43:37 -05:00 |
|
|
LetterJay
|
115535d0de
|
lizard, species tweaks, etc
|
2016-08-10 07:11:42 -05:00 |
|
|
Poojawa
|
7f4420631e
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-08-10 07:04:08 -05:00 |
|
|
Poojawa
|
f558eb3439
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-08-10 06:54:21 -05:00 |
|
|
LetterJay
|
864cead819
|
disabled taurs until they work properly
icon fixes
|
2016-08-10 06:50:18 -05:00 |
|
|
LetterJay
|
e103bcc6e1
|
comment out missed races
|
2016-08-10 04:43:38 -05:00 |
|
|
LetterJay
|
6be8192bb1
|
Put on hub
|
2016-08-10 04:39:11 -05:00 |
|
|
LetterJay
|
6ffb0df09d
|
pump.dm wasn't ported right and space/cult doesn't exist anymore for human.dm
|
2016-08-10 04:01:33 -05:00 |
|
|
LetterJay
|
066c76bf93
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-6th-Port
|
2016-08-10 03:03:37 -05:00 |
|
|
LetterJay
|
0aa02f9003
|
final tweaks and cleanup for the initial public push.
|
2016-08-10 03:03:21 -05:00 |
|
|
LetterJayandGitHub
|
9bec2c18a9
|
Merge pull request #4 from Poojawa/QoL
quality of life
|
2016-08-10 02:59:02 -04:00 |
|
|
Poojawa
|
582c76840b
|
quality of life
|
2016-08-09 17:07:43 -05:00 |
|
|
LetterJayandGitHub
|
0e5abb8ed8
|
Merge pull request #3 from Poojawa/nu-race
Nu race
|
2016-08-09 17:49:12 -04:00 |
|
|
Poojawa
|
484b9e04b3
|
wip race framework
icons, game option addition, etc.
|
2016-08-09 11:10:18 -05:00 |
|
|
LetterJay
|
f4beb94504
|
tweaks a few more, lizards disabled for now
|
2016-08-09 01:53:28 -05:00 |
|
|
LetterJay
|
50ce67fbdc
|
fix
|
2016-08-08 20:45:01 -05:00 |
|
|
LetterJay
|
ccfc800dfe
|
cyka
|
2016-08-08 19:56:02 -05:00 |
|
|
LetterJay
|
d4ca460dd0
|
tweakie briki
|
2016-08-08 19:47:40 -05:00 |
|
|
Poojawa
|
008fa92dc6
|
Merge remote-tracking branch 'refs/remotes/origin/master' into nu-race
|
2016-08-04 23:53:28 -05:00 |
|
|
Poojawa
|
ca4057cc11
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-08-04 23:33:02 -05:00 |
|
|
TalkingCactusandGitHub
|
1b403cf57a
|
Merge pull request #2 from Poojawa/narkyphobia
purge the rainbow
|
2016-08-05 00:04:44 -04:00 |
|
|
Poojawa
|
1308fc7be5
|
purge the rainbow
renames 'narky' folder to 'citadel'
|
2016-08-04 22:44:07 -05:00 |
|
|
TalkingCactus
|
366f89e781
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
|
2016-07-30 21:53:02 -04:00 |
|