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

150 Commits

Author SHA1 Message Date
LetterJay
c05c7334a5 Merge pull request #923 from Citadel-Station-13/upstream-merge-27151 
[MIRROR] Adds a visible message to teleport runes being teleported to
 2017-05-14 16:36:49 -04:00
LetterJay
38eeeaa6d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783 2017-05-13 23:42:19 -05:00
LetterJay
22aef374e2 Merge branch 'master' into upstream-merge-26140 2017-05-13 01:28:34 -04:00
LetterJay
8c4fbd35e7 Merge pull request #697 from Citadel-Station-13/upstream-merge-25596 
[MIRROR] Clockcult component generation will automatically focus on components needed to activate the Ark
 2017-05-13 00:57:48 -04:00
LetterJay
18bb37f34a rej remove 2017-05-12 23:03:48 -05:00
LetterJay
a7a32e6127 commit 2017-05-12 23:03:27 -05:00
CitadelStationBot
4280c20af8 Adds a visible message to teleport runes being teleported to 2017-05-12 15:12:46 -05:00
CitadelStationBot
eadee76e87 Adds a few more abductee objectives. (#909) 2017-05-11 18:23:47 -07:00
LetterJay
3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645 
[MIRROR] Persistent investigate and game logs separated by round ID
 2017-05-10 21:12:08 -04:00
CitadelStationBot
71a36f1606 [MIRROR] 150 hours of testing (fixes master) (#889) 
* 150 hours of testing (fixes master)

* Update gang.dm

* Delete gang.dm.rej
 2017-05-10 16:10:38 -07:00
CitadelStationBot
69d72877a2 [DNM] [MIRROR] Probably fixes the ending cinematic to Gang War (#888) 
* Probably fixes the ending cinematic to Gang War

* Update gang.dm

* Delete gang.dm.rej

* Update gang.dm
 2017-05-10 16:08:32 -07:00
CitadelStationBot
82deebb863 Dominators now require a significant amount of open turf around them (#895) 2017-05-10 16:06:29 -07:00
CitadelStationBot
5c8a9c5342 Syndicate borg/reinforcement spawners have a Never For This Round option. (#851) 2017-05-08 16:48:28 -07:00
CitadelStationBot
8e0e77cd35 Nerfs Chaplain smoke book. (#758) 2017-05-08 16:45:59 -07:00
kevinz000
41341e50a5 Merge pull request #696 from Citadel-Station-13/upstream-merge-25458 
[MIRROR] Belligerent now prevents you from running even between chants
 2017-05-07 23:19:35 -07:00
kevinz000
a87424e105 Merge pull request #735 from Citadel-Station-13/upstream-merge-26813 
[MIRROR] Curator Update
 2017-05-07 22:53:24 -07:00
kevinz000
106a9d3ad9 Delete clockwork_slab.dm.rej 2017-05-07 22:48:04 -07:00
kevinz000
e12fc21d60 Update clockwork_slab.dm 2017-05-07 22:47:58 -07:00
kevinz000
54b8375f9c Merge pull request #803 from Citadel-Station-13/upstream-merge-26881 
[MIRROR] Updated: Reduces dominator timer ceiling, changes territory scaling
 2017-05-07 22:36:03 -07:00
kevinz000
4a59682803 Update gang.dm 2017-05-07 22:35:54 -07:00
kevinz000
6bf46e1a6d Delete gang.dm.rej 2017-05-07 22:35:48 -07:00
kevinz000
9012783adb Merge pull request #838 from Citadel-Station-13/upstream-merge-26888 
[MIRROR] Adds several weapons and cost adjustments to Gangtool
 2017-05-07 22:35:11 -07:00
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
kevinz000
13b0ae2b45 Merge pull request #676 from Citadel-Station-13/upstream-merge-26725 
[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
 2017-05-07 19:37:35 -07:00
kevinz000
03a52b2bc9 Merge pull request #836 from Citadel-Station-13/upstream-merge-26984 
[MIRROR] Fixes clockwork obelisk logic
 2017-05-07 19:21:56 -07:00
LetterJay
2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
CitadelStationBot
db468a1dd6 Adds several weapons and cost adjustments to Gangtool 2017-05-07 18:00:26 -05:00
CitadelStationBot
e3b3921bf2 Fixes clockwork obelisk logic 2017-05-07 17:15:22 -05:00
kevinz000
482ac95873 Merge pull request #822 from Citadel-Station-13/upstream-merge-26987 
[MIRROR] Sigils of Transgression are brighter
 2017-05-07 13:07:14 -07:00
kevinz000
cd95e42b69 Merge pull request #753 from Citadel-Station-13/upstream-merge-26870 
[MIRROR] Adds an effect to Mending Mantra to show who is chanting it
 2017-05-07 07:08:06 -07:00
CitadelStationBot
281f382605 Sigils of Transgression are brighter 2017-05-07 08:54:06 -05:00
kevinz000
cc25c18196 Merge pull request #801 from Citadel-Station-13/upstream-merge-26921 
[MIRROR] Internal affairs upgrades [READY]
 2017-05-07 06:23:59 -07:00
kevinz000
2f2c850937 Delete scripture_applications.dm.rej 2017-05-06 22:09:58 -07:00
kevinz000
61baae0544 Merge branch 'master' into upstream-merge-26864 2017-05-06 22:09:35 -07:00
kevinz000
c1a9bb5864 Update scripture_applications.dm 2017-05-06 22:08:00 -07:00
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
0972689cfc Updated: Reduces dominator timer ceiling, changes territory scaling 2017-05-06 10:44:56 -05:00
CitadelStationBot
b72f4102a1 Internal affairs upgrades [READY] 2017-05-06 10:16:24 -05: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