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 |
|
CitadelStationBot
|
bbdcff81bb
|
Cultists of Nar-sie have their own language
|
2017-05-07 06:07:21 -05: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
|
f85a44ed52
|
2017 Cult Overhaul P1: Cult Master and Datum Cult
|
2017-05-06 11:56:16 -05: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
|
56d5e12263
|
Moves languages to a holder datum, gives mind its own language holder
|
2017-05-05 08:13:04 -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
|
827bbb13c2
|
Adds an effect to Mending Mantra to show who is chanting it
|
2017-05-04 17:49:28 -05:00 |
|
CitadelStationBot
|
61563241db
|
Tweaks the cost of some of the Application scriptures affected by the previous cost tweak
|
2017-05-04 16:06:46 -05:00 |
|
CitadelStationBot
|
8369ed376f
|
Revenant now goes into stasis until ectoplasm is destroyed [FINISHED]
|
2017-05-04 06:06:05 -05:00 |
|
CitadelStationBot
|
7b6f278c87
|
Mania Motors now do minor damage and continue to affect targets after they leave its range
|
2017-05-04 00:16:08 -05:00 |
|
CitadelStationBot
|
33a93a611b
|
Curator Update
|
2017-05-03 22:22:12 -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 |
|
CitadelStationBot
|
49990d0c05
|
Persistent investigate and game logs separated by round ID
|
2017-05-02 18:47:58 -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 |
|
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
|
5cb2c2152b
|
Clockcult component generation will automatically focus on components needed to activate the Ark
|
2017-05-01 12:50:33 -05:00 |
|