Commit Graph
3107 Commits
Author SHA1 Message Date
CitadelStationBot de9b7f8fc9 Automatic changelog generation for PR #1666 [ci skip] 2017-06-20 01:29:45 -05:00
LetterJayandGitHub a8b498a2a9 Merge pull request #1666 from Citadel-Station-13/upstream-merge-28407
[MIRROR] [READY]Adds examine tooltips
2017-06-20 01:29:44 -05:00
LetterJayandGitHub f97540247f Merge pull request #1667 from Citadel-Station-13/upstream-merge-28580
[MIRROR] Fix cid reconnect message not showing
2017-06-19 21:02:56 -05:00
CitadelStationBot c0c00ef13b Automatic changelog generation for PR #1678 [ci skip] 2017-06-19 21:02:33 -05:00
LetterJayandGitHub 84c42c073a Merge pull request #1678 from Citadel-Station-13/ExamineFix
Fixes certain people unable to be examined
2017-06-19 21:02:32 -05:00
LetterJayandGitHub fa9c2aaa15 Delete tgstation.dme.rej 2017-06-19 20:54:20 -05:00
LetterJayandGitHub cd06b77e01 Delete preferences_savefile.dm.rej 2017-06-19 20:54:04 -05:00
LetterJayandGitHub 572ac840a4 Update tgstation.dme 2017-06-19 20:53:31 -05:00
LetterJayandGitHub 13078c1130 Update preferences_savefile.dm 2017-06-19 20:52:25 -05:00
CitadelStationBot dc86bf28e1 Automatic changelog generation for PR #1669 [ci skip] 2017-06-19 20:48:22 -05:00
LetterJayandGitHub cc9101aedf Merge pull request #1669 from Citadel-Station-13/upstream-merge-28552
[MIRROR] Bonfires light up in lavaland atmos
2017-06-19 20:48:21 -05:00
LetterJayandGitHub 3e6a5f2d06 Merge pull request #1670 from Citadel-Station-13/upstream-merge-28549
[MIRROR] Makes gender change potions more noticeable
2017-06-19 20:47:56 -05:00
LetterJayandGitHub f358cc8649 Merge pull request #1676 from Citadel-Station-13/upstream-merge-28572
[MIRROR] Reduces the size of the zombie revival flavor text (Fixes #28568)
2017-06-19 20:47:29 -05:00
LetterJayandGitHub 22ff930934 Merge pull request #1675 from lm40/master
readds medihound antitoxin
2017-06-19 20:46:49 -05:00
LetterJay 767fe0b490 fixes examine text with people who have flavor 2017-06-19 20:43:33 -05:00
CitadelStationBot b77768a2eb Reduces the size of the zombie revival flavor text (Fixes #28568) 2017-06-19 19:53:44 -05:00
lm40andGitHub bac7abb9d6 this is ugly 2017-06-19 19:31:48 -04:00
lm40andGitHub 69c64c99e7 lol 2017-06-19 19:31:06 -04:00
lm40 9db294ae79 d 2017-06-19 19:20:27 -04:00
lm40 758cf429a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
ffd
2017-06-19 18:56:10 -04:00
LetterJay f668021230 commit 2017-06-19 17:33:40 -05:00
LetterJay 9332353714 update 2017-06-19 17:31:00 -05:00
LetterJay 866a569e41 dmi to png 2017-06-19 17:28:06 -05:00
LetterJayandGitHub a63fbd9286 Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965
[MIRROR] Ports Goonchat
2017-06-19 17:25:18 -05:00
CitadelStationBot d3561823eb Automatic changelog generation for PR #1674 [ci skip] 2017-06-19 17:23:50 -05:00
LetterJayandGitHub 98303b51d6 Merge pull request #1674 from Citadel-Station-13/IconStateFix
Fixes dufflebag worn icons not displaying
2017-06-19 17:23:48 -05:00
LetterJay eb055bc1ec more and more 2017-06-19 16:56:38 -05:00
LetterJay a4c9dc43dd Dufflebag => Dufflebag 2017-06-19 16:42:05 -05:00
lm40andGitHub eb69d03d52 Adds antitoxin 2017-06-19 17:29:57 -04:00
lm40andGitHub 005f3a4ecc d (#1) 2017-06-19 17:28:46 -04:00
LetterJay 52fa6e4df8 wrong way around 2017-06-19 16:25:07 -05:00
LetterJay 323ffa1fca Fixes dufflebag worn icons not displaying 2017-06-19 16:19:46 -05:00
LetterJay 12055144e4 fix it 2017-06-19 16:09:16 -05:00
CitadelStationBot 8292ffa04f Automatic changelog generation for PR #1465 [ci skip] 2017-06-19 15:51:09 -05:00
LetterJayandGitHub d65e8667e7 Merge pull request #1465 from Citadel-Station-13/upstream-merge-28160
[MIRROR] Fixes ORM alloy material consumption
2017-06-19 15:51:08 -05:00
LetterJayandGitHub 5e759fd792 Update examine.dm 2017-06-19 15:47:08 -05:00
LetterJayandGitHub 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay 8120278819 update client_procs 2017-06-19 13:12:51 -05:00
LetterJay a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot b7345ab548 Makes gender change potions more noticeable 2017-06-19 08:54:46 -05:00
CitadelStationBot 087bc8c27a Bonfires light up in lavaland atmos 2017-06-19 08:53:41 -05:00
CitadelStationBot 254badde48 Fix cid reconnect message not showing 2017-06-18 22:17:57 -05:00
CitadelStationBot 9863f88366 [READY]Adds examine tooltips 2017-06-18 21:58:37 -05:00
CitadelStationBot 85c075916d Automatic changelog generation for PR #1658 [ci skip] 2017-06-18 13:32:06 -05:00
LetterJayandGitHub 5c4150e30a Merge pull request #1658 from Citadel-Station-13/upstream-merge-28535
[MIRROR] Adds a single D4 to Lavaland mining base
2017-06-18 13:32:04 -05:00
CitadelStationBot 316f793ee4 Automatic changelog generation for PR #1650 [ci skip] 2017-06-18 09:59:42 -05:00
LetterJayandGitHub 7acd77d73a Merge pull request #1650 from Citadel-Station-13/upstream-merge-28497
[MIRROR] Tablets with IDs in them now show the ID's name on examine
2017-06-18 09:59:41 -05:00
CitadelStationBot 2de093afc7 Automatic changelog generation for PR #1655 [ci skip] 2017-06-18 09:59:08 -05:00
LetterJayandGitHub 9a0a327c4c Merge pull request #1655 from Citadel-Station-13/autocall
Increases round time to three hours
2017-06-18 09:59:07 -05:00
CitadelStationBot 8cd87a0866 Adds a single D4 to Lavaland mining base 2017-06-18 09:49:06 -05:00