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
|
88b452595f
|
Update antag_spawner.dm
|
2017-09-02 06:52:03 -05:00 |
|
LetterJay
|
7617164617
|
Update blackbox.dm
|
2017-09-02 06:50:35 -05:00 |
|
LetterJay
|
4a1bb5addb
|
Update configuration.dm
|
2017-09-02 06:49:21 -05:00 |
|
LetterJay
|
78ed8f0913
|
Fixes mecha drill not working on windoors.
|
2017-09-02 05:35:36 -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
|
e310435892
|
UI objects should PIXEL_SCALE
|
2017-09-02 05:26:22 -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
|
fafc1b2d14
|
Merge pull request #965 from Citadel-Station-13/custom_roundstart_items
Custom Roundstart Items
|
2017-09-01 11:41:12 -05:00 |
|
LetterJay
|
98da910178
|
Update read_from_file.dm
|
2017-09-01 11:21:50 -05:00 |
|
LetterJay
|
a6aa71e0b9
|
commit
|
2017-09-01 09:52:29 -05:00 |
|
kevinz000
|
e8bb79d7c9
|
kk
|
2017-09-01 07:12:08 -07:00 |
|
kevinz000
|
ddb49cd1ca
|
kek
|
2017-09-01 06:58:31 -07:00 |
|
kevinz000
|
b193d77c1c
|
hm
|
2017-09-01 03:36:18 -07:00 |
|
LetterJay
|
4a9b59cba1
|
Merge pull request #2576 from Citadel-Station-13/upstream-merge-30292
[MIRROR] Rearranges the antagonist panel: now with 150 more hours of testing
|
2017-08-31 22:25:43 -05:00 |
|
LetterJay
|
98dcb56a27
|
Merge pull request #2569 from Citadel-Station-13/upstream-merge-30266
[MIRROR] Chasms will alert mobs below them when they form
|
2017-08-31 22:24:55 -05:00 |
|
kevinz000
|
41318e715c
|
Merge branch 'master' into custom_roundstart_items
|
2017-08-31 18:23:56 -07:00 |
|
Jordan Brown
|
528b7a86b8
|
Merge pull request #30292 from Xhuis/revert-30289-RevertAntag
Rearranges the antagonist panel: now with 150 more hours of testing
|
2017-08-31 14:39:42 -05:00 |
|
CitadelStationBot
|
9e90d582e5
|
Fixes dummy unequip runtimes.
|
2017-08-31 08:39:56 -05:00 |
|
CitadelStationBot
|
e70b6ceb33
|
Chasms will alert mobs below them when they form
|
2017-08-30 17:06:38 -05:00 |
|
CitadelStationBot
|
c2a792d577
|
Converts npc saves to jsons
|
2017-08-30 08:01:36 -05:00 |
|
kevinz000
|
93647d77ad
|
[DNM] Fixes the codebase (#2556)
* fixes stuff
* goddamnit flags
|
2017-08-30 00:08:40 -07: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
|
17142cc247
|
Merge pull request #2530
|
2017-08-29 22:39:57 -07:00 |
|
kevinz000
|
f70fd6a980
|
Merge pull request #2536
|
2017-08-29 22:39:54 -07:00 |
|
kevinz000
|
039aea1724
|
Merge pull request #2541
|
2017-08-29 22:39:48 -07:00 |
|
kevinz000
|
967d0c5dee
|
Merge pull request #2542
|
2017-08-29 22:39:45 -07:00 |
|
kevinz000
|
00362331d3
|
Merge pull request #2543
|
2017-08-29 22:39:43 -07:00 |
|
kevinz000
|
7239a44ef1
|
Merge pull request #2545
|
2017-08-29 22:39:08 -07:00 |
|
kevinz000
|
d4c23fdcd1
|
Merge pull request #2546
|
2017-08-29 22:39:06 -07:00 |
|
kevinz000
|
7c7da67169
|
Merge pull request #2547
|
2017-08-29 22:39:03 -07:00 |
|
kevinz000
|
fa91df9ef8
|
Merge pull request #2548
|
2017-08-29 22:39:00 -07:00 |
|
kevinz000
|
44c3aecb3b
|
Merge pull request #2549
|
2017-08-29 22:38:57 -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
|
e7a3586ab4
|
Merge pull request #2464
|
2017-08-29 22:27:30 -07:00 |
|