Commit Graph

1152 Commits

Author SHA1 Message Date
CitadelStationBot
4a67fe55a4 Buffs nitrous oxide 2017-05-14 07:39:05 -05:00
LetterJay
155f1d3ad0 Merge pull request #789 from Citadel-Station-13/upstream-merge-26908
[MIRROR] Fixes dead mobs being initialized twice
2017-05-14 01:35:52 -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
e36d24ee24 Merge pull request #739 from Citadel-Station-13/upstream-merge-26783
[MIRROR] Mania Motors now do minor damage and continue to affect targets after they leave its range
2017-05-14 01:12:34 -04:00
LetterJay
7613a1618e Merge pull request #786 from Citadel-Station-13/upstream-merge-26958
[MIRROR] Fixes log files not generating with default config
2017-05-14 01:12:07 -04:00
LetterJay
8d237cd8bb define var 2017-05-14 00:11:23 -05:00
LetterJay
3d0a1b2573 commit 2017-05-14 00:05:53 -05:00
LetterJay
a9e0b28872 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26908 2017-05-14 00:04:52 -05:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay
ca1f0ef04e commit 2017-05-13 23:59:54 -05:00
LetterJay
e6ccfeaa51 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26958 2017-05-13 23:58:14 -05: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
LetterJay
a09e1ff34b Merge branch 'master' into upstream-merge-26840 2017-05-14 00:37:03 -04:00
LetterJay
e66cbfd7db my v key is broken 2017-05-13 23:32:47 -05:00
LetterJay
36de555483 commit 2017-05-13 23:32:23 -05:00
LetterJay
22aef374e2 Merge branch 'master' into upstream-merge-26140 2017-05-13 01:28:34 -04:00
LetterJay
485bca003f Merge pull request #640 from Citadel-Station-13/upstream-merge-26527
[MIRROR] Zombie/limb refactors/fixes
2017-05-13 01:24:55 -04:00
LetterJay
bba7b9246d rej cleanup 2017-05-13 00:12:05 -05:00
LetterJay
8c4fbd35e7 Merge pull request #697 from Citadel-Station-13/upstream-merge-25596
[MIRROR] Clockcult component generation will automatically focus on components needed to activate the Ark
2017-05-13 00:57:48 -04:00
LetterJay
f5e8a7e4e4 rej merges 2017-05-12 23:57:11 -05:00
LetterJay
18bb37f34a rej remove 2017-05-12 23:03:48 -05:00
LetterJay
a7a32e6127 commit 2017-05-12 23:03:27 -05:00
LetterJay
74ea8ce4b4 Merge pull request #790 from Citadel-Station-13/upstream-merge-26962
[MIRROR] Patches the new cleanbot bug
2017-05-12 23:54:29 -04:00
CitadelStationBot
c5ed5b84e3 Zombies can see in the dark 2017-05-12 15:57:11 -05:00
LetterJay
6989a33584 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-12 15:25:26 -05:00
LetterJay
adc1b96b74 this is kenzie's fault 2017-05-12 15:25:11 -05:00
LetterJay
a1c04dd314 Merge pull request #898 from LetterJay/master
Adds a hunter hat to the game/clothesmate
2017-05-12 16:24:17 -04:00
LetterJay
91c58632b3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-12 10:55:10 -05:00
LetterJay
6d1fb0d48a the ride never ends 2017-05-12 10:54:57 -05:00
LetterJay
2abeadb92b Merge pull request #845 from Citadel-Station-13/upstream-merge-27056
[MIRROR] Corrects get id query to ckey
2017-05-12 11:08:18 -04:00
LetterJay
745bf3b321 client procs... client procs.... client procs.... 2017-05-12 09:57:20 -05:00
LetterJay
55492bb8ec even more client fixes! this time with added admin fixes 2017-05-12 09:52:42 -05:00
LetterJay
59497ff049 more client fixes 2017-05-12 02:41:12 -05:00
LetterJay
e748d40401 Update client_procs.dm 2017-05-12 02:29:03 -05:00
LetterJay
19db647c58 Merge pull request #793 from Citadel-Station-13/upstream-merge-26922
[MIRROR] Adds player age and byond account age to player panel
2017-05-12 03:16:06 -04:00
LetterJay
c7fce18213 travis 2017-05-12 01:54:20 -05:00
LetterJay
fd5b7566fd update client_procs.dm 2017-05-12 01:49:56 -05:00
LetterJay
6a1cac4e1e Merge branch 'master' into upstream-merge-26425 2017-05-12 00:08:32 -04:00
LetterJay
8bb34472b7 fuck 2017-05-11 23:07:50 -05:00
LetterJay
ff414d3a27 rej cleanup 2017-05-11 23:00:26 -05:00
CitadelStationBot
6c4524700b Fixes character saves getting fucked up if there are no configured round start races. (#742) 2017-05-11 19:24:59 -07:00
CitadelStationBot
ff7125efb6 pAI requests now tell ghosts who is making the request. (#900) 2017-05-11 18:27:05 -07:00
CitadelStationBot
779ba7ac89 Fixes a GC error with holocalls (#903) 2017-05-11 18:26:52 -07:00
CitadelStationBot
ce65bd28b0 Hopefully fixes a holocall runtime (#902) 2017-05-11 18:26:33 -07:00
CitadelStationBot
a679933cc7 SDQL cleanup (#904) 2017-05-11 18:26:15 -07:00
CitadelStationBot
0265ab60ff Cleans up an MC statement (#907) 2017-05-11 18:24:48 -07:00
CitadelStationBot
b6c5f0b4fa Removes explosion delays (#911) 2017-05-11 18:24:28 -07:00
CitadelStationBot
7f0f7e1cc6 Cleans up meter's Initialize (#905) 2017-05-11 18:24:00 -07:00
CitadelStationBot
eadee76e87 Adds a few more abductee objectives. (#909) 2017-05-11 18:23:47 -07:00