CitadelStationBot
|
66b02755cb
|
Fixes testmerge display (#1644)
|
2017-06-17 13:15:21 -07:00 |
|
LetterJay
|
12d9e0f66f
|
Merge pull request #1638 from Citadel-Station-13/upstream-merge-28510
[MIRROR] Allows fine control over rider/passenger direction in vehicles
|
2017-06-17 10:05:52 -05:00 |
|
LetterJay
|
67db8fc9ad
|
Merge pull request #1630 from Citadel-Station-13/upstream-merge-28492
[MIRROR] Vomit fix
|
2017-06-17 10:03:11 -05:00 |
|
CitadelStationBot
|
df0194c87f
|
Allows fine control over rider/passenger direction in vehicles
|
2017-06-17 07:34:18 -05:00 |
|
CitadelStationBot
|
9bd98194b2
|
Vomit fix
|
2017-06-16 15:19:26 -05:00 |
|
CitadelStationBot
|
2e9e7f5488
|
Cultists must be human to run for Cult Master status
|
2017-06-16 12:53:49 -05:00 |
|
CitadelStationBot
|
ef336bb4ad
|
Fixes a documentation typo
|
2017-06-15 20:48:37 -05:00 |
|
LetterJay
|
f0f6341588
|
Create verbs.dm
|
2017-06-15 10:06:05 -05:00 |
|
LetterJay
|
4c1b223248
|
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
|
2017-06-14 06:41:01 -05:00 |
|
CitadelStationBot
|
5c2acd599e
|
[MIRROR] HOTFIX: Cult now gets a functioning summon objective (#1509)
* HOTFIX: Cult now gets a functioning summon objective
* Update datum_cult.dm
* Delete datum_cult.dm.rej
|
2017-06-13 20:40:49 -07:00 |
|
CitadelStationBot
|
97005222ff
|
Blood Cult Nerf: Restricted Nar-Sie summoning locations (#1479)
|
2017-06-13 13:48:49 -07:00 |
|
CitadelStationBot
|
5db49fb44b
|
Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#1430)
|
2017-06-13 13:48:36 -07:00 |
|
LetterJay
|
226345d82a
|
upstream-merge-28109
upstream-merge-28352
|
2017-06-13 01:10:21 -05:00 |
|
LetterJay
|
2a5be91970
|
compile fixes
|
2017-06-12 16:12:00 -05:00 |
|
LetterJay
|
55d30f865b
|
upstream-merge-28062
|
2017-06-12 12:20:07 -05:00 |
|
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 |
|
CitadelStationBot
|
4276cdde17
|
Fixes attacking not breaking chameleon
|
2017-06-10 12:19:39 -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 |
|