Commit Graph

330 Commits

Author SHA1 Message Date
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
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 b5a14bb6ab New dirt sprites and jungle chasms 2017-05-04 18:38:58 -05:00
CitadelStationBot 4140cffc98 Nuke op TC consoles can donate all TCs at once, and other small changes. 2017-05-04 18:08:14 -05:00
CitadelStationBot 4a142759a0 New Tree Sprites 2017-05-04 17:58:58 -05:00
CitadelStationBot 46d7976488 Adds spewium toxin in traitor kits 2017-05-04 17:53:42 -05:00
CitadelStationBot 34bf3e4113 Fixes dropped cyborg repair modules 2017-05-04 17:50:32 -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 da781e0d76 Adds aesthetic basalt floor tiles 2017-05-04 06:12:26 -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