Commit Graph

9021 Commits

Author SHA1 Message Date
CitadelStationBot b1da43d3f7 Clarification on hardsuit variants in traitor uplink 2017-06-11 08:29:25 -05:00
CitadelStationBot a634735753 Fixes #27738 (Spirit Sight examine text showing you and not the user) 2017-06-11 08:29:21 -05:00
LetterJay f5f4e3a9d1 upstream-merge-28047 2017-06-11 08:26:09 -05:00
LetterJay 11ff6a7628 upstream-merge-27971 2017-06-11 08:21:14 -05:00
LetterJay bd4d42a8a6 upstream-merge-28034/compile fix/upstream-merge-28048 2017-06-11 08:12:27 -05:00
LetterJay 9d85cbf3b5 upstream-merge-28006 2017-06-11 02:19:56 -05:00
LetterJay 4386813269 upstream-merge-27996 2017-06-11 02:17:53 -05:00
LetterJay 55e565ab8c upstream-merge-27973 2017-06-11 02:16:35 -05:00
LetterJay f694264371 compile fix 2017-06-11 02:14:54 -05:00
LetterJay c760c52817 upstream-merge-27951 2017-06-11 02:11:34 -05:00
LetterJay a8b71089ae upstream-merge-27933 2017-06-11 02:03:27 -05:00
LetterJay 28d4372aa0 upstream-merge-27852 2017-06-11 00:20:55 -05:00
LetterJay 4624ec7e04 upstream-merge-27899 2017-06-11 00:09:55 -05:00
LetterJay e596e3eea4 missing files 2017-06-11 00:04:13 -05:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
LetterJay 4ceea2a134 Update whitelist.dm 2017-06-10 23:28:03 -05:00
CitadelStationBot 8aae860c84 Renames Air subsystem to Atmospherics 2017-06-10 19:11:24 -05:00
CitadelStationBot 6a9cb685d9 Some minor refactor to doomsday device 2017-06-10 19:11:21 -05:00
CitadelStationBot f03c39e8dc Fixes pipe dispensers 2017-06-10 19:10:17 -05:00
CitadelStationBot 7589ff9285 LAZYSET() Macro 2017-06-10 17:02:12 -05:00
CitadelStationBot 5dd146a819 MMI-in-mecha can use the mecha tools again 2017-06-10 13:50:08 -05:00
CitadelStationBot fb40986f89 Fixes basic spiderlings becoming ice spiders 2017-06-10 12:22:48 -05:00
CitadelStationBot 4276cdde17 Fixes attacking not breaking chameleon 2017-06-10 12:19:39 -05:00
CitadelStationBot 4bd99124de Adds F.R.A.M.E. cartridge 2017-06-10 12:18:31 -05:00
LetterJay 47687a6d1a cleanup 2017-06-10 09:42:08 -05:00
LetterJay eac4854adf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165 2017-06-10 09:38:21 -05:00
LetterJay 522b6d917f updates 2017-06-10 09:36:39 -05:00
LetterJay 700004e309 Update lockbox.dm 2017-06-10 09:24:03 -05:00
LetterJay 7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-10 09:01:25 -05:00
LetterJay 8a628cf13f Delete ties.dm 2017-06-10 09:00:08 -05:00
LetterJay 79794685c3 Merge branch 'master' into upstream-merge-27890 2017-06-10 08:02:27 -05:00
LetterJay ee2ca2d4ba Merge pull request #1512 from Citadel-Station-13/upstream-merge-28239
[MIRROR] Fixes communications consoles
2017-06-10 07:59:05 -05:00
LetterJay 1bd5b2d3ab Merge pull request #1513 from Citadel-Station-13/upstream-merge-28240
[MIRROR] Makes dismembered heads and brains respect NOCLONE
2017-06-10 07:58:38 -05:00
LetterJay 01c9923050 Merge pull request #1514 from Citadel-Station-13/upstream-merge-28233
[MIRROR] Adds /image/proc/copy_overlays
2017-06-10 07:58:19 -05:00
CitadelStationBot b1b39093e9 Changes Amanitin log message 2017-06-09 20:27:10 -05:00
CitadelStationBot 9a8778b16f Adds /image/proc/copy_overlays 2017-06-09 20:11:51 -05:00
CitadelStationBot b2cc05b6b5 Makes dismembered heads and brains respect NOCLONE 2017-06-09 20:08:45 -05:00
CitadelStationBot 7658deae09 Fixes communications consoles 2017-06-09 20:08:42 -05:00
CitadelStationBot 19a1d3555c Fixes death report giving the wrong damage type 2017-06-09 20:06:36 -05:00
LetterJay 12ea900051 Merge pull request #1487 from Citadel-Station-13/upstream-merge-28189
[MIRROR] Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
2017-06-09 15:55:30 -05:00
CitadelStationBot f26cf4e9ef Clown Toy Box + Wooden Crates 2017-06-09 11:02:37 -05:00
LetterJay 7fa05ca854 Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
2017-06-09 09:37:58 -05:00
LetterJay 0bd03c7fd3 Merge pull request #1504 from Citadel-Station-13/upstream-merge-28209
[MIRROR] Moves borer completion to gamemode
2017-06-09 09:36:00 -05:00
LetterJay 37c5f4858d Merge pull request #1503 from Citadel-Station-13/upstream-merge-28224
[MIRROR] Fix related CID/IPs on player panel
2017-06-09 09:35:29 -05:00
CitadelStationBot 9198b10fd3 Medical record summaries are now single inputs as well 2017-06-09 09:29:47 -05:00
LetterJay 06be53ffeb Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
2017-06-09 09:13:18 -05:00
LetterJay 3f66d97005 Merge pull request #1402 from cebutris/oof
oof
2017-06-09 09:12:49 -05:00
LetterJay c3ebcf9d69 Merge pull request #1327 from Citadel-Station-13/upstream-merge-27891
[MIRROR] Fixes black carpet recipe and sprite
2017-06-09 09:10:08 -05:00
LetterJay 9babd38dc5 Merge pull request #1502 from Citadel-Station-13/upstream-merge-28219
[MIRROR] Gang - Purchasing the improvised shotgun actually spawns a gun.
2017-06-09 09:08:16 -05:00
LetterJay 662a647711 Merge pull request #1501 from Citadel-Station-13/upstream-merge-28203
[MIRROR] Fixes clockwork armor bitflags
2017-06-09 09:07:27 -05:00