Commit Graph

2268 Commits

Author SHA1 Message Date
CitadelStationBot f0dc32ef4f Space cash descriptions are more descriptive (#1651) 2017-06-20 08:04:28 -07:00
CitadelStationBot e1c8973f82 Fixes things getting unbuckled in nullspace (#1606) 2017-06-20 08:04:01 -07:00
CitadelStationBot 68498b3597 RADIMMUNE species can no longer be used for radiation free DNA research (#1553) 2017-06-20 08:02:38 -07:00
CitadelStationBot 72d329cf31 Makes RADIMMUNE species incompatible with radiation based DNA injectors (#1518) 2017-06-20 08:00:21 -07:00
CitadelStationBot 35ac6c40e0 Remember to test your PRs, kids! - Rebalances matter cartridge cost redux (#1652) 2017-06-20 07:59:04 -07:00
CitadelStationBot 30d3a42db6 Minor telecom code cleanup (#1691) 2017-06-20 07:58:53 -07:00
LetterJay cd590e7fb1 Merge pull request #1686 from Citadel-Station-13/LOOCFix
fixes LOOC
2017-06-20 02:01:32 -05:00
LetterJay b28677414e Update looc.dm 2017-06-20 01:47:52 -05:00
LetterJay 62e4580fd2 Merge pull request #1684 from Citadel-Station-13/upstream-merge-28579
[MIRROR] Chisel messages will be below objects
2017-06-20 01:30:53 -05:00
LetterJay 35df3ca80e Merge pull request #1683 from Citadel-Station-13/upstream-merge-28583
[MIRROR] Adds framework for equip delays and adds it to the straight jacket
2017-06-20 01:30:32 -05:00
LetterJay 592b4ed5d7 Merge pull request #1680 from Citadel-Station-13/upstream-merge-28577
[MIRROR] Freezers and heaters now drop the correct materials (Fixes #28560)
2017-06-20 01:30:04 -05:00
LetterJay 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
LetterJay 4775f0b9c5 Update looc.dm 2017-06-20 01:27:05 -05:00
LetterJay 9f40c381a4 fixes looc 2017-06-20 01:25:48 -05:00
CitadelStationBot 0ef0ccf127 Chisel messages will be below objects 2017-06-19 22:07:23 -05:00
CitadelStationBot 989b991b05 Adds framework for equip delays and adds it to the straight jacket 2017-06-19 22:06:18 -05:00
CitadelStationBot 595f50c95e Freezers and heaters now drop the correct materials (Fixes #28560) 2017-06-19 21:27:30 -05:00
LetterJay 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
LetterJay 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
LetterJay cd06b77e01 Delete preferences_savefile.dm.rej 2017-06-19 20:54:04 -05:00
LetterJay 13078c1130 Update preferences_savefile.dm 2017-06-19 20:52:25 -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 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
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
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 12055144e4 fix it 2017-06-19 16:09:16 -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 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
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
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