Commit Graph
1399 Commits
Author SHA1 Message Date
kevinz000andGitHub 6c293e3e3d Merge pull request #716 from Citadel-Station-13/upstream-merge-26768
[MIRROR] Species-locked inventory slots are now indicated.
2017-05-07 19:15:02 -07:00
kevinz000andGitHub eb9caea261 Merge pull request #658 from Citadel-Station-13/upstream-merge-26670
[MIRROR] The least surprising nerf: Null Crates & Emagged Plasma Export Bonus
2017-05-07 19:14:06 -07:00
kevinz000andGitHub 2f55a67b7a Delete packs.dm.rej 2017-05-07 19:13:39 -07:00
kevinz000andGitHub 18abfb70c9 Update packs.dm 2017-05-07 19:13:29 -07:00
kevinz000andGitHub 2a8acb13d2 Merge pull request #840 from Citadel-Station-13/upstream-merge-26966
[MIRROR] Fixes being able to stand on chasms
2017-05-07 19:07:59 -07:00
kevinz000andGitHub 09dbd467bb Merge pull request #820 from Citadel-Station-13/upstream-merge-26976
[MIRROR] Fixes away gateway
2017-05-07 19:07:41 -07:00
CitadelStationBot c91aa2e66e Automatic changelog generation for PR #841 [ci skip] 2017-05-07 21:06:31 -05:00
kevinz000andGitHub cab4c53f06 Merge pull request #841 from Citadel-Station-13/upstream-merge-26940
[MIRROR] Plastic sheet production - Chemistry recipe
2017-05-07 19:06:30 -07:00
CitadelStationBot 3e593c4f7d Automatic changelog generation for PR #824 [ci skip] 2017-05-07 21:05:51 -05:00
kevinz000andGitHub cb77797bd5 Merge pull request #824 from Citadel-Station-13/upstream-merge-26290
[MIRROR] Add watertank, shower, sink to mining station and gulag
2017-05-07 19:05:50 -07:00
kevinz000andGitHub bdbc1ecb5c no admins txt changing 2017-05-07 19:05:19 -07:00
LetterJayandGitHub be3a06e801 Merge pull request #843 from Citadel-Station-13/revert-767-upstream-merge-26876
Revert "[MIRROR] Fixes say verbs not working"
2017-05-07 19:49:47 -04:00
LetterJayandGitHub 2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
CitadelStationBot 61a7897962 Plastic sheet production - Chemistry recipe 2017-05-07 18:23:05 -05:00
CitadelStationBot 884338d048 Fixes being able to stand on chasms 2017-05-07 18:06:44 -05:00
CitadelStationBot dc7dbc5ec9 Automatic changelog generation for PR #827 [ci skip] 2017-05-07 15:41:33 -05:00
LetterJayandGitHub 75ca44a767 Merge pull request #827 from LetterJay/snap
Snap Emote
2017-05-07 15:41:32 -05:00
kevinz000andGitHub 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
CitadelStationBot 92f8a8b1b0 Automatic changelog generation for PR #825 [ci skip] 2017-05-07 14:59:11 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 0d0cebb1fd Merge pull request #826 from Citadel-Station-13/upstream-merge-26938
[MIRROR] Fixes his grace CtrlClick
2017-05-07 12:58:57 -07:00
LetterJay 659139ca1c finger snap emote 2017-05-07 12:41:45 -05:00
LetterJay 1410fbc19c Merge branch 'master' of https://github.com/LetterJay/Citadel-Station-13 2017-05-07 11:52:25 -05: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
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 d8d49803b7 Add watertank, shower, sink to mining station and gulag 2017-05-07 08:59:19 -05:00
CitadelStationBot 281f382605 Sigils of Transgression are brighter 2017-05-07 08:54:06 -05:00
CitadelStationBot 164b830f23 Fixes away gateway 2017-05-07 08:52:57 -05: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