LetterJay
|
71dd5e8e2e
|
Update game_options.dm
|
2017-10-29 00:48:50 -05:00 |
|
LetterJay
|
debaad2948
|
Update podpeople.dm
|
2017-10-29 00:47:47 -05:00 |
|
LetterJay
|
d4e794eef7
|
Update furrypeople.dm
|
2017-10-29 00:47:25 -05:00 |
|
LetterJay
|
180e730be9
|
Update species.dm
|
2017-10-29 00:46:15 -05:00 |
|
LetterJay
|
78da30ec8d
|
Update species.dm
|
2017-10-29 00:25:17 -05:00 |
|
LetterJay
|
c64446962d
|
Merge branch 'master' into upstream-merge-32096
|
2017-10-28 03:47:08 -04:00 |
|
LetterJay
|
32c8ee16c8
|
Merge pull request #3666 from Citadel-Station-13/updatefordays
Adds the roundstart races to game_options
|
2017-10-28 03:43:55 -04:00 |
|
LetterJay
|
6e17d42c33
|
updating the roundstart config for ref on master
|
2017-10-28 02:24:26 -05:00 |
|
LetterJay
|
a221d3505f
|
Update DNA.dm
|
2017-10-28 02:19:08 -05:00 |
|
LetterJay
|
6172cd38bd
|
Merge pull request #3628 from Citadel-Station-13/upstream-merge-32087
[MIRROR] Halloween Tweaks
|
2017-10-28 03:16:43 -04:00 |
|
LetterJay
|
81abe4f1e2
|
Merge pull request #3627 from Citadel-Station-13/upstream-merge-32050
[MIRROR] Use phpenv for the php build in travis instead of a PPA
|
2017-10-28 03:16:26 -04:00 |
|
LetterJay
|
1eecc529c0
|
Merge pull request #3424 from Citadel-Station-13/upstream-merge-31737
[MIRROR] Adds defines for organ slots
|
2017-10-28 02:32:26 -04:00 |
|
LetterJay
|
0e553b26db
|
Merge branch 'master' into upstream-merge-31737
|
2017-10-28 02:20:25 -04:00 |
|
LetterJay
|
79d6f42dfd
|
conflicts
|
2017-10-28 01:16:26 -05:00 |
|
CitadelStationBot
|
f0ae396a65
|
Automatic changelog generation for PR #3649 [ci skip]
|
2017-10-27 23:04:07 -05:00 |
|
LetterJay
|
dabc682be2
|
Merge pull request #3649 from deathride58/cablecoilspritefix
Hard sync of sprites files missing in #3606
|
2017-10-28 00:04:05 -04:00 |
|
deathride58
|
36f1aebdb5
|
hard sync of sprites files missing in #3606
|
2017-10-27 17:23:44 -04:00 |
|
CitadelStationBot
|
0a32eb3162
|
Automatic changelog generation for PR #3630 [ci skip]
|
2017-10-27 15:33:23 -05:00 |
|
LetterJay
|
fb5863ba35
|
Merge pull request #3630 from deathride58/adminhelphandlebutton
Adds a "Handle Issue" button to ahelps
|
2017-10-27 16:33:21 -04:00 |
|
LetterJay
|
39f683ab8d
|
Update meteor_wave.dm
|
2017-10-27 15:32:38 -05:00 |
|
LetterJay
|
12d336cbf0
|
Update halloween.dm
|
2017-10-27 15:32:15 -05:00 |
|
LetterJay
|
df370b0692
|
Update build_tools.sh
|
2017-10-27 15:32:00 -05:00 |
|
LetterJay
|
a5338759b7
|
donation item
|
2017-10-27 13:06:53 -05:00 |
|
CitadelStationBot
|
5c94555ccd
|
Automatic changelog generation for PR #3634 [ci skip]
|
2017-10-27 02:15:24 -05:00 |
|
LetterJay
|
9599dd94c0
|
Merge pull request #3634 from deathride58/voreproctovoreverb
Readds the hook necessary for vore setup
|
2017-10-27 03:15:22 -04:00 |
|
CitadelStationBot
|
f2dc4bd8c8
|
Automatic changelog generation for PR #3635 [ci skip]
|
2017-10-27 01:49:04 -05:00 |
|
LetterJay
|
af96c29a0c
|
Merge pull request #3635 from ktccd/Undo_Borer_HUDS
Undoes Borer HUDs
|
2017-10-27 02:49:03 -04:00 |
|
CitadelStationBot
|
8ffa40a44f
|
Automatic changelog generation for PR #3638 [ci skip]
|
2017-10-27 01:48:27 -05:00 |
|
LetterJay
|
3719319bf3
|
Merge pull request #3638 from deathride58/dontcodewhiledrunk
Fixes miscreant generation
|
2017-10-27 02:48:26 -04:00 |
|
CitadelStationBot
|
0356a196fd
|
Automatic changelog generation for PR #3637 [ci skip]
|
2017-10-27 01:48:17 -05:00 |
|
LetterJay
|
7f6b1a6400
|
Merge pull request #3637 from deathride58/loocerrorfix
Fixes LOOC error messages not appearing in goonchat
|
2017-10-27 02:48:16 -04:00 |
|
CitadelStationBot
|
6dbf6520e1
|
Automatic changelog generation for PR #3641 [ci skip]
|
2017-10-27 01:47:58 -05:00 |
|
LetterJay
|
141de52658
|
Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
[MIRROR] Assmos part 1, #2
|
2017-10-27 02:47:56 -04:00 |
|
LetterJay
|
0bd2348821
|
Merge pull request #3626 from Citadel-Station-13/upstream-merge-32053
[MIRROR] Webhook processor no longer removes [tags] from titles
|
2017-10-27 02:45:06 -04:00 |
|
LetterJay
|
4ab8e0d8f1
|
Merge pull request #3625 from Citadel-Station-13/upstream-merge-31987
[MIRROR] Inlines and optimizes compile_overlays
|
2017-10-27 02:44:48 -04:00 |
|
CitadelStationBot
|
b5bae76272
|
Automatic changelog generation for PR #3624 [ci skip]
|
2017-10-27 01:44:18 -05:00 |
|
LetterJay
|
31ee6947ee
|
Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039
[MIRROR] Rebalances clockwork marauders
|
2017-10-27 02:44:17 -04:00 |
|
CitadelStationBot
|
40c3094a2f
|
Automatic changelog generation for PR #3623 [ci skip]
|
2017-10-27 01:43:36 -05:00 |
|
LetterJay
|
3ad1ac335f
|
Merge pull request #3623 from Citadel-Station-13/upstream-merge-31991
[MIRROR] fixes reflectors dropping extra mats
|
2017-10-27 02:43:35 -04:00 |
|
LetterJay
|
ab12387ebd
|
Merge pull request #3622 from Citadel-Station-13/upstream-merge-32029
[MIRROR] Actual performance improvements for GetAllContents
|
2017-10-27 02:43:16 -04:00 |
|
LetterJay
|
a7b464e47e
|
Merge pull request #3620 from Citadel-Station-13/upstream-merge-32030
[MIRROR] Allows components to qdel from Initialize
|
2017-10-27 02:19:07 -04:00 |
|
CitadelStationBot
|
5d1a061f27
|
Automatic changelog generation for PR #3618 [ci skip]
|
2017-10-27 01:18:49 -05:00 |
|
LetterJay
|
9a1db237d2
|
Merge pull request #3618 from Citadel-Station-13/upstream-merge-32058
[MIRROR] Fixes lightgeist spawning
|
2017-10-27 02:18:48 -04:00 |
|
CitadelStationBot
|
606a711ed0
|
Automatic changelog generation for PR #3617 [ci skip]
|
2017-10-27 01:18:15 -05:00 |
|
LetterJay
|
f268112af1
|
Merge pull request #3617 from Citadel-Station-13/upstream-merge-32019
[MIRROR] Fixes defib ghost prompt
|
2017-10-27 02:18:14 -04:00 |
|
LetterJay
|
6713634146
|
Merge pull request #3616 from Citadel-Station-13/upstream-merge-32084
[MIRROR] Fixes minor runtime
|
2017-10-27 02:18:02 -04:00 |
|
CitadelStationBot
|
8f3dd97666
|
Automatic changelog generation for PR #3615 [ci skip]
|
2017-10-27 01:17:47 -05:00 |
|
LetterJay
|
3202baec26
|
Merge pull request #3615 from Citadel-Station-13/upstream-merge-32075
[MIRROR] Makes staff of change randomly assign a borg module
|
2017-10-27 02:17:45 -04:00 |
|
LetterJay
|
4fee09e236
|
Merge pull request #3613 from Citadel-Station-13/upstream-merge-32098
[MIRROR] Fixes a runtime on organ replacement
|
2017-10-27 02:16:47 -04:00 |
|
LetterJay
|
3b82c26cb5
|
Merge pull request #3612 from Citadel-Station-13/upstream-merge-32083
[MIRROR] Prevents inappropriate slapping
|
2017-10-27 02:16:34 -04:00 |
|