shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,256 Commits 5 Branches 0 Tags
4680f045ffa61ba648e055457e93d0c1e28fb81c
Commit Graph

77 Commits

Author SHA1 Message Date
CitadelStationBot
b42e5c8721 Fixes clock cultists not getting their "objective" 2017-05-24 16:15:47 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot
b943780a8c If ratvar is alive, turning clockwork floors into clockwork walls is fast 2017-05-19 06:25:19 -05:00
LetterJay
369edc07d2 Merge pull request #1044 from Citadel-Station-13/upstream-merge-27347 
[MIRROR] fixes ratvar shuttles
 2017-05-18 23:45:31 -04:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
ef164ada86 fixes ratvar shuttles 2017-05-18 16:37:42 -05:00
CitadelStationBot
bbcc6f9be9 Proselytizing alloy shards will now proselytize all the shards in the tile 2017-05-18 16:37:26 -05:00
CitadelStationBot
b0760b9b33 Fixes not being able to cancel Geis and being able to cancel Volt Void (#998) 2017-05-18 12:07:02 -05:00
CitadelStationBot
a23a3b5cce Fixes clockwork obelisks (#997) 2017-05-18 12:06:46 -05:00
CitadelStationBot
e1729434d1 [MIRROR] Adds some antag alerts (#926) 
* Adds some antag alerts

* Add files via upload

* Delete ClockCult.ogg
 2017-05-18 11:27:52 -05:00
CitadelStationBot
c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
CitadelStationBot
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05: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
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
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
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
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
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
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
CitadelStationBot
426430369e Sigils of Transgression are slightly more visible and glow very faintly 2017-05-05 10:28:22 -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
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
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
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
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
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
faaf0c17ba Small fixes to spatial gateways 2017-05-01 11:39:13 -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
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