 deathride58
|
f2963840bc
|
Coding at 5 am is a horrible idea
|
2017-09-03 13:15:44 -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 |
|
|
deathride58
|
10d7b0cf56
|
Nerfs travis
|
2017-09-02 23:54:05 -04:00 |
|
|
deathride58
|
daa0fed298
|
we vlambeer now (adds screenshake)
|
2017-09-02 23:04:51 -04:00 |
|
|
deathride58
|
4c3fdc672a
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into screenshake
|
2017-09-02 22:56:26 -04:00 |
|
|
LetterJay
|
9c857576b4
|
Merge pull request #2581 from Citadel-Station-13/ItemAddition
Everyone now spawns with pulserifles
|
2017-09-02 07:59:09 -05:00 |
|
|
LetterJay
|
0947177b6e
|
Update tgstation.dme
|
2017-09-02 07:58:53 -05:00 |
|
|
CitadelStationBot
|
5e75fc6f27
|
Automatic changelog generation for PR #2442 [ci skip]
|
2017-09-02 07:49:04 -05:00 |
|
|
LetterJay
|
8aa7dbdbb6
|
Merge pull request #2442 from Citadel-Station-13/upstream-merge-29105
[MIRROR] Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
|
2017-09-02 07:49:03 -05:00 |
|
|
LetterJay
|
28b64099a7
|
Delete cebusoap.dmi
|
2017-09-02 07:48:32 -05:00 |
|
|
LetterJay
|
f8413517bb
|
testing
|
2017-09-02 07:43:34 -05: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
|
8731fb7e1c
|
Delete database_changelog.txt.rej
|
2017-09-02 07:07:39 -05:00 |
|
|
LetterJay
|
2bfc7872fa
|
cleanup
|
2017-09-02 07:06:37 -05:00 |
|
|
LetterJay
|
31e3f6135a
|
Update tgstation_schema.sql
|
2017-09-02 07:01:05 -05:00 |
|
|
LetterJay
|
ea0f489f95
|
Update tgstation_schema_prefixed.sql
|
2017-09-02 07:01:01 -05:00 |
|
|
LetterJay
|
2161084ba1
|
Update database_changelog.txt
|
2017-09-02 06:59:47 -05:00 |
|
|
LetterJay
|
8f7368bc57
|
Update config.txt
|
2017-09-02 06:58:30 -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
|
7734469152
|
Merge pull request #2580 from Citadel-Station-13/MirrorF
Manual Mirror of missed PRs
|
2017-09-02 06:01:16 -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
|
29f0e2edd4
|
Rename toolsmerge-upstream-pull-request.sh to merge-upstream-pull-request.sh
|
2017-09-01 22:31:16 -05:00 |
|
|
kevinz000
|
0d36f6dd47
|
Update toolsmerge-upstream-pull-request.sh (#2579)
|
2017-09-01 19:02:13 -07: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 |
|
|
CitadelStationBot
|
430833c462
|
Automatic changelog generation for PR #2578 [ci skip]
|
2017-09-01 10:29:57 -05:00 |
|
|
LetterJay
|
07e65fac7c
|
Merge pull request #2578 from Citadel-Station-13/upstream-merge-30102
[MIRROR] Various Ninja Fixes
|
2017-09-01 10:29:55 -05:00 |
|
|
LetterJay
|
a6aa71e0b9
|
commit
|
2017-09-01 09:52:29 -05:00 |
|
|
kevinz000
|
e8bb79d7c9
|
kk
|
2017-09-01 07:12:08 -07:00 |
|
|
CitadelStationBot
|
3b91a51de2
|
Various Ninja Fixes
|
2017-09-01 09:03:42 -05:00 |
|
|
kevinz000
|
5aa4631af8
|
final
|
2017-09-01 06:58:59 -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 |
|
|
LetterJay
|
8ac267eafa
|
Merge pull request #2567 from Citadel-Station-13/upstream-merge-30277
[MIRROR] Fixed Omega comms power
|
2017-08-31 22:24:37 -05:00 |
|