deathride58
|
72de6c3968
|
Nested ternaries?
|
2017-09-03 17:20:58 -04:00 |
|
deathride58
|
5a618ed548
|
adds reduced option for screenshake
|
2017-09-03 13:22:50 -04:00 |
|
deathride58
|
feeb76e472
|
Nerfs KA screenshake, moves cit_screenshake.dm to modular_citadel/, and adds a screenshake pref.
|
2017-09-03 05:24:14 -04:00 |
|
LetterJay
|
7aa042cff1
|
Update randomverbs.dm
|
2017-09-02 07:33:45 -05:00 |
|
LetterJay
|
7711b73ca7
|
Update randomverbs.dm
|
2017-09-02 07:31:52 -05:00 |
|
LetterJay
|
a94ffca643
|
Update admin.dm
|
2017-09-02 07:28:33 -05:00 |
|
LetterJay
|
f4b08d32a7
|
Update admin.dm
|
2017-09-02 07:26:16 -05:00 |
|
LetterJay
|
3e0ead1204
|
Merge branch 'master' into upstream-merge-29105
|
2017-09-02 07:11:32 -05:00 |
|
LetterJay
|
2bfc7872fa
|
cleanup
|
2017-09-02 07:06:37 -05:00 |
|
LetterJay
|
fed956efec
|
Update job_exp.dm
|
2017-09-02 06:56:35 -05:00 |
|
LetterJay
|
74307f2858
|
Update preferences.dm
|
2017-09-02 06:55:52 -05:00 |
|
LetterJay
|
7fea74994f
|
Update randomverbs.dm
|
2017-09-02 06:53:49 -05:00 |
|
LetterJay
|
d8679dbfcf
|
Prevents hallucinations revealing people's identity
|
2017-09-02 05:33:55 -05:00 |
|
LetterJay
|
5d1c2c523b
|
Fixes no drop implant
|
2017-09-02 05:31:15 -05:00 |
|
LetterJay
|
96c790a81f
|
Unruntimes fdel on savefiles
|
2017-09-02 05:23:35 -05:00 |
|
LetterJay
|
b1302230c0
|
Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121
[MIRROR] Converts npc saves to jsons
|
2017-09-02 05:20:31 -05:00 |
|
LetterJay
|
a6aa71e0b9
|
commit
|
2017-09-01 09:52:29 -05:00 |
|
CitadelStationBot
|
9e90d582e5
|
Fixes dummy unequip runtimes.
|
2017-08-31 08:39:56 -05:00 |
|
CitadelStationBot
|
c2a792d577
|
Converts npc saves to jsons
|
2017-08-30 08:01:36 -05:00 |
|
kevinz000
|
28ea6f3ad2
|
Merge pull request #2499
|
2017-08-29 22:43:54 -07:00 |
|
kevinz000
|
874bad1203
|
Merge pull request #2524
|
2017-08-29 22:40:05 -07:00 |
|
kevinz000
|
cf93e511ce
|
Merge pull request #2527
|
2017-08-29 22:40:02 -07:00 |
|
kevinz000
|
bd8a9dc435
|
Merge pull request #2528
|
2017-08-29 22:40:00 -07:00 |
|
kevinz000
|
fa91df9ef8
|
Merge pull request #2548
|
2017-08-29 22:39:00 -07:00 |
|
kevinz000
|
f982cd1d5a
|
Merge pull request #2550
|
2017-08-29 22:38:54 -07:00 |
|
kevinz000
|
b340bb0851
|
Merge pull request #2551
|
2017-08-29 22:38:51 -07:00 |
|
kevinz000
|
ae59532c0d
|
Merge pull request #2552
|
2017-08-29 22:38:30 -07:00 |
|
kevinz000
|
d5296e65a8
|
Merge pull request #2554
|
2017-08-29 22:38:20 -07:00 |
|
kevinz000
|
8693a933b4
|
Merge pull request #2482
|
2017-08-29 22:27:42 -07:00 |
|
kevinz000
|
b7e74bd3ab
|
Merge pull request #2473
|
2017-08-29 22:27:39 -07:00 |
|
kevinz000
|
967dd49261
|
Merge pull request #2467
|
2017-08-29 22:27:36 -07:00 |
|
kevinz000
|
9cb65df70d
|
Merge pull request #2426
|
2017-08-29 22:27:21 -07:00 |
|
kevinz000
|
7549fb09fa
|
Merge pull request #2416
|
2017-08-29 22:27:19 -07:00 |
|
kevinz000
|
25e1a78b51
|
Merge pull request #2407
|
2017-08-29 22:27:13 -07:00 |
|
kevinz000
|
5c7b743cfa
|
Merge pull request #2405
|
2017-08-29 22:27:10 -07:00 |
|
kevinz000
|
5dc670e282
|
Merge pull request #2401
|
2017-08-29 22:27:07 -07:00 |
|
kevinz000
|
fcddd32703
|
Merge pull request #2195
|
2017-08-29 22:26:58 -07:00 |
|
kevinz000
|
f33f543d8a
|
Merge branch 'master' into upstream-merge-30254
|
2017-08-29 22:12:34 -07:00 |
|
kevinz000
|
0925cb108b
|
wew
|
2017-08-29 22:09:42 -07:00 |
|
kevinz000
|
408acdd66d
|
sync
|
2017-08-29 22:05:16 -07:00 |
|
kevinz000
|
175224c5de
|
Merge branch 'master' into upstream-merge-29859
|
2017-08-29 21:14:45 -07:00 |
|
kevinz000
|
f9c0c6df3d
|
update master
|
2017-08-29 20:46:38 -07:00 |
|
kevinz000
|
41c1f939ab
|
gdi
|
2017-08-29 20:21:41 -07:00 |
|
kevinz000
|
92a2ac0ae3
|
soft sync
|
2017-08-29 20:20:11 -07:00 |
|
kevinz000
|
17f3ce92b6
|
Merge branch 'master' into upstream-merge-29960
|
2017-08-29 20:14:22 -07:00 |
|
kevinz000
|
bf5d1fc159
|
sync
|
2017-08-29 20:14:08 -07:00 |
|
kevinz000
|
ec2993289e
|
sync
|
2017-08-29 20:07:36 -07:00 |
|
kevinz000
|
76e05ad88e
|
Merge branch 'master' into upstream-merge-30203
|
2017-08-29 20:05:42 -07:00 |
|
kevinz000
|
4848a1fbf1
|
Merge branch 'master' into upstream-merge-30259
|
2017-08-29 20:05:25 -07:00 |
|
kevinz000
|
1b0bbb8c86
|
Merge branch 'master' into upstream-merge-30113
|
2017-08-29 20:02:14 -07:00 |
|