kevinz000
|
335b6cde56
|
Merge branch 'master' into upstream-merge-26813
|
2017-05-07 22:31:16 -07:00 |
|
kevinz000
|
a87cee8a05
|
copy-paste-this-from-tg
|
2017-05-07 22:30:43 -07:00 |
|
kevinz000
|
68f7ea7fd0
|
handled rejects
|
2017-05-07 22:30:28 -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
|
066c8e8de8
|
Merge pull request #720 from Citadel-Station-13/upstream-merge-26822
[MIRROR] Trophy case hotfixes
|
2017-05-07 22:27:05 -07:00 |
|
kevinz000
|
48d9e2e349
|
fixes rejects
|
2017-05-07 22:24:26 -07:00 |
|
kevinz000
|
5d2f131d07
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26822
|
2017-05-07 22:22:24 -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
|
78d64cbeed
|
Merge pull request #825 from Citadel-Station-13/upstream-merge-26941
[MIRROR] C4 planting takes 3 seconds, down from 5
|
2017-05-07 12:59:10 -07:00 |
|
CitadelStationBot
|
1a5050692b
|
Fixes his grace CtrlClick
|
2017-05-07 11:33:55 -05:00 |
|
CitadelStationBot
|
b0cceb8766
|
C4 planting takes 3 seconds, down from 5
|
2017-05-07 09:31:51 -05: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
|
d9908a74a7
|
Merge pull request #748 from Citadel-Station-13/upstream-merge-26808
[MIRROR] Adds aesthetic basalt floor tiles
|
2017-05-07 06:24:50 -07: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
|
035dd93158
|
Merge pull request #756 from Citadel-Station-13/upstream-merge-26848
[MIRROR] Adds spewium toxin in traitor kits
|
2017-05-06 21:43:08 -07:00 |
|
kevinz000
|
51442e4930
|
Merge pull request #802 from Citadel-Station-13/upstream-merge-26930
[MIRROR] Preliminary tesla projectile refactor (also insults vcordie because I'm mean.)
|
2017-05-06 21:34:07 -07:00 |
|
kevinz000
|
c8dbcb8597
|
Merge pull request #754 from Citadel-Station-13/upstream-merge-26863
[MIRROR] Fixes dropped cyborg repair modules
|
2017-05-06 21:30:12 -07:00 |
|
kevinz000
|
c93ac289ae
|
Merge pull request #766 from Citadel-Station-13/upstream-merge-26850
[MIRROR] New dirt sprites and jungle chasms
|
2017-05-06 21:29:42 -07:00 |
|
kevinz000
|
1168d06c9e
|
Merge pull request #759 from Citadel-Station-13/upstream-merge-26849
[MIRROR] New Tree Sprites
|
2017-05-06 21:25:06 -07:00 |
|
kevinz000
|
0e718e32cc
|
Merge pull request #760 from Citadel-Station-13/upstream-merge-26804
[MIRROR] Nuke op TC consoles can donate all TCs at once, and other small changes.
|
2017-05-06 21:23:46 -07:00 |
|
kevinz000
|
329190d660
|
Merge pull request #809 from Citadel-Station-13/upstream-merge-26933
[MIRROR] Makes medbay vending machines buildable
|
2017-05-06 14:22:08 -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
|
638250993c
|
Merge pull request #770 from Citadel-Station-13/upstream-merge-26873
[MIRROR] Fixes grammar error on spawner grenades
|
2017-05-06 14:11:18 -07:00 |
|
kevinz000
|
d1a8f643d6
|
Merge pull request #738 from Citadel-Station-13/upstream-merge-26774
[MIRROR] Fixes alien eggs
|
2017-05-06 13:59:33 -07:00 |
|
kevinz000
|
28f6096503
|
Merge pull request #788 from Citadel-Station-13/upstream-merge-26911
[MIRROR] Improves vending machine user feedback
|
2017-05-06 13:59:05 -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
|
30f7e170a3
|
Makes medbay vending machines buildable
|
2017-05-06 13:52:12 -05:00 |
|
kevinz000
|
3f67f8bf24
|
Merge pull request #747 from Citadel-Station-13/upstream-merge-26798
[MIRROR] Adds examining mouths with flashlights
|
2017-05-06 11:41:36 -07:00 |
|
kevinz000
|
62b8f929bb
|
Merge pull request #746 from Citadel-Station-13/upstream-merge-26794
[MIRROR] Turrets no longer target invisible creatures
|
2017-05-06 11:39:01 -07: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
|
8a3b280ede
|
Preliminary tesla projectile refactor (also insults vcordie because I'm mean.)
|
2017-05-06 10:42:51 -05:00 |
|
CitadelStationBot
|
b72f4102a1
|
Internal affairs upgrades [READY]
|
2017-05-06 10:16:24 -05:00 |
|
CitadelStationBot
|
0fb29b2650
|
Improves vending machine user feedback
|
2017-05-05 18:10:01 -05:00 |
|
LetterJay
|
c489186c3f
|
message code
|
2017-05-05 10:38:03 -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
|
1bb43eb7ae
|
woo
|
2017-05-05 10:21:53 -05:00 |
|
LetterJay
|
caaf0fc2ee
|
Merge pull request #698 from Citadel-Station-13/upstream-merge-25743
[MIRROR] Holocalls
|
2017-05-05 10:19:28 -05:00 |
|
LetterJay
|
20f3280c96
|
this one time i ate boiled peanuts
|
2017-05-05 09:52:47 -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 |
|