Commit Graph

3095 Commits

Author SHA1 Message Date
CitadelStationBot
dc86bf28e1 Automatic changelog generation for PR #1669 [ci skip] 2017-06-19 20:48:22 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
22ff930934 Merge pull request #1675 from lm40/master
readds medihound antitoxin
2017-06-19 20:46:49 -05:00
CitadelStationBot
b77768a2eb Reduces the size of the zombie revival flavor text (Fixes #28568) 2017-06-19 19:53:44 -05:00
lm40
bac7abb9d6 this is ugly 2017-06-19 19:31:48 -04:00
lm40
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
LetterJay
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
LetterJay
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
lm40
eb69d03d52 Adds antitoxin 2017-06-19 17:29:57 -04:00
lm40
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
LetterJay
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
LetterJay
5e759fd792 Update examine.dm 2017-06-19 15:47:08 -05:00
LetterJay
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
85c075916d Automatic changelog generation for PR #1658 [ci skip] 2017-06-18 13:32:06 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
CitadelStationBot
6147eb7539 Automatic changelog generation for PR #1654 [ci skip] 2017-06-17 22:52:26 -05:00
LetterJay
50127b30cf Merge pull request #1654 from Citadel-Station-13/upstream-merge-28515
[MIRROR] Ratvar is no longer stopped by pathetic windows
2017-06-17 22:52:25 -05:00
LetterJay
e1d6c5d278 increases round time 2017-06-17 22:47:32 -05:00
LetterJay
9842b19282 3 hour rounds 2017-06-17 22:44:42 -05:00
CitadelStationBot
7ad1ab9f0f Ratvar is no longer stopped by pathetic windows 2017-06-17 22:11:36 -05:00
CitadelStationBot
078824266e Tablets with IDs in them now show the ID's name on examine 2017-06-17 16:56:48 -05:00
CitadelStationBot
00a4b5ce8c Fixes 28154: Accidental cargo exploit edition. (#1471) 2017-06-17 13:37:43 -07:00
CitadelStationBot
6ec1b66a9d Refactors soundbang_act to use adjustEarDamage (#1467) 2017-06-17 13:37:28 -07:00
CitadelStationBot
3c6b2db665 [Omega] Cleaned up unconnected atmos pipes (#1578) 2017-06-17 13:36:44 -07:00
CitadelStationBot
97844e5076 Automatic changelog generation for PR #1579 [ci skip] 2017-06-17 15:36:32 -05:00
CitadelStationBot
9985430c31 Minor flamethrower fix (#1579) 2017-06-17 13:36:31 -07:00
CitadelStationBot
86664fb8c7 WHAT IS THAT (#1190) 2017-06-17 13:34:15 -07:00