Commit Graph

2175 Commits

Author SHA1 Message Date
LetterJay a3ded857cf Merge pull request #1519 from Citadel-Station-13/upstream-merge-28245
[MIRROR] Fixes attacking not breaking chameleon
2017-06-12 12:38:19 -05:00
LetterJay b464a2dc19 Merge pull request #1517 from Citadel-Station-13/upstream-merge-28113
[MIRROR] Adds F.R.A.M.E. cartridge
2017-06-12 12:33:04 -05:00
LetterJay d0c1ecc484 Merge pull request #1511 from Citadel-Station-13/upstream-merge-28237
[MIRROR] Fixes death report giving the wrong damage type
2017-06-12 12:32:29 -05:00
LetterJay 55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay 7e2a0a7277 Merge pull request #1554 from Citadel-Station-13/upstream-merge-28336
[MIRROR] Paper planes will be the same color as the paper used to create them.
2017-06-12 12:18:53 -05:00
LetterJay 20e0c3d800 Merge pull request #1552 from Citadel-Station-13/upstream-merge-28335
[MIRROR]  Ports construction paper to Initialize()
2017-06-12 12:18:40 -05:00
LetterJay 69b2922e58 Merge pull request #1548 from Citadel-Station-13/upstream-merge-28318
[MIRROR] IED code cleanup
2017-06-12 12:18:26 -05:00
LetterJay 47315c27e2 Merge pull request #1549 from Citadel-Station-13/upstream-merge-28320
[MIRROR] AI liquid dispensers are now more usable
2017-06-12 12:18:12 -05:00
LetterJay 8b4d5cb68d Merge pull request #1546 from Citadel-Station-13/upstream-merge-28331
[MIRROR] Lighters need to be on
2017-06-12 12:13:35 -05:00
LetterJay 169f206f04 Merge pull request #1545 from Citadel-Station-13/upstream-merge-28188
[MIRROR] Adds the ability to attach papers and photos to airlocks
2017-06-12 12:13:10 -05:00
LetterJay d664defd89 Merge pull request #1544 from Citadel-Station-13/upstream-merge-28254
[MIRROR] Makes arrivals shuttle slightly more juicy
2017-06-12 12:12:48 -05:00
LetterJay 2c7dc70426 Merge pull request #1543 from Citadel-Station-13/upstream-merge-28317
[MIRROR] Fixes #28182 (IED sprites are bugged)
2017-06-12 12:12:24 -05:00
LetterJay 464f8e2a5f Merge pull request #1538 from Citadel-Station-13/upstream-merge-28293
[MIRROR] If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them
2017-06-12 12:11:30 -05:00
CitadelStationBot 07ed287787 Paper planes will be the same color as the paper used to create them. 2017-06-12 11:35:36 -05:00
CitadelStationBot 45cd30ad49 Ports construction paper to Initialize() 2017-06-12 05:34:29 -05:00
CitadelStationBot edf026a41d AI liquid dispensers are now more usable 2017-06-11 20:51:02 -05:00
CitadelStationBot 024efabf09 IED code cleanup 2017-06-11 20:47:55 -05:00
CitadelStationBot ea5f6037cf Lighters need to be on 2017-06-11 20:44:46 -05:00
CitadelStationBot 57dc205514 Adds the ability to attach papers and photos to airlocks 2017-06-11 17:29:48 -05:00
CitadelStationBot ea05bdbc26 Makes arrivals shuttle slightly more juicy 2017-06-11 17:28:44 -05:00
CitadelStationBot dcaa6c5db4 Fixes #28182 (IED sprites are bugged) 2017-06-11 17:28:40 -05:00
LetterJay 87ce1e1780 upstream-merge-28047 2017-06-11 08:39:38 -05:00
CitadelStationBot 53229bb7da If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them 2017-06-11 08:30:29 -05:00
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