shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,302 Commits 5 Branches 0 Tags
3dca4dd3796d94de37a394d9423826903c75d59f
Commit Graph

13931 Commits

Author SHA1 Message Date
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
CitadelStationBot
aa45f555e3 Makes the cult Talisman of Horrors ranged 2017-05-02 04:57:29 -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
e4bb3ebfb7 Merge pull request #689 from Citadel-Station-13/upstream-merge-25603 
[MIRROR] Gaining Vanguard will remove existing stuns
 2017-05-02 03:04:25 -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
LetterJay
a6263621e7 Merge pull request #688 from Citadel-Station-13/upstream-merge-26729 
[MIRROR] Gang Pen Is now Stealthy
 2017-05-02 03:03:43 -05:00
CitadelStationBot
fa888cc521 Fixes drakes continuing to swoop when killed (#713) 2017-05-02 02:49:41 -05:00
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot
22f6aecdf7 Fixes cult and clockcult icons 2017-05-01 21:03:40 -05:00
CitadelStationBot
3fff6d4a1d Fixes cult datum giving the action button to the mind instead of mob 2017-05-01 20:27:03 -05:00
CitadelStationBot
d29de62d69 Plants now react with turfs on squash() 2017-05-01 17:34:34 -05:00
CitadelStationBot
b45d4ba668 Makes admin sound announcement use the right span 2017-05-01 17:32:29 -05:00
CitadelStationBot
ea3ee7accc Adds persistent trophy cases 2017-05-01 17:31:24 -05:00
CitadelStationBot
8758791278 Fixes Biogenerator 2017-05-01 17:28:18 -05:00
CitadelStationBot
cc0a9b87fb Changes /obj/machinery to have atom/movable occupants 2017-05-01 15:58:52 -05:00
LetterJay
64fd72f1cf Update artefact.dm 2017-05-01 15:31:51 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
161891e51b conflict res 2017-05-01 15:26:17 -05:00
CitadelStationBot
00164a49a7 Subsystem change for the SM and TEG and slight QoL 2017-05-01 13:06:07 -05:00
CitadelStationBot
3e80105ffb Saline-glucose changes 2017-05-01 12:55:45 -05:00
CitadelStationBot
36dfc5a4db Holocalls 2017-05-01 12:53:40 -05:00
CitadelStationBot
5cb2c2152b Clockcult component generation will automatically focus on components needed to activate the Ark 2017-05-01 12:50:33 -05:00
CitadelStationBot
301ad1b0fc Belligerent now prevents you from running even between chants 2017-05-01 12:49:28 -05:00
CitadelStationBot
7afd85e3fc PR announcement spam prevention 2017-05-01 12:47:22 -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
faaf0c17ba Small fixes to spatial gateways 2017-05-01 11:39:13 -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
1426a20834 Gaining Vanguard will remove existing stuns 2017-05-01 11:07:33 -05:00
CitadelStationBot
242cc65eac Gang Pen Is now Stealthy 2017-05-01 11:05:28 -05:00
CitadelStationBot
99754380b5 Makes surplus crates less likely to contain implants 2017-05-01 08:39:14 -05:00
LetterJay
1842665af6 idjeet 2017-05-01 08:38:03 -05:00
CitadelStationBot
de997bba41 Fixes the 'stuffed legion' recipie 2017-05-01 08:37:09 -05:00
CitadelStationBot
55b9c06e63 A bunch of sparks to do_sparks 2017-05-01 08:36:04 -05:00
CitadelStationBot
ace93b6cfd Buffs mercury and lithium 2017-05-01 08:34:51 -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
7261d61983 Merge pull request #672 from Citadel-Station-13/upstream-merge-26717 
[MIRROR] Moves antag datums to the mind
 2017-05-01 08:09:22 -05:00
LetterJay
03efaf3f13 Merge pull request #673 from Citadel-Station-13/upstream-merge-26718 
[MIRROR] Winter Wonderland holodeck no longer has freon, and it's no longer restricted
 2017-05-01 08:09:07 -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