Commit Graph

1399 Commits

Author SHA1 Message Date
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
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
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
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
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
88e6bf82d5 adds proper gibtonite detonation timing (#1462) 2017-06-17 13:32:35 -07:00
CitadelStationBot
7fdb5f484e Makes vv log show intended change instead of result (#1575) 2017-06-17 13:30:45 -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
CitadelStationBot
b5a5b4aada Prevents negative tempban duration (#1624) 2017-06-17 13:15:51 -07:00
LetterJay
0c5773f70f Merge pull request #1641 from Citadel-Station-13/upstream-merge-28499
[MIRROR] Fixes various bugs with photos and photo copying.
2017-06-17 10:06:38 -05:00
LetterJay
dfabe6ccf7 Merge pull request #1639 from Citadel-Station-13/upstream-merge-28503
[MIRROR] Fixes #28500 : Cryo cells properly compare to a mob's max health
2017-06-17 10:06:14 -05:00
LetterJay
97fe740ac9 Merge pull request #1635 from Citadel-Station-13/upstream-merge-28495
[MIRROR] Removes tech requirement from flashes
2017-06-17 10:05:31 -05:00
LetterJay
a1bd66ef8b Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414
[MIRROR] Adds onions
2017-06-17 10:04:59 -05:00
LetterJay
0b136e2349 Merge pull request #1633 from Citadel-Station-13/upstream-merge-28445
[MIRROR] Cult Master is now given a Suffix in Check Antags
2017-06-17 10:04:19 -05:00
LetterJay
050a6bfcdb Merge pull request #1632 from Citadel-Station-13/upstream-merge-28466
[MIRROR] Adjusted atmos device layers + added new pipe subtypes
2017-06-17 10:03:54 -05:00
LetterJay
67db8fc9ad Merge pull request #1630 from Citadel-Station-13/upstream-merge-28492
[MIRROR] Vomit fix
2017-06-17 10:03:11 -05:00
CitadelStationBot
d874e9ba3a Fixes various bugs with photos and photo copying. 2017-06-17 07:37:31 -05:00