shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,306 Commits 5 Branches 0 Tags
fc7be7e32b72cf2bdb0083e8b3b6eb2ea4fca618
Commit Graph

104 Commits

Author SHA1 Message Date
kevinz000 ecd0723fd4 Merge pull request #811 from Citadel-Station-13/upstream-merge-26985 
[MIRROR] Fixes really long Ratvar shuttle calls
 2017-05-06 14:19:02 -07:00
kevinz000 d4057bf862 Merge pull request #731 from Citadel-Station-13/upstream-merge-26814 
[MIRROR] Clockwork component generation is twice as fast, but scriptures cost up to twice as much
 2017-05-06 14:18:45 -07:00
kevinz000 ec8a5f713b Merge pull request #782 from Citadel-Station-13/upstream-merge-26895 
[MIRROR] Sigils of Transgression are slightly more visible and glow very faintly
 2017-05-06 13:58:28 -07:00
CitadelStationBot e9ff2203cf Fixes really long Ratvar shuttle calls 2017-05-06 15:13:33 -05:00
kevinz000 332733f90a Merge pull request #745 from Citadel-Station-13/upstream-merge-26784 
[MIRROR] Revenant now goes into stasis until ectoplasm is destroyed [FINISHED]
 2017-05-06 11:35:29 -07:00
CitadelStationBot 426430369e Sigils of Transgression are slightly more visible and glow very faintly 2017-05-05 10:28:22 -05:00
LetterJay acf8cb1597 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876 2017-05-05 10:26:02 -05:00
LetterJay f7572e62cf Merge pull request #769 from Citadel-Station-13/upstream-merge-26860 
[MIRROR] Removes changeling genetic damage
 2017-05-05 09:46:23 -05:00
LetterJay c38d507791 Merge pull request #779 from Citadel-Station-13/upstream-merge-26880 
[MIRROR] Only one successful Gang Tool recall per gang
 2017-05-05 09:44:16 -05:00
LetterJay cd1d049c18 Merge pull request #714 from Citadel-Station-13/upstream-merge-26707 
[MIRROR] Makes the cult Talisman of Horrors ranged
 2017-05-05 09:39:54 -05:00
CitadelStationBot 933a8646ba Only one successful Gang Tool recall per gang 2017-05-05 06:05:05 -05:00
CitadelStationBot 067e0b46ed Removes changeling genetic damage 2017-05-04 19:45:08 -05:00
CitadelStationBot f7d45f3010 Fixes say verbs not working 2017-05-04 18:41:04 -05:00
CitadelStationBot 8369ed376f Revenant now goes into stasis until ectoplasm is destroyed [FINISHED] 2017-05-04 06:06:05 -05:00
CitadelStationBot bafafbadf2 Clockwork component generation is twice as fast, but scriptures cost up to twice as much 2017-05-03 22:21:55 -05:00
LetterJay 1eb0617037 Merge pull request #692 from Citadel-Station-13/upstream-merge-26738 
[MIRROR] Small fixes to spatial gateways
 2017-05-02 12:24:53 -05:00
LetterJay 6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay b4782e24af Merge pull request #636 from Citadel-Station-13/upstream-merge-26594 
[MIRROR] Blood Cult removals and tweaks
 2017-05-02 11:15:14 -05:00
LetterJay fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -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
CitadelStationBot aa45f555e3 Makes the cult Talisman of Horrors ranged 2017-05-02 04:57:29 -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
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 faaf0c17ba Small fixes to spatial gateways 2017-05-01 11:39:13 -05:00
CitadelStationBot 242cc65eac Gang Pen Is now Stealthy 2017-05-01 11:05:28 -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 3955c7da7d Merge pull request #651 from Citadel-Station-13/upstream-merge-26681 
[MIRROR] You can no longer spam-spawn scarabs via Ratvar
 2017-05-01 07:59:16 -05:00
LetterJay 817b259192 Merge pull request #648 from kevinz000/patch-2 
Gives help intent groin functionality to wicker dolls
 2017-05-01 07:58:09 -05:00
LetterJay 954b035868 Merge pull request #644 from Citadel-Station-13/upstream-merge-26651 
[MIRROR] Replaces Double Agents with Internal Affairs
 2017-05-01 07:56:17 -05:00
LetterJay 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
LetterJay 56b3d36521 Merge pull request #632 from Citadel-Station-13/upstream-merge-26611 
[MIRROR] Replaces Mending Motor with Mending Mantra
 2017-05-01 07:42:51 -05:00
CitadelStationBot 9be1a5db4f Moves antag datums to the mind 2017-04-30 14:32:15 -05:00
CitadelStationBot e7f9e6652f You can no longer spam-spawn scarabs via Ratvar 2017-04-29 15:44:47 -05:00
LetterJay 06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay 991fb8335c manual merge 2017-04-29 11:42:28 -05:00
kevinz000 9b46470c57 Update artefact.dm 2017-04-29 02:34:43 -07:00
CitadelStationBot bd4c8dc6c3 Replaces Double Agents with Internal Affairs 2017-04-28 21:08:24 -05:00
CitadelStationBot e1883354ba Nerfs and buffs The Traps 2017-04-28 21:03:57 -05:00
CitadelStationBot fb924f1f8d Blood Cult removals and tweaks 2017-04-28 21:01:48 -05:00
CitadelStationBot 3fa6f63608 Replaces Mending Motor with Mending Mantra 2017-04-28 20:57:31 -05:00
CitadelStationBot 6aa436c874 Whisper() now has the same args as Say() 2017-04-28 20:53:20 -05:00
LetterJay a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981 
[MIRROR] Initialize Refactor
 2017-04-28 09:29:00 -05:00
LetterJay d34b65da86 Merge pull request #610 from Citadel-Station-13/upstream-merge-26612 
[MIRROR] Even admin-called shuttles will be affected by alert level
 2017-04-28 08:19:09 -05:00
LetterJay eeef152079 Merge pull request #619 from Citadel-Station-13/upstream-merge-26630 
[MIRROR] Abductor fixes and tweaks
 2017-04-28 08:17:39 -05:00
CitadelStationBot caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot aa5fec0bd8 Abductor fixes and tweaks 2017-04-28 06:13:42 -05:00
CitadelStationBot 57a0e05679 Even admin-called shuttles will be affected by alert level 2017-04-27 16:55:12 -05:00
CitadelStationBot bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00