LetterJay
|
35b56f3075
|
Merge branch 'master' into upstream-merge-27773
|
2017-06-06 09:05:26 -05:00 |
|
LetterJay
|
71bb6c930c
|
Merge pull request #1274 from Citadel-Station-13/upstream-merge-27652
[MIRROR] [Centcom] Nanotrasen Private Security 2.0
|
2017-06-06 09:01:33 -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
|
962177c423
|
Merge branch 'master' into upstream-merge-27652
|
2017-06-05 23:16:40 -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 |
|
CitadelStationBot
|
e8663bee81
|
Refactors the latejoin list
|
2017-06-04 15:08:35 -05:00 |
|
CitadelStationBot
|
c1adecc0e2
|
Fix AI status displays to use a list instead of the world list (#1391)
|
2017-06-04 09:08:04 -07:00 |
|
CitadelStationBot
|
63f9657d9b
|
Refactors a cooldown var to not require a spawn or sleep (#1381)
|
2017-06-04 09:06:47 -07:00 |
|
CitadelStationBot
|
1c1cbe8e5b
|
Refactor another spawn var (#1395)
|
2017-06-04 09:04:56 -07:00 |
|
CitadelStationBot
|
9f02ba1245
|
Refactors another spawn cooldown var (#1393)
|
2017-06-04 09:04:49 -07:00 |
|
CitadelStationBot
|
e59e7f8d06
|
Fixes bsa not showing up (#1396)
|
2017-06-04 09:03:30 -07:00 |
|
CitadelStationBot
|
f8505883d4
|
Removes dragoontomb ruin and loot. (#1290)
|
2017-06-03 06:39:11 -07:00 |
|
CitadelStationBot
|
263b79b299
|
[MIRROR] Individual logs are no longer lost with mob changes (#1249)
* Individual logs are no longer lost with mob changes
* Delete mob_defines.dm.rej
|
2017-06-02 22:01:58 -07:00 |
|
CitadelStationBot
|
d74b8d187a
|
Binary talk now logs in the individual logging (#1335)
|
2017-06-02 22:01:15 -07:00 |
|
CitadelStationBot
|
dbc902ef29
|
Fixes martial arts resetting on cloning. (#1338)
|
2017-06-02 21:21:47 -07:00 |
|
CitadelStationBot
|
ac23b06edd
|
Borg module resets now require cutting instead of pulsing the reset wire
|
2017-05-31 19:56:43 -05:00 |
|
LetterJay
|
46bcc34a0e
|
Merge pull request #1214 from Citadel-Station-13/upstream-merge-27677
[MIRROR] Adds marker beacons to miner borgs
|
2017-05-31 01:53:38 -05:00 |
|
LetterJay
|
4654baea3b
|
Merge pull request #1217 from Citadel-Station-13/upstream-merge-27685
[MIRROR] Fixes delayed login message
|
2017-05-31 01:48:42 -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
|
df34173509
|
Merge pull request #1301 from Citadel-Station-13/upstream-merge-27831
[MIRROR] Fixes multi cyborgs
|
2017-05-30 15:50:56 -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 |
|
LetterJay
|
ae22a1876a
|
41 files changed, original only had 4. SPACES.
|
2017-05-30 14:36:11 -05:00 |
|
CitadelStationBot
|
38b10b8c53
|
Fixes multi cyborgs
|
2017-05-30 08:52:22 -05:00 |
|
LetterJay
|
dba35effd5
|
Merge pull request #1282 from Citadel-Station-13/upstream-merge-27796
[MIRROR] You can pet dogs again.
|
2017-05-29 15:01:53 -05:00 |
|
CitadelStationBot
|
94fdea8866
|
Some pAI fixes
|
2017-05-29 14:42:48 -05:00 |
|
CitadelStationBot
|
6b01698202
|
You can pet dogs again.
|
2017-05-29 08:58:43 -05:00 |
|
CitadelStationBot
|
afbfb66386
|
Splits mining_mobs.dm into separate files
|
2017-05-29 01:17:13 -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
|
f42bcaf760
|
Finally remembers to make drakes unclickable while they're in the invulnerable stage of swooping (#1262)
|
2017-05-28 15:28:51 -07:00 |
|
CitadelStationBot
|
dec17dcfe6
|
Dog beds can now be renamed after new owners (#1238)
|
2017-05-28 15:11:06 -07:00 |
|
CitadelStationBot
|
243148f27c
|
[Centcom] Nanotrasen Private Security 2.0
|
2017-05-28 16:39:14 -05:00 |
|
LetterJay
|
fcb3a53072
|
Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725
[MIRROR] Changes incorporeal movement to use defines
|
2017-05-28 14:33:22 -05:00 |
|
CitadelStationBot
|
4b9a7ce9cf
|
Adds AI follow links to PDA messages and holopad speech
|
2017-05-28 08:14:21 -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
|
2cc74f4a8f
|
Changes incorporeal movement to use defines
|
2017-05-27 20:55:04 -05:00 |
|
CitadelStationBot
|
d1e38d9e1f
|
Fixed very minor capitalization and punctuation inconsistencies. (#1104)
|
2017-05-27 13:43:20 -07:00 |
|
CitadelStationBot
|
4e381aaca4
|
Fixes legion icon (#1222)
|
2017-05-27 13:33:30 -07:00 |
|
CitadelStationBot
|
51dd042af5
|
Necropolis tendrils glow again (#1228)
|
2017-05-27 13:30:25 -07:00 |
|
CitadelStationBot
|
9288106128
|
Fixes monkeys having two Initializes and not returning a hint (#1188)
|
2017-05-27 13:29:32 -07:00 |
|
CitadelStationBot
|
1937fc5294
|
Fixes delayed login message
|
2017-05-26 23:53:21 -05:00 |
|
CitadelStationBot
|
364cfe633b
|
Adds marker beacons to miner borgs
|
2017-05-26 19:09:46 -05:00 |
|
CitadelStationBot
|
11344c4682
|
Refactors explosions
|
2017-05-24 16:45:00 -05:00 |
|
CitadelStationBot
|
85d474885b
|
Brains extracted from infectious zombies keep their old species
|
2017-05-24 16:30:36 -05:00 |
|
LetterJay
|
869953cd18
|
Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503
[MIRROR] Changes investigate logs to use a define
|
2017-05-24 12:34:36 -05:00 |
|
LetterJay
|
10f5f27bf0
|
Merge pull request #1144 from Citadel-Station-13/upstream-merge-27554
[MIRROR] Prevents inserted inert legion cores from healing
|
2017-05-24 08:33:58 -05:00 |
|
LetterJay
|
006c74c6ae
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503
|
2017-05-24 08:11:07 -05:00 |
|
LetterJay
|
34e74a377e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442
|
2017-05-24 08:06:53 -05:00 |
|