fd6df15f93
Merge branch 'master' into upstream-merge-26131
2017-05-02 09:19:49 -05:00
f7fe20887a
manual merge
2017-05-02 08:40:10 -05:00
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
a8e6de5795
manual merge
2017-05-02 05:06:13 -05:00
4a6ffec412
rej cleanup
2017-05-02 04:56:46 -05:00
7ab8ee8cae
Merge pull request #581 from Citadel-Station-13/upstream-merge-26524
...
[MIRROR] Admin proc calls are now serialized per admin
2017-05-02 04:51:43 -05:00
d3850bde68
Merge pull request #691 from Citadel-Station-13/upstream-merge-26740
...
[MIRROR] Port SM shards to initialize
2017-05-02 03:04:54 -05:00
9036e8c63a
Merge pull request #690 from Citadel-Station-13/upstream-merge-26739
...
[MIRROR] You can no longer queue up ahelps by queing up prompts
2017-05-02 03:04:37 -05:00
7d697b153b
Merge pull request #686 from Citadel-Station-13/upstream-merge-26737
...
[MIRROR] Makes surplus crates less likely to contain implants
2017-05-02 03:04:09 -05:00
fa888cc521
Fixes drakes continuing to swoop when killed ( #713 )
2017-05-02 02:49:41 -05:00
b57a4aa6b4
Merge branch 'master' into upstream-merge-26386
2017-05-01 15:27:25 -05:00
185e077f33
Port SM shards to initialize
2017-05-01 11:38:08 -05:00
34a701a1bc
You can no longer queue up ahelps by queing up prompts
2017-05-01 11:38:04 -05:00
99754380b5
Makes surplus crates less likely to contain implants
2017-05-01 08:39:14 -05:00
a3eec6c8f9
Merge pull request #670 from Citadel-Station-13/upstream-merge-26713
...
[MIRROR] [s] SDQL security patches
2017-05-01 08:11:36 -05:00
31ea9cb309
Merge pull request #657 from Citadel-Station-13/upstream-merge-26689
...
[MIRROR] [s] Patches SDQL exploits that can return world reference
2017-05-01 08:11:22 -05:00
d7624b5824
Merge pull request #678 from Citadel-Station-13/upstream-merge-26663
...
[MIRROR] Buffs jump boot dash speed
2017-05-01 08:10:23 -05:00
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
3c786aa8c0
Merge pull request #681 from Citadel-Station-13/upstream-merge-26719
...
[MIRROR] Fixes some null.add_reagents runtimes
2017-05-01 08:09:55 -05:00
6102c25410
Merge pull request #669 from Citadel-Station-13/upstream-merge-26680
...
[MIRROR] Mob directory
2017-05-01 08:06:52 -05:00
be766d9539
Merge pull request #668 from Citadel-Station-13/upstream-merge-26691
...
[MIRROR] Fixes changelings being unable to revive from death without a brain
2017-05-01 08:04:21 -05:00
9b8ddc57b3
Merge pull request #667 from Citadel-Station-13/upstream-merge-26694
...
[MIRROR] Fixes seeing the you are a brain! message during monkey transformation
2017-05-01 08:04:10 -05:00
03bae077e9
Merge pull request #666 from Citadel-Station-13/upstream-merge-26706
...
[MIRROR] Removes Rest from Voice of God
2017-05-01 08:03:50 -05:00
b016af2d63
Merge pull request #665 from Citadel-Station-13/upstream-merge-26712
...
[MIRROR] Fixes emitter sparks
2017-05-01 08:03:19 -05:00
dd904e3640
Merge pull request #663 from Citadel-Station-13/upstream-merge-26736
...
[MIRROR] >You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-05-01 08:02:44 -05:00
73c1a83d62
Merge pull request #660 from Citadel-Station-13/upstream-merge-26692
...
[MIRROR] Fixes debraining messages showing up one place they shouldn't
2017-05-01 08:01:55 -05:00
c93c5bf50f
Merge pull request #655 from Citadel-Station-13/upstream-merge-26693
...
[MIRROR] Prevents GODMODE mobs from dying to organ removal
2017-05-01 08:00:07 -05:00
061e49d651
Merge pull request #654 from Citadel-Station-13/upstream-merge-26662
...
[MIRROR] Status effects are actually deleted/handled when the mob is deleted
2017-05-01 07:59:55 -05:00
d46b85e9ed
Merge pull request #653 from Citadel-Station-13/upstream-merge-26676
...
[MIRROR] Fix SDQL vars again
2017-05-01 07:59:42 -05:00
b2c1ff2bc2
Merge pull request #647 from Citadel-Station-13/upstream-merge-26398
...
[MIRROR] Old ore processor cleanup
2017-05-01 07:57:38 -05:00
1a5ab1d5be
Merge pull request #639 from Citadel-Station-13/upstream-merge-26633
...
[MIRROR] Adds death checks to two hallucinations, preventing the dead from spasming
2017-05-01 07:44:25 -05:00
5cab328632
Merge pull request #638 from Citadel-Station-13/upstream-merge-26536
...
[MIRROR] Nerfs and buffs The Traps
2017-05-01 07:44:15 -05:00
bd2b4207e2
Merge pull request #637 from Citadel-Station-13/upstream-merge-26204
...
[MIRROR] Option for admins to show a song's title
2017-05-01 07:43:59 -05:00
8adddd5916
Merge pull request #633 from Citadel-Station-13/upstream-merge-26626
...
[MIRROR] Syndie Lavaland Base Flavortext Edit
2017-05-01 07:43:01 -05:00
25f1a398fe
Merge pull request #631 from Citadel-Station-13/upstream-merge-26622
...
[MIRROR] Adds organ storage containers
2017-05-01 07:42:37 -05:00
652f124f98
Merge pull request #630 from Citadel-Station-13/upstream-merge-26659
...
[MIRROR] Whisper() now has the same args as Say()
2017-05-01 07:42:17 -05:00
d5a4be2581
Merge pull request #625 from Citadel-Station-13/upstream-merge-26616
...
[MIRROR] Librarians can speak any language
2017-05-01 07:41:16 -05:00
780216d7f9
Merge pull request #623 from Citadel-Station-13/upstream-merge-26627
...
[MIRROR] >unironically spelling unironically wrong
2017-05-01 07:40:55 -05:00
0292483e4b
Merge pull request #622 from Citadel-Station-13/upstream-merge-26639
...
[MIRROR] Language icons
2017-05-01 07:40:43 -05:00
2d9a497f31
Merge pull request #609 from Citadel-Station-13/upstream-merge-26625
...
[MIRROR] Server hop can now be used in lobby
2017-05-01 07:39:35 -05:00
08497579d8
Fixes some null.add_reagents runtimes
2017-05-01 07:24:49 -05:00
87e306851d
Readds deepstorage w/ tweaks AND adds water bottles to vending machines
2017-05-01 07:24:41 -05:00
e4adf5d524
Buffs jump boot dash speed
2017-05-01 07:24:37 -05:00
fbe0803699
[s] SDQL security patches
2017-04-30 11:30:44 -05:00
c1bd59b7cb
Mob directory
2017-04-30 11:26:38 -05:00
6d923dd303
Fixes changelings being unable to revive from death without a brain
2017-04-30 11:25:33 -05:00
3cd929cdbe
Fixes seeing the you are a brain! message during monkey transformation
2017-04-30 11:24:28 -05:00
2338f75116
Removes Rest from Voice of God
2017-04-30 11:23:24 -05:00
cee892fad3
Fixes emitter sparks
2017-04-30 11:22:20 -05:00
3799c28620
>You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-04-30 10:24:27 -05:00
LetterJay