Commit Graph

884 Commits

Author SHA1 Message Date
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
LetterJay
32651c31cb Merge pull request #743 from Citadel-Station-13/upstream-merge-26806
[MIRROR] Hopefully makes flightsuit processing less taxing on the server
2017-05-06 10:26:16 -05:00
LetterJay
bd90067ed1 Merge pull request #781 from Citadel-Station-13/upstream-merge-26899
[MIRROR] Tesla light
2017-05-05 15:37:20 -05:00
LetterJay
c489186c3f message code 2017-05-05 10:38:03 -05:00
CitadelStationBot
55c71ff5a9 Tesla light 2017-05-05 10:27:18 -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
d0e6790993 Merge pull request #761 from kevinz000/patch-3
Switches off flightsuit processing because lag
2017-05-05 10:20:39 -05:00
LetterJay
811c74b45d Merge pull request #701 from Citadel-Station-13/upstream-merge-26477
[MIRROR] Subsystem change for the SM and TEG and slight QoL
2017-05-05 10:20:11 -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
bbf43a464a yey 2017-05-05 10:00:17 -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
590aaf4cc2 Merge pull request #773 from Citadel-Station-13/upstream-merge-26807
[MIRROR] Mobs that are faking death won't bleed.
2017-05-05 09:44:36 -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
f6f56a8b8f Merge pull request #728 from Citadel-Station-13/upstream-merge-26823
[MIRROR] Ports pastries to Initialize
2017-05-05 09:43:17 -05:00
LetterJay
5d0f7eafaa Merge pull request #719 from Citadel-Station-13/upstream-merge-26771
[MIRROR] Removes vestigial list from minds.
2017-05-05 09:40:28 -05:00
LetterJay
2f44824951 Merge pull request #717 from Citadel-Station-13/upstream-merge-26767
[MIRROR] The alien hivemind uses a mob's real_name
2017-05-05 09:40:08 -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
LetterJay
1198a3cbb4 Merge pull request #708 from Citadel-Station-13/upstream-merge-26752
[MIRROR] Plants now react with turfs on squash()
2017-05-05 09:39:17 -05:00
LetterJay
da4e4bbefe Merge pull request #707 from Citadel-Station-13/upstream-merge-26746
[MIRROR] Makes admin sound announcement use the right span
2017-05-05 09:39:04 -05:00
LetterJay
91f3059be1 Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
[MIRROR] Moves tips from config to strings tree
2017-05-05 09:33:45 -05:00
CitadelStationBot
933a8646ba Only one successful Gang Tool recall per gang 2017-05-05 06:05:05 -05:00
CitadelStationBot
d67618815c Mobs that are faking death won't bleed. 2017-05-04 20:59:29 -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
kevinz000
e8fe273cc0 Update flightpacks.dm 2017-05-04 16:07:53 -07: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
CitadelStationBot
0639a54346 Hopefully makes flightsuit processing less taxing on the server 2017-05-04 06:01:53 -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
LetterJay
5d3fa7e63a Merge pull request #726 from Citadel-Station-13/upstream-merge-26842
[MIRROR] Adds eyeball soup and spaghetti to the game: it's now been 8 days edition
2017-05-03 22:46:29 -05:00
LetterJay
f333944be0 le fix 2017-05-03 09:02:19 -05:00
CitadelStationBot
8a221b9637 Ports pastries to Initialize 2017-05-03 05:55:15 -05:00
CitadelStationBot
4141b6549f Adds eyeball soup and spaghetti to the game: it's now been 8 days edition 2017-05-03 01:42:35 -05:00
CitadelStationBot
6a365857d1 Should fix all of the cult/clockcult issues 2017-05-02 20:44:34 -05:00
LetterJay
2926b7e8b1 Merge pull request #723 from Citadel-Station-13/revert-690-upstream-merge-26739
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
2017-05-02 20:03:13 -05:00
LetterJay
007281a51c Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts" 2017-05-02 18:53:59 -05:00
LetterJay
0cb4d54194 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26735 2017-05-02 18:49:35 -05:00
LetterJay
368a2e82c1 Merge pull request #709 from Citadel-Station-13/upstream-merge-26762
[MIRROR] Fixes cult datum giving the action button to the mind instead of mob
2017-05-02 18:47:55 -05:00
LetterJay
92f96986b9 Merge pull request #705 from Citadel-Station-13/upstream-merge-26743
[MIRROR] Fixes Biogenerator
2017-05-02 18:47:23 -05:00
LetterJay
84db006ea9 Merge pull request #711 from Citadel-Station-13/upstream-merge-26799
[MIRROR] Fixes cult and clockcult icons
2017-05-02 18:46:38 -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
91cb42cf60 Merge pull request #699 from Citadel-Station-13/upstream-merge-26556
[MIRROR] Saline-glucose changes
2017-05-02 18:44:53 -05:00
LetterJay
8a5c180dd3 Update recipes_misc.dm 2017-05-02 13:41:10 -05:00
CitadelStationBot
7baccb8b85 Removes vestigial list from minds. 2017-05-02 12:47:20 -05:00
LetterJay
a57190b9c5 Merge pull request #694 from Citadel-Station-13/upstream-merge-26708
[MIRROR] Ore redemption machine cleanup
2017-05-02 12:26:28 -05:00