Commit Graph

2249 Commits

Author SHA1 Message Date
LetterJay 9f40c381a4 fixes looc 2017-06-20 01:25:48 -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 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
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
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 9985430c31 Minor flamethrower fix (#1579) 2017-06-17 13:36:31 -07:00
CitadelStationBot 4be9681e6b Fixes being unable to cremate one thing (#1464) 2017-06-17 13:32:54 -07:00
CitadelStationBot 2fa5d08bf5 Prevents cyborgs from extruding materials (#1463) 2017-06-17 13:32:44 -07:00
CitadelStationBot 88e6bf82d5 adds proper gibtonite detonation timing (#1462) 2017-06-17 13:32:35 -07:00
CitadelStationBot a090e33a15 Adds Prolonging Prism as an application scripture (#1472) 2017-06-17 13:31:04 -07:00
CitadelStationBot 7fdb5f484e Makes vv log show intended change instead of result (#1575) 2017-06-17 13:30:45 -07:00
CitadelStationBot 4c3f515fd6 Fixes borging factory (#1580) 2017-06-17 13:30:27 -07:00
CitadelStationBot ef07d6b9ee Makes Zombies 2 spooky (#1583) 2017-06-17 13:29:23 -07:00
CitadelStationBot abd22ba09d Fixes badmin repair mapgen module for real this time (#1604) 2017-06-17 13:29:10 -07:00
CitadelStationBot 2b8d5615a1 Readds some preference toggles to admins (#1602) 2017-06-17 13:28:27 -07:00
CitadelStationBot c53efc8dc7 Fixes a to_chat runtime, adds macro for sending images (#1591) 2017-06-17 13:26:42 -07:00
CitadelStationBot 7162120fc4 Adds screaming for burns (#1645) 2017-06-17 13:25:55 -07:00
CitadelStationBot 08a0ba5692 Fix some things assuming lighting corners existed (#1642) 2017-06-17 13:17:21 -07:00