Commit Graph

  • c28818b893 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27414 LetterJay 2017-05-30 15:29:24 -05:00
  • 2de531b2e7 Merge pull request #1173 from Citadel-Station-13/upstream-merge-27607 LetterJay 2017-05-30 15:18:54 -05:00
  • 3c89f142ed Update materials.dm LetterJay 2017-05-30 15:17:00 -05:00
  • 9e93c103fd Automatic changelog generation for PR #1168 [ci skip] CitadelStationBot 2017-05-30 15:15:52 -05:00
  • f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361 LetterJay 2017-05-30 15:15:51 -05:00
  • d91a9ac177 Automatic changelog generation for PR #1167 [ci skip] CitadelStationBot 2017-05-30 15:02:45 -05:00
  • 9a64d4731c Merge pull request #1167 from Citadel-Station-13/upstream-merge-27589 LetterJay 2017-05-30 15:02:44 -05:00
  • d4af5004a6 Flamethrower fixes CitadelStationBot 2017-05-30 14:55:42 -05:00
  • 87593dd8f7 Lavaland - Ruins now have lights CitadelStationBot 2017-05-30 14:46:30 -05:00
  • 6c958c129a Fixes another holocall runtime CitadelStationBot 2017-05-30 14:44:25 -05:00
  • ae22a1876a 41 files changed, original only had 4. SPACES. LetterJay 2017-05-30 14:36:11 -05:00
  • 4cecb15ffc beacons LetterJay 2017-05-30 14:23:25 -05:00
  • 20ea1dd108 Merge pull request #1165 from Citadel-Station-13/upstream-merge-27601 LetterJay 2017-05-30 14:21:33 -05:00
  • b2afc61f54 cyka LetterJay 2017-05-30 14:18:32 -05:00
  • 80896d0371 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675 LetterJay 2017-05-30 14:14:25 -05:00
  • 9deb5069f4 !!!Projectile spread tweaks!!! <-- Yes, this is a huge balance change for dualwielding! CitadelStationBot 2017-05-30 11:22:09 -05:00
  • dceafe4122 Adds some silly new meson failure excuses CitadelStationBot 2017-05-30 11:12:56 -05:00
  • 38b10b8c53 Fixes multi cyborgs CitadelStationBot 2017-05-30 08:52:22 -05:00
  • 601636f4a1 map rotation LetterJay 2017-05-30 01:55:28 -05:00
  • c2f8df8a6f Merge pull request #1286 from Citadel-Station-13/upstream-merge-27791 LetterJay 2017-05-29 15:03:34 -05:00
  • 81b8653671 Merge pull request #1270 from Leon-Leonardo/citadel1.2.2 LetterJay 2017-05-29 15:03:14 -05:00
  • 775ce7a9eb Merge pull request #1283 from Citadel-Station-13/upstream-merge-27797 LetterJay 2017-05-29 15:02:17 -05:00
  • dba35effd5 Merge pull request #1282 from Citadel-Station-13/upstream-merge-27796 LetterJay 2017-05-29 15:01:53 -05:00
  • 0ea4a1fc62 Automatic changelog generation for PR #1281 [ci skip] CitadelStationBot 2017-05-29 15:01:44 -05:00
  • 7750095289 Merge pull request #1281 from Citadel-Station-13/upstream-merge-27770 LetterJay 2017-05-29 15:01:43 -05:00
  • 4f214e3f55 Merge pull request #1280 from Citadel-Station-13/upstream-merge-27768 LetterJay 2017-05-29 15:01:24 -05:00
  • fd99ecba30 Merge pull request #1279 from Citadel-Station-13/upstream-merge-27774 LetterJay 2017-05-29 15:01:11 -05:00
  • b0681a0ae2 Merge pull request #1288 from Citadel-Station-13/upstream-merge-27802 LetterJay 2017-05-29 15:00:52 -05:00
  • 8a519b765b Merge pull request #1289 from Citadel-Station-13/upstream-merge-27800 LetterJay 2017-05-29 15:00:41 -05:00
  • 820a4322b5 Automatic changelog generation for PR #1291 [ci skip] CitadelStationBot 2017-05-29 14:58:57 -05:00
  • aa6d89df07 Merge pull request #1291 from Citadel-Station-13/upstream-merge-27769 LetterJay 2017-05-29 14:58:56 -05:00
  • 012303c7bd Automatic changelog generation for PR #1292 [ci skip] CitadelStationBot 2017-05-29 14:58:48 -05:00
  • 568b8c34cc Merge pull request #1292 from Citadel-Station-13/upstream-merge-27756 LetterJay 2017-05-29 14:58:47 -05:00
  • 5bd74040fa Merge pull request #1294 from Citadel-Station-13/upstream-merge-27812 LetterJay 2017-05-29 14:58:32 -05:00
  • 94fdea8866 Some pAI fixes CitadelStationBot 2017-05-29 14:42:48 -05:00
  • 293c873173 Moves dmm2tgm to mapmerge CitadelStationBot 2017-05-29 11:10:35 -05:00
  • 507f3d7761 The officer's sabre can be used to remove a lizard's tail. CitadelStationBot 2017-05-29 11:08:28 -05:00
  • b05d56d9fa Increase plasmaman tank volume CitadelStationBot 2017-05-29 11:07:23 -05:00
  • 3ba2db8bcb Fixes SSmachines using colons CitadelStationBot 2017-05-29 11:04:13 -05:00
  • 86123e0271 Fixes holopads not returning an initialize hint CitadelStationBot 2017-05-29 11:03:08 -05:00
  • 0349f8c908 Holocall cleanup CitadelStationBot 2017-05-29 11:03:03 -05:00
  • 18db38f7db Gives abductees a message saying they can't remember the abduction CitadelStationBot 2017-05-29 09:19:20 -05:00
  • 9dd40f1fad Adds coalesce to world.internet_address CitadelStationBot 2017-05-29 09:15:12 -05:00
  • 2ad5c8ac7e Fixes doubled post-round end time. CitadelStationBot 2017-05-29 09:15:08 -05:00
  • 8d5c202774 Speeds up apc visual updates CitadelStationBot 2017-05-29 09:14:01 -05:00
  • 6b01698202 You can pet dogs again. CitadelStationBot 2017-05-29 08:58:43 -05:00
  • d60e7c9d2a AI holocall hangups CitadelStationBot 2017-05-29 06:38:24 -05:00
  • 84c9682114 Cable coils New -> Initialize CitadelStationBot 2017-05-29 06:34:17 -05:00
  • de413c89de Fixes mesons giving the wrong message when toggling off CitadelStationBot 2017-05-29 06:32:10 -05:00
  • c463043fc3 Merge pull request #1248 from Citadel-Station-13/upstream-merge-27697 LetterJay 2017-05-29 02:29:45 -05:00
  • 750baf3dca multi level LetterJay 2017-05-29 02:15:26 -05:00
  • aefca24012 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697 LetterJay 2017-05-29 02:12:41 -05:00
  • e99dea2c23 Merge pull request #1271 from Citadel-Station-13/upstream-merge-27810 LetterJay 2017-05-29 02:08:24 -05:00
  • 91452897a7 Merge pull request #1155 from Citadel-Station-13/upstream-merge-27576 LetterJay 2017-05-29 02:07:19 -05:00
  • ac9f139f57 Automatic changelog generation for PR #1151 [ci skip] CitadelStationBot 2017-05-29 02:04:33 -05:00
  • af72f4ce16 Merge pull request #1151 from Citadel-Station-13/upstream-merge-27528 LetterJay 2017-05-29 02:04:32 -05:00
  • 5fe7f7083a woo LetterJay 2017-05-29 01:59:49 -05:00
  • 1f618ab39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27576 LetterJay 2017-05-29 01:57:56 -05:00
  • be65d00de2 Merge pull request #1278 from Citadel-Station-13/GreytideStationwide LetterJay 2017-05-29 01:33:38 -05:00
  • 4bb2883638 Fixes gun rapid-melee attack exploit (#1276) CitadelStationBot 2017-05-29 01:27:52 -05:00
  • e0fab7fa5e fixes an oopsie LetterJay 2017-05-29 01:25:02 -05:00
  • afbfb66386 Splits mining_mobs.dm into separate files CitadelStationBot 2017-05-29 01:17:13 -05:00
  • a29e0c45ae BEACHBUMBS! LetterJay 2017-05-28 21:54:10 -05:00
  • 77b4be8b3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528 LetterJay 2017-05-28 21:49:30 -05:00
  • 745437e0eb Merge pull request #1170 from Citadel-Station-13/upstream-merge-27595 LetterJay 2017-05-28 19:47:09 -05:00
  • f42bcaf760 Finally remembers to make drakes unclickable while they're in the invulnerable stage of swooping (#1262) CitadelStationBot 2017-05-28 17:28:51 -05:00
  • 6b6a156c2f Lavaland Lighting Fix + ruin varedit cleanup (#1257) CitadelStationBot 2017-05-28 17:27:50 -05:00
  • 455ac22c90 Automatic changelog generation for PR #1273 [ci skip] CitadelStationBot 2017-05-28 17:27:26 -05:00
  • 4576d03eb4 Fixes attaching heads without brainmobs (#1273) CitadelStationBot 2017-05-28 17:27:25 -05:00
  • fac3bfb81b Automatic changelog generation for PR #1264 [ci skip] CitadelStationBot 2017-05-28 17:22:11 -05:00
  • 53fb384b63 Emagging a cloner drops bits, cloners don't keep extra flesh (#1264) CitadelStationBot 2017-05-28 17:22:10 -05:00
  • ee638d81a5 Fixes projectile dampening fields being on infinite cooldown (#1263) CitadelStationBot 2017-05-28 17:20:00 -05:00
  • e3d228aa00 [MIRROR] ID card mapping aid (#1223) CitadelStationBot 2017-05-28 17:19:46 -05:00
  • 1013cfac25 hooks kevinz000 2017-05-28 15:15:34 -07:00
  • 7aff4f588e [MIRROR] refactors how vehicles use offsets + multiseat (#1128) CitadelStationBot 2017-05-28 17:13:04 -05:00
  • fa3db43094 Automatic changelog generation for PR #1238 [ci skip] CitadelStationBot 2017-05-28 17:11:08 -05:00
  • dec17dcfe6 Dog beds can now be renamed after new owners (#1238) CitadelStationBot 2017-05-28 17:11:06 -05:00
  • 636f9b9fa1 Automatic changelog generation for PR #1242 [ci skip] CitadelStationBot 2017-05-28 17:10:47 -05:00
  • 0706161afe Lets bayonets butcher, fixes bayoneting typo (#1242) CitadelStationBot 2017-05-28 17:10:46 -05:00
  • 243148f27c [Centcom] Nanotrasen Private Security 2.0 CitadelStationBot 2017-05-28 16:39:14 -05:00
  • 730deafef7 [s] Fixes Centcom not being selflooping CitadelStationBot 2017-05-28 16:02:29 -05:00
  • 2d41b7fe17 EHHH LetterJay 2017-05-28 15:49:22 -05:00
  • 0818c38966 Citadel Station 1.2.2 Leon-Leonardo 2017-05-28 16:26:14 -04:00
  • 42edd006b8 A BUNCH OF SHIT LetterJay 2017-05-28 14:57:17 -05:00
  • 7eb798931a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27595 LetterJay 2017-05-28 14:36:01 -05:00
  • 11e68fa016 Merge pull request #1253 from Citadel-Station-13/upstream-merge-27735 LetterJay 2017-05-28 14:33:52 -05:00
  • fcb3a53072 Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725 LetterJay 2017-05-28 14:33:22 -05:00
  • df1ea5572c Merge pull request #1254 from Citadel-Station-13/upstream-merge-27743 LetterJay 2017-05-28 14:32:31 -05:00
  • 7e88443115 Automatic changelog generation for PR #1255 [ci skip] CitadelStationBot 2017-05-28 14:32:19 -05:00
  • 1a28e1ccf8 Merge pull request #1255 from Citadel-Station-13/upstream-merge-27706 LetterJay 2017-05-28 14:32:18 -05:00
  • c07544a553 Merge pull request #1258 from Citadel-Station-13/upstream-merge-27739 LetterJay 2017-05-28 14:31:56 -05:00
  • 52606cba53 Merge pull request #1260 from Citadel-Station-13/upstream-merge-27750 LetterJay 2017-05-28 14:31:36 -05:00
  • 3197c494ae Merge pull request #1250 from Citadel-Station-13/upstream-merge-27778 LetterJay 2017-05-28 14:31:13 -05:00
  • 13b6a18f42 Automatic changelog generation for PR #1268 [ci skip] CitadelStationBot 2017-05-28 14:16:07 -05:00
  • bf48026a8f Merge pull request #1268 from Citadel-Station-13/upstream-merge-27790 LetterJay 2017-05-28 14:16:05 -05:00
  • cd554d2537 Fixes crew monitoring console minimaps CitadelStationBot 2017-05-28 11:09:34 -05:00
  • 64562ba0c4 Fixes clown creampie cannon not recharging properly CitadelStationBot 2017-05-28 08:17:44 -05:00
  • f89d732d0a Removes duplicate sharpener from gang uplink CitadelStationBot 2017-05-28 08:16:35 -05:00
  • 4b9a7ce9cf Adds AI follow links to PDA messages and holopad speech CitadelStationBot 2017-05-28 08:14:21 -05:00
  • 9f665647c2 Ports cable structures to Initialize CitadelStationBot 2017-05-28 08:13:16 -05:00