shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,728 Commits 5 Branches 0 Tags
ce925fa04cd167d1262a2d79351f8a8a5b7bd18d
Commit Graph

110 Commits

Author SHA1 Message Date
LetterJay
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay
932f323e39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26974 2017-05-17 05:06:23 -05:00
LetterJay
2d66148b44 Update holocall.dm 2017-05-17 04:30:52 -05:00
LetterJay
1ee7686a5b Update holocall.dm 2017-05-17 04:26:16 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
e121ad79c9 commit 2017-05-17 04:03:54 -05:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay
4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
LetterJay
4b72cc0486 Merge pull request #712 from Citadel-Station-13/upstream-merge-26760 
[MIRROR] Changes a bunch of hrefs to the proper defines
 2017-05-14 01:32:52 -04:00
LetterJay
00b17f1649 maybe 2017-05-14 00:28:07 -05:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay
ebb4e134cb commit 2017-05-13 23:45:02 -05:00
LetterJay
38eeeaa6d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783 2017-05-13 23:42:19 -05:00
CitadelStationBot
ce65bd28b0 Hopefully fixes a holocall runtime (#902) 2017-05-11 18:26:33 -07:00
CitadelStationBot
4d9b48e5c5 Commit hash in rev data is now shortened (#873) 2017-05-10 16:28:14 -07:00
CitadelStationBot
92bbdafc94 Adjusts Meteor Shuttle name for grammar (#862) 2017-05-08 16:43:37 -07:00
kevinz000
41341e50a5 Merge pull request #696 from Citadel-Station-13/upstream-merge-25458 
[MIRROR] Belligerent now prevents you from running even between chants
 2017-05-07 23:19:35 -07:00
kevinz000
e94993f437 Revert "Delete mind.dm.rej" 
This reverts commit 9430f89756.
 2017-05-07 23:07:10 -07:00
kevinz000
9430f89756 Delete mind.dm.rej 2017-05-07 23:06:10 -07:00
kevinz000
bebb9ec571 Delete status_effect.dm.rej 2017-05-07 22:44:14 -07:00
kevinz000
14a9bda61e Update status_effect.dm 2017-05-07 22:44:06 -07:00
kevinz000
cc25c18196 Merge pull request #801 from Citadel-Station-13/upstream-merge-26921 
[MIRROR] Internal affairs upgrades [READY]
 2017-05-07 06:23:59 -07:00
kevinz000
a1cb1d456d Merge pull request #800 from Citadel-Station-13/upstream-merge-26934 
[MIRROR] Seed vault lavaland ruin can only spawn once
 2017-05-06 21:24:46 -07:00
CitadelStationBot
f85a44ed52 2017 Cult Overhaul P1: Cult Master and Datum Cult 2017-05-06 11:56:16 -05:00
CitadelStationBot
b72f4102a1 Internal affairs upgrades [READY] 2017-05-06 10:16:24 -05:00
CitadelStationBot
2922a9fee8 Seed vault lavaland ruin can only spawn once 2017-05-06 08:09:25 -05:00
CitadelStationBot
4d8f80efaf Fixes roundstart spawning 2017-05-06 04:09:32 -05:00
CitadelStationBot
684c4a5244 Fixes answering a holocall not disconnecting other calls 2017-05-05 10:28:26 -05:00
LetterJay
1bb43eb7ae woo 2017-05-05 10:21:53 -05:00
LetterJay
caaf0fc2ee Merge pull request #698 from Citadel-Station-13/upstream-merge-25743 
[MIRROR] Holocalls
 2017-05-05 10:19:28 -05:00
LetterJay
5d0f7eafaa Merge pull request #719 from Citadel-Station-13/upstream-merge-26771 
[MIRROR] Removes vestigial list from minds.
 2017-05-05 09:40:28 -05:00
CitadelStationBot
56d5e12263 Moves languages to a holder datum, gives mind its own language holder 2017-05-05 08:13:04 -05:00
CitadelStationBot
7b6f278c87 Mania Motors now do minor damage and continue to affect targets after they leave its range 2017-05-04 00:16:08 -05:00
LetterJay
f333944be0 le fix 2017-05-03 09:02:19 -05:00
CitadelStationBot
6a365857d1 Should fix all of the cult/clockcult issues 2017-05-02 20:44:34 -05:00
LetterJay
368a2e82c1 Merge pull request #709 from Citadel-Station-13/upstream-merge-26762 
[MIRROR] Fixes cult datum giving the action button to the mind instead of mob
 2017-05-02 18:47:55 -05:00
LetterJay
84db006ea9 Merge pull request #711 from Citadel-Station-13/upstream-merge-26799 
[MIRROR] Fixes cult and clockcult icons
 2017-05-02 18:46:38 -05:00
CitadelStationBot
7baccb8b85 Removes vestigial list from minds. 2017-05-02 12:47:20 -05:00
LetterJay
4ecbec1406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720 2017-05-02 11:36:27 -05:00
LetterJay
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
LetterJay
a8e6de5795 manual merge 2017-05-02 05:06:13 -05:00
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot
22f6aecdf7 Fixes cult and clockcult icons 2017-05-01 21:03:40 -05:00
CitadelStationBot
3fff6d4a1d Fixes cult datum giving the action button to the mind instead of mob 2017-05-01 20:27:03 -05:00
CitadelStationBot
36dfc5a4db Holocalls 2017-05-01 12:53:40 -05:00
CitadelStationBot
301ad1b0fc Belligerent now prevents you from running even between chants 2017-05-01 12:49:28 -05:00
CitadelStationBot
1426a20834 Gaining Vanguard will remove existing stuns 2017-05-01 11:07:33 -05:00
LetterJay
3d6845675a Merge pull request #679 from Citadel-Station-13/upstream-merge-26709 
[MIRROR] Readds deepstorage w/ tweaks AND adds water bottles to vending machines
 2017-05-01 08:10:13 -05:00