LetterJay
|
da4e4bbefe
|
Merge pull request #707 from Citadel-Station-13/upstream-merge-26746
[MIRROR] Makes admin sound announcement use the right span
|
2017-05-05 09:39:04 -05:00 |
|
LetterJay
|
91f3059be1
|
Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
[MIRROR] Moves tips from config to strings tree
|
2017-05-05 09:33:45 -05:00 |
|
CitadelStationBot
|
4141b6549f
|
Adds eyeball soup and spaghetti to the game: it's now been 8 days edition
|
2017-05-03 01:42:35 -05:00 |
|
LetterJay
|
2926b7e8b1
|
Merge pull request #723 from Citadel-Station-13/revert-690-upstream-merge-26739
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
|
2017-05-02 20:03:13 -05:00 |
|
LetterJay
|
007281a51c
|
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
|
2017-05-02 18:53:59 -05:00 |
|
LetterJay
|
0cb4d54194
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26735
|
2017-05-02 18:49:35 -05:00 |
|
LetterJay
|
92f96986b9
|
Merge pull request #705 from Citadel-Station-13/upstream-merge-26743
[MIRROR] Fixes Biogenerator
|
2017-05-02 18:47:23 -05:00 |
|
LetterJay
|
91cb42cf60
|
Merge pull request #699 from Citadel-Station-13/upstream-merge-26556
[MIRROR] Saline-glucose changes
|
2017-05-02 18:44:53 -05:00 |
|
LetterJay
|
8a5c180dd3
|
Update recipes_misc.dm
|
2017-05-02 13:41:10 -05:00 |
|
LetterJay
|
a57190b9c5
|
Merge pull request #694 from Citadel-Station-13/upstream-merge-26708
[MIRROR] Ore redemption machine cleanup
|
2017-05-02 12:26:28 -05:00 |
|
LetterJay
|
fe5e1db512
|
Merge pull request #718 from Citadel-Station-13/upstream-merge-26765
[MIRROR] Makes golems able to transfer into empty shells
|
2017-05-02 12:24:24 -05:00 |
|
LetterJay
|
4ecbec1406
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
|
2017-05-02 11:36:27 -05:00 |
|
LetterJay
|
6310292531
|
woo
|
2017-05-02 11:19:14 -05:00 |
|
LetterJay
|
c62fc3886a
|
Merge pull request #671 from Citadel-Station-13/upstream-merge-26715
[MIRROR] [FUN REMOVAL] Makes fire not able to become ice.
|
2017-05-02 11:18:05 -05:00 |
|
LetterJay
|
818940cbc3
|
Merge pull request #645 from Citadel-Station-13/upstream-merge-26598
[MIRROR] Cult Construct Non-Balance Update
|
2017-05-02 11:16:12 -05:00 |
|
LetterJay
|
2bef665038
|
Merge pull request #613 from Citadel-Station-13/upstream-merge-26563
[MIRROR] Renames generic armor and athletic shorts
|
2017-05-02 11:14:47 -05:00 |
|
LetterJay
|
159f7f8d90
|
Merge pull request #602 from Citadel-Station-13/upstream-merge-26373
[MIRROR] Fixes being unable to empty an emagged cloning pod via manual ejection.
|
2017-05-02 11:14:14 -05:00 |
|
LetterJay
|
8af590f075
|
Merge pull request #591 from Citadel-Station-13/upstream-merge-26601
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
|
2017-05-02 11:10:13 -05:00 |
|
CitadelStationBot
|
25f1b24f62
|
Makes golems able to transfer into empty shells
|
2017-05-02 10:00:33 -05:00 |
|
LetterJay
|
587043f1e8
|
pls
|
2017-05-02 09:44:19 -05:00 |
|
LetterJay
|
fd6df15f93
|
Merge branch 'master' into upstream-merge-26131
|
2017-05-02 09:19:49 -05:00 |
|
LetterJay
|
f7fe20887a
|
manual merge
|
2017-05-02 08:40:10 -05:00 |
|
LetterJay
|
3b8484b52b
|
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
|
2017-05-02 05:13:49 -05:00 |
|
LetterJay
|
a8e6de5795
|
manual merge
|
2017-05-02 05:06:13 -05:00 |
|
LetterJay
|
4a6ffec412
|
rej cleanup
|
2017-05-02 04:56:46 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
CitadelStationBot
|
fa888cc521
|
Fixes drakes continuing to swoop when killed (#713)
|
2017-05-02 02:49:41 -05:00 |
|
CitadelStationBot
|
b45d4ba668
|
Makes admin sound announcement use the right span
|
2017-05-01 17:32:29 -05:00 |
|
CitadelStationBot
|
8758791278
|
Fixes Biogenerator
|
2017-05-01 17:28:18 -05:00 |
|
LetterJay
|
b57a4aa6b4
|
Merge branch 'master' into upstream-merge-26386
|
2017-05-01 15:27:25 -05:00 |
|
CitadelStationBot
|
3e80105ffb
|
Saline-glucose changes
|
2017-05-01 12:55:45 -05:00 |
|
CitadelStationBot
|
e2a95703de
|
Ore redemption machine cleanup
|
2017-05-01 11:54:33 -05:00 |
|
CitadelStationBot
|
529125d3dd
|
Moves tips from config to strings tree
|
2017-05-01 11:51:27 -05:00 |
|
CitadelStationBot
|
185e077f33
|
Port SM shards to initialize
|
2017-05-01 11:38:08 -05:00 |
|
CitadelStationBot
|
34a701a1bc
|
You can no longer queue up ahelps by queing up prompts
|
2017-05-01 11:38:04 -05:00 |
|
CitadelStationBot
|
99754380b5
|
Makes surplus crates less likely to contain implants
|
2017-05-01 08:39:14 -05:00 |
|
CitadelStationBot
|
de997bba41
|
Fixes the 'stuffed legion' recipie
|
2017-05-01 08:37:09 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
6102c25410
|
Merge pull request #669 from Citadel-Station-13/upstream-merge-26680
[MIRROR] Mob directory
|
2017-05-01 08:06:52 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
b016af2d63
|
Merge pull request #665 from Citadel-Station-13/upstream-merge-26712
[MIRROR] Fixes emitter sparks
|
2017-05-01 08:03:19 -05:00 |
|