Commit Graph
1368 Commits
Author SHA1 Message Date
CitadelStationBot 1a5050692b Fixes his grace CtrlClick 2017-05-07 11:33:55 -05:00
kevinz000andGitHub 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 086ea81785 Automatic changelog generation for PR #748 [ci skip] 2017-05-07 08:24:51 -05:00
kevinz000andGitHub 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
CitadelStationBot ab8dfe3b6d Automatic changelog generation for PR #801 [ci skip] 2017-05-07 08:24:00 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 4a6b49d6a9 Merge pull request #752 from Citadel-Station-13/upstream-merge-26864
[MIRROR] Tweaks the cost of some of the Application scriptures affected by the previous cost tweak
2017-05-06 22:10:17 -07:00
kevinz000andGitHub 2f2c850937 Delete scripture_applications.dm.rej 2017-05-06 22:09:58 -07:00
kevinz000andGitHub 61baae0544 Merge branch 'master' into upstream-merge-26864 2017-05-06 22:09:35 -07:00
kevinz000andGitHub c1a9bb5864 Update scripture_applications.dm 2017-05-06 22:08:00 -07:00
kevinz000andGitHub 14fe4948e9 Merge pull request #652 from Citadel-Station-13/upstream-merge-26685
[MIRROR] Fixed Dsay always causing a disk read
2017-05-06 22:03:08 -07:00
kevinz000andGitHub 52f5226547 Merge pull request #750 from Citadel-Station-13/upstream-merge-26851
[MIRROR] Fixes runtime with null nutriment taste data
2017-05-06 22:00:16 -07:00
kevinz000andGitHub 236c91a945 Merge pull request #755 from Citadel-Station-13/upstream-merge-26809
[MIRROR] Increases pixel projectile angles/accuracy
2017-05-06 21:59:40 -07:00
kevinz000andGitHub e528ec823c Merge pull request #751 from Citadel-Station-13/upstream-merge-26841
[MIRROR] Fixes Set Round End Sound.
2017-05-06 21:45:38 -07:00
CitadelStationBot f7937b2f7e Automatic changelog generation for PR #756 [ci skip] 2017-05-06 23:43:09 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 1c7fa59d6c Merge pull request #798 from Citadel-Station-13/upstream-merge-26910
This makes Nar'Sie a girl ------------> [MIRROR] hm
2017-05-06 21:42:22 -07:00
kevinz000andGitHub 5ac3bb924f Merge pull request #799 from Citadel-Station-13/upstream-merge-26939
[MIRROR] Blorble
2017-05-06 21:41:56 -07:00
kevinz000andGitHub 83a506803a Merge pull request #695 from Citadel-Station-13/upstream-merge-24002
[MIRROR] PR announcement spam prevention
2017-05-06 21:36:41 -07:00
kevinz000andGitHub 7fa53c5ce4 Delete world.dm.rej 2017-05-06 21:36:15 -07:00
CitadelStationBot 48f9fa62c9 Automatic changelog generation for PR #792 [ci skip] 2017-05-06 23:35:16 -05:00
kevinz000andGitHub 32a215ab5e Merge pull request #792 from Citadel-Station-13/upstream-merge-26917
[MIRROR] Various Deltastation Map Fixes/Edits
2017-05-06 21:35:15 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 286e492df8 Merge pull request #757 from Citadel-Station-13/upstream-merge-26846
[MIRROR] Fixes detective scanner not being able to ranged scan, adds range/viewcheck vars
2017-05-06 21:31:47 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 102b28b1c1 Delete deadsay.dm.rej 2017-05-06 21:28:23 -07:00
kevinz000andGitHub 1168d06c9e Merge pull request #759 from Citadel-Station-13/upstream-merge-26849
[MIRROR] New Tree Sprites
2017-05-06 21:25:06 -07:00
CitadelStationBot fb0aa3597f Automatic changelog generation for PR #800 [ci skip] 2017-05-06 23:24:47 -05:00
kevinz000andGitHub a1cb1d456d Merge pull request #800 from Citadel-Station-13/upstream-merge-26934
[MIRROR] Seed vault lavaland ruin can only spawn once
2017-05-06 21:24:46 -07:00
kevinz000andGitHub 32d81b8624 Merge pull request #736 from Citadel-Station-13/upstream-merge-26803
[MIRROR] Gives ears, eyes, and vocal cords plural gender
2017-05-06 21:24:15 -07:00
CitadelStationBot f5aab140bf Automatic changelog generation for PR #760 [ci skip] 2017-05-06 23:23:47 -05:00
kevinz000andGitHub 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
CitadelStationBot d31caa1870 Automatic changelog generation for PR #815 [ci skip] 2017-05-06 23:19:34 -05:00
kevinz000andGitHub e0139ce2ce Merge pull request #815 from Citadel-Station-13/upstream-merge-26960
[MIRROR] Remove empty description tag from right-most tiles of Space Station 13 sign
2017-05-06 21:19:33 -07:00
kevinz000andGitHub b7621ff9fe Merge pull request #813 from Citadel-Station-13/upstream-merge-26937
[MIRROR] Elevators
2017-05-06 20:57:55 -07:00
kevinz000andGitHub db50cc8c94 Merge pull request #812 from Citadel-Station-13/upstream-merge-26949
[MIRROR] ORM fixes
2017-05-06 20:57:17 -07:00
CitadelStationBot fc7be7e32b Remove empty description tag from right-most tiles of Space Station 13 sign 2017-05-06 20:48:44 -05:00
kevinz000andGitHub bfe7441f9b Merge pull request #791 from Citadel-Station-13/upstream-merge-26867
[MIRROR] Holy water will now properly make you jittery
2017-05-06 15:41:24 -07:00
kevinz000andGitHub 4a2a0e8a0d Merge pull request #732 from Citadel-Station-13/upstream-merge-26778
[MIRROR] Plasma vessels regenerate slowly off resin
2017-05-06 15:26:10 -07:00
CitadelStationBot df204497cd Elevators 2017-05-06 16:29:50 -05:00
kevinz000andGitHub d43e64bcc3 Merge pull request #774 from Citadel-Station-13/upstream-merge-26805
[MIRROR] Fixes SM Tesla admin log spam, adds containment field count to investigate logs.
2017-05-06 14:24:08 -07:00
CitadelStationBot 8e3b375bae Automatic changelog generation for PR #764 [ci skip] 2017-05-06 16:23:04 -05:00
kevinz000andGitHub e5249ff8d0 Merge pull request #764 from Citadel-Station-13/upstream-merge-26855
[MIRROR] Makes dental implants move through dismemberment
2017-05-06 14:23:03 -07:00
CitadelStationBot 9035100cf4 Automatic changelog generation for PR #809 [ci skip] 2017-05-06 16:22:09 -05:00
kevinz000andGitHub 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
CitadelStationBot d7bdb49283 ORM fixes 2017-05-06 16:20:39 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 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
CitadelStationBot f605aae61e Automatic changelog generation for PR #733 [ci skip] 2017-05-06 16:12:59 -05:00