Commit Graph

310 Commits

Author SHA1 Message Date
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
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
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
5de94c22e7 Fixes grammar error on spawner grenades 2017-05-04 20:25:46 -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
7c56c058b3 Adds examining mouths with flashlights 2017-05-04 06:11:22 -05:00
CitadelStationBot
a54b541635 Turrets no longer target invisible creatures 2017-05-04 06:07:09 -05:00
CitadelStationBot
8369ed376f Revenant now goes into stasis until ectoplasm is destroyed [FINISHED] 2017-05-04 06:06:05 -05:00
LetterJay
d5ade71ea9 Merge pull request #706 from Citadel-Station-13/upstream-merge-26745
[MIRROR] Adds persistent trophy cases
2017-05-03 22:49:50 -05:00
CitadelStationBot
021f55a4d1 Fixes alien eggs 2017-05-03 22:22:26 -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
337e9ca937 Merge pull request #715 from Citadel-Station-13/upstream-merge-26769
[MIRROR] Fixes proximity sensors not tracking correctly
2017-05-02 18:45:21 -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
fe5e1db512 Merge pull request #718 from Citadel-Station-13/upstream-merge-26765
[MIRROR] Makes golems able to transfer into empty shells
2017-05-02 12:24:24 -05:00
LetterJay
4ecbec1406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720 2017-05-02 11:36:27 -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
159f7f8d90 Merge pull request #602 from Citadel-Station-13/upstream-merge-26373
[MIRROR] Fixes being unable to empty an emagged cloning pod via manual ejection.
2017-05-02 11:14:14 -05:00
LetterJay
8af590f075 Merge pull request #591 from Citadel-Station-13/upstream-merge-26601
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
2017-05-02 11:10:13 -05:00
CitadelStationBot
25f1b24f62 Makes golems able to transfer into empty shells 2017-05-02 10:00:33 -05:00
CitadelStationBot
913a0c7c7f Fixes proximity sensors not tracking correctly 2017-05-02 09:55:15 -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
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -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
ea3ee7accc Adds persistent trophy cases 2017-05-01 17:31:24 -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