Commit Graph

184 Commits

Author SHA1 Message Date
LetterJay
11ff6a7628 upstream-merge-27971 2017-06-11 08:21:14 -05:00
LetterJay
c760c52817 upstream-merge-27951 2017-06-11 02:11:34 -05:00
LetterJay
eac4854adf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165 2017-06-10 09:38:21 -05:00
LetterJay
7fa05ca854 Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
2017-06-09 09:37:58 -05:00
CitadelStationBot
1bdda132e7 Adds Medal Commendations! 2017-06-08 20:39:15 -05:00
CitadelStationBot
d859e3a637 Diseases can now only spread to mobs with an atmos line of sight 2017-06-08 17:18:06 -05:00
CitadelStationBot
1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
LetterJay
8273877b23 Update holocall.dm 2017-06-06 13:05:38 -05:00
CitadelStationBot
98e2a659f4 Hang up holocalls with an action 2017-06-06 10:34:58 -05:00
LetterJay
60b5c7b33e Merge pull request #1247 from Citadel-Station-13/upstream-merge-27726
[MIRROR] Custom emotes no longer replace the pronouns
2017-06-06 09:00:47 -05:00
LetterJay
36a0fe00c3 Merge pull request #1244 from Citadel-Station-13/upstream-merge-27728
[MIRROR] The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it
2017-06-06 09:00:27 -05:00
LetterJay
fc1017fa14 Merge pull request #1287 from Citadel-Station-13/upstream-merge-27801
[MIRROR] Holocall cleanup
2017-06-05 23:19:23 -05:00
LetterJay
5f74de6bdf cleanup 2017-06-05 23:12:15 -05:00
LetterJay
54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728 2017-06-05 23:07:52 -05:00
LetterJay
a8fe8fd1aa cleanup 2017-06-05 22:49:04 -05:00
LetterJay
43a3a6b52a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27708 2017-06-05 22:48:20 -05:00
LetterJay
60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
CitadelStationBot
e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBot
618d893388 wat (#1380) 2017-06-04 09:09:15 -07:00
CitadelStationBot
272448de4f Fixes janicart offsets. (#1362) 2017-06-03 15:17:48 -07:00
CitadelStationBot
f8505883d4 Removes dragoontomb ruin and loot. (#1290) 2017-06-03 06:39:11 -07:00
kevinz000
b9c4873ee9 Merge branch 'master' into upstream-merge-27801 2017-06-03 06:38:57 -07:00
CitadelStationBot
dbc902ef29 Fixes martial arts resetting on cloning. (#1338) 2017-06-02 21:21:47 -07:00
LetterJay
3120544ae3 Merge pull request #1347 from Citadel-Station-13/upstream-merge-27942
[MIRROR] Fixes doppler arrays
2017-06-02 22:45:41 -05:00
CitadelStationBot
6f54c40f03 Fixes doppler arrays 2017-06-02 16:14:48 -05:00
CitadelStationBot
ac23b06edd Borg module resets now require cutting instead of pulsing the reset wire 2017-05-31 19:56:43 -05:00
LetterJay
8f06db65c9 Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534
[MIRROR] Replaced mob spawner vars with outfits
2017-05-30 21:43:31 -05:00
LetterJay
1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530
[MIRROR] Area Refactor + Var-edit Cleanup
2017-05-30 20:49:42 -05:00
LetterJay
976086e490 Merge branch 'master' into upstream-merge-27534 2017-05-30 16:45:59 -05:00
LetterJay
bc5ecc91b5 rej clean 2017-05-30 15:55:00 -05:00
LetterJay
ebaa245f0b Merge pull request #1305 from Citadel-Station-13/upstream-merge-27839
[MIRROR] Fixes another holocall runtime
2017-05-30 15:50:07 -05:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
[MIRROR]  Refactors explosions
2017-05-30 15:15:51 -05:00
CitadelStationBot
6c958c129a Fixes another holocall runtime 2017-05-30 14:44:25 -05:00
LetterJay
ae22a1876a 41 files changed, original only had 4. SPACES. 2017-05-30 14:36:11 -05:00
CitadelStationBot
0349f8c908 Holocall cleanup 2017-05-29 11:03:03 -05:00
LetterJay
aefca24012 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697 2017-05-29 02:12:41 -05:00
LetterJay
e99dea2c23 Merge pull request #1271 from Citadel-Station-13/upstream-merge-27810
[MIRROR] [s] Fixes Centcom not being selflooping
2017-05-29 02:08:24 -05:00
LetterJay
77b4be8b3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528 2017-05-28 21:49:30 -05:00
CitadelStationBot
7aff4f588e [MIRROR] refactors how vehicles use offsets + multiseat (#1128)
* refactors how vehicles use offsets + multiseat

* RIDE
2017-05-28 15:13:04 -07:00
CitadelStationBot
730deafef7 [s] Fixes Centcom not being selflooping 2017-05-28 16:02:29 -05:00
CitadelStationBot
29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
CitadelStationBot
c3f4dba33d Custom emotes no longer replace the pronouns 2017-05-27 20:56:20 -05:00
CitadelStationBot
c07034f45a The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it 2017-05-27 20:55:08 -05:00
CitadelStationBot
22e6669111 Small outfit refactor 2017-05-27 20:47:45 -05:00
CitadelStationBot
93c19d0e4b Replaces parentcommit with originmastercommit 2017-05-26 14:41:35 -05:00
LetterJay
da5b07fbd3 Merge pull request #1159 from Citadel-Station-13/upstream-merge-27600
[MIRROR] Fixes clock cultists not getting their "objective"
2017-05-25 09:38:52 -05:00
CitadelStationBot
b86db49d50 Crushers now actually mark 2017-05-24 18:28:52 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
CitadelStationBot
b42e5c8721 Fixes clock cultists not getting their "objective" 2017-05-24 16:15:47 -05:00
CitadelStationBot
4191e1f7fd Adds the Beach Bum Language 2017-05-24 05:54:42 -05:00