Commit Graph

  • 795ae0111d Fixes Blackbox subsystem def CitadelStationBot 2017-05-23 13:45:23 -05:00
  • 3651637cd8 Fixes advanced cam not cleaning up properly CitadelStationBot 2017-05-23 13:44:19 -05:00
  • 21b9e3a160 Merge pull request #1134 from Citadel-Station-13/LavalandFix LetterJay 2017-05-23 10:20:20 -05:00
  • 6307b15eed Merge pull request #1115 from Citadel-Station-13/upstream-merge-27527 LetterJay 2017-05-23 10:13:51 -05:00
  • 23007bea3c Merge pull request #1132 from Citadel-Station-13/upstream-merge-27536 LetterJay 2017-05-23 10:13:33 -05:00
  • a0193ebfc1 Merge pull request #1133 from Citadel-Station-13/upstream-merge-27513 LetterJay 2017-05-23 10:13:16 -05:00
  • febefa0c78 Something I broke in a previous PR that I didn't see LetterJay 2017-05-23 10:11:19 -05:00
  • c736d5f9dd [READY FOR ~REVIEW~]Makes morphs only able to change into /objs or /mobs CitadelStationBot 2017-05-23 09:54:28 -05:00
  • e6617661f9 Gives all hats a default icon/item state so they work with chameleon gear. CitadelStationBot 2017-05-23 07:58:48 -05:00
  • e02290bf2b Replaced mob spawner vars with outfits CitadelStationBot 2017-05-23 07:57:42 -05:00
  • 6ae72fded4 Automatic changelog generation for PR #1102 [ci skip] CitadelStationBot 2017-05-23 07:54:48 -05:00
  • 61c0094033 Merge pull request #1102 from Citadel-Station-13/upstream-merge-27324 LetterJay 2017-05-23 07:54:47 -05:00
  • c4fb2dd26e Automatic changelog generation for PR #1103 [ci skip] CitadelStationBot 2017-05-23 07:18:17 -05:00
  • e77cf64ff9 Merge pull request #1103 from Citadel-Station-13/upstream-merge-27498 LetterJay 2017-05-23 07:18:16 -05:00
  • a80a00bc6e Merge branch 'master' into upstream-merge-27324 LetterJay 2017-05-23 07:17:45 -05:00
  • 8525990bcd Automatic changelog generation for PR #1101 [ci skip] CitadelStationBot 2017-05-23 07:15:17 -05:00
  • c13af581b3 Merge pull request #1101 from Citadel-Station-13/upstream-merge-27489 LetterJay 2017-05-23 07:15:15 -05:00
  • 64215e32e4 Merge pull request #1105 from Citadel-Station-13/upstream-merge-27497 LetterJay 2017-05-23 07:14:58 -05:00
  • cd583208b5 Merge pull request #1099 from Citadel-Station-13/upstream-merge-27459 LetterJay 2017-05-23 07:14:46 -05:00
  • dd6e5c8368 Merge pull request #1098 from Citadel-Station-13/upstream-merge-27460 LetterJay 2017-05-23 07:14:24 -05:00
  • bb7d4fc894 Automatic changelog generation for PR #1096 [ci skip] CitadelStationBot 2017-05-23 07:13:54 -05:00
  • 2deead1ab2 Merge pull request #1096 from Citadel-Station-13/upstream-merge-27427 LetterJay 2017-05-23 07:13:52 -05:00
  • e4ed038b15 Automatic changelog generation for PR #1091 [ci skip] CitadelStationBot 2017-05-23 06:42:31 -05:00
  • 303f4ec5a5 Merge pull request #1091 from Citadel-Station-13/upstream-merge-27467 LetterJay 2017-05-23 06:42:30 -05:00
  • 958afdf037 oops LetterJay 2017-05-23 06:29:15 -05:00
  • 2fcc8fdc25 magic LetterJay 2017-05-23 06:23:29 -05:00
  • 9fc02333dd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27467 LetterJay 2017-05-23 06:18:28 -05:00
  • b1c0e82bdc Automatic changelog generation for PR #1130 [ci skip] CitadelStationBot 2017-05-23 06:17:31 -05:00
  • b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync LetterJay 2017-05-23 06:17:29 -05:00
  • db9f2a6d74 rej cleanup LetterJay 2017-05-23 06:15:33 -05:00
  • fb74c321c9 Automatic changelog generation for PR #1087 [ci skip] CitadelStationBot 2017-05-23 06:13:42 -05:00
  • 0b1a680d1a Merge pull request #1087 from Citadel-Station-13/upstream-merge-27480 LetterJay 2017-05-23 06:13:41 -05:00
  • 3d5f969b5e Merge pull request #1084 from Citadel-Station-13/upstream-merge-27515 LetterJay 2017-05-23 06:13:22 -05:00
  • b85d2ea321 Syncs all gang related PRs with upstream LetterJay 2017-05-23 06:10:40 -05:00
  • 2083b0c990 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27467 LetterJay 2017-05-23 05:31:00 -05:00
  • c9c2961c9c fancy LetterJay 2017-05-23 05:26:20 -05:00
  • d6a11b2aa2 click.dm LetterJay 2017-05-23 05:19:57 -05:00
  • bb51ed94ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27515 LetterJay 2017-05-23 05:17:39 -05:00
  • e2ea28c3b8 Automatic changelog generation for PR #1116 [ci skip] CitadelStationBot 2017-05-23 05:14:50 -05:00
  • 72b654b198 Merge pull request #1116 from Citadel-Station-13/upstream-merge-27518 LetterJay 2017-05-23 05:14:48 -05:00
  • 28d093e1b0 Automatic changelog generation for PR #1117 [ci skip] CitadelStationBot 2017-05-23 05:14:31 -05:00
  • 3ca696ac82 Merge pull request #1117 from Citadel-Station-13/upstream-merge-27526 LetterJay 2017-05-23 05:14:30 -05:00
  • 9ddea43e0f Merge pull request #1118 from Citadel-Station-13/upstream-merge-27523 LetterJay 2017-05-23 05:14:11 -05:00
  • c7486a6f18 Automatic changelog generation for PR #1119 [ci skip] CitadelStationBot 2017-05-23 05:13:53 -05:00
  • 1e149d1c89 Merge pull request #1119 from Citadel-Station-13/upstream-merge-27463 LetterJay 2017-05-23 05:13:51 -05:00
  • 939362fc94 Merge pull request #1120 from Citadel-Station-13/upstream-merge-27458 LetterJay 2017-05-23 05:13:38 -05:00
  • d420d87cc2 Automatic changelog generation for PR #1121 [ci skip] CitadelStationBot 2017-05-23 05:13:19 -05:00
  • 2fedf6b0e2 Merge pull request #1121 from Citadel-Station-13/upstream-merge-27409 LetterJay 2017-05-23 05:13:18 -05:00
  • b0c10c5898 Merge pull request #1122 from Citadel-Station-13/upstream-merge-27532 LetterJay 2017-05-23 05:12:32 -05:00
  • 0207ab2870 Merge pull request #1124 from Citadel-Station-13/upstream-merge-27516 LetterJay 2017-05-23 05:12:17 -05:00
  • d01d05770b Merge pull request #1125 from Citadel-Station-13/upstream-merge-27514 LetterJay 2017-05-23 05:11:44 -05:00
  • b38955b3a2 Merge pull request #1126 from Citadel-Station-13/upstream-merge-27512 LetterJay 2017-05-23 05:11:31 -05:00
  • e9e4f31fe0 Merge pull request #1127 from Citadel-Station-13/upstream-merge-27521 LetterJay 2017-05-23 05:00:07 -05:00
  • 0dde122148 Automatic changelog generation for PR #1129 [ci skip] CitadelStationBot 2017-05-23 04:59:41 -05:00
  • f155251cf2 Merge pull request #1129 from Citadel-Station-13/upstream-merge-27531 LetterJay 2017-05-23 04:59:39 -05:00
  • 2ea155e6a7 Fixes paper bins and moves paper to initialize CitadelStationBot 2017-05-22 22:51:23 -05:00
  • e9cdeec4f6 Removes HasProx testing message CitadelStationBot 2017-05-22 22:48:13 -05:00
  • e382287f78 Fixes conveyor belts moving things with no gravity CitadelStationBot 2017-05-22 22:48:09 -05:00
  • 3c892e0f46 Fixes space movement exploit CitadelStationBot 2017-05-22 22:47:04 -05:00
  • 240d195e2c Fixes a probable bug/exploit that allows for fully ignoring slows CitadelStationBot 2017-05-22 22:46:59 -05:00
  • 01cd2039e5 Changes investigate logs to use a define CitadelStationBot 2017-05-22 22:45:54 -05:00
  • 1b5d04bfb3 DNA injector inject proc now properly returns success CitadelStationBot 2017-05-22 22:44:49 -05:00
  • 6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls CitadelStationBot 2017-05-22 22:21:20 -05:00
  • 63dd699509 Adds webbing CitadelStationBot 2017-05-22 22:20:14 -05:00
  • 1d5c29b7b6 Auto Rifle Alt Mag Sprites CitadelStationBot 2017-05-22 22:16:06 -05:00
  • 4afae3d03b Makes global master vars static CitadelStationBot 2017-05-22 22:12:58 -05:00
  • 60f1e4348a Chasms will glow dimly, like lava CitadelStationBot 2017-05-22 22:11:53 -05:00
  • 4ac787e3bb Adds a toy weapon vendor into the syndie lavaland base firing range CitadelStationBot 2017-05-22 22:10:47 -05:00
  • 6c60631f1f sortMerge fix CitadelStationBot 2017-05-22 22:09:43 -05:00
  • efa9de6da9 Area Refactor + Var-edit Cleanup CitadelStationBot 2017-05-22 22:08:35 -05:00
  • 0508b613a5 automatic config load and dme kevinz000 2017-05-22 17:53:24 -07:00
  • 3cf30f3a6b Merge pull request #1083 from Citadel-Station-13/upstream-merge-27474 LetterJay 2017-05-22 17:46:02 -05:00
  • e675b3becc var/mine_range LetterJay 2017-05-22 17:35:40 -05:00
  • 288c072544 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27474 LetterJay 2017-05-22 17:30:31 -05:00
  • 3f24f033e5 Merge pull request #1106 from Citadel-Station-13/upstream-merge-27485 LetterJay 2017-05-22 17:26:09 -05:00
  • 2491ef5a7a Automatic changelog generation for PR #1109 [ci skip] CitadelStationBot 2017-05-22 17:25:48 -05:00
  • b66b362e4f Merge pull request #1109 from Citadel-Station-13/upstream-merge-27484 LetterJay 2017-05-22 17:25:47 -05:00
  • 09780b7dac Merge pull request #1108 from Artemiuz28/Artemiuz28-patch-1 LetterJay 2017-05-22 17:24:00 -05:00
  • e178fb4ac6 Merge pull request #1111 from Citadel-Station-13/upstream-merge-27500 LetterJay 2017-05-22 17:23:18 -05:00
  • 5624174cf5 Automatic changelog generation for PR #1112 [ci skip] CitadelStationBot 2017-05-22 17:21:10 -05:00
  • 64f288fda6 Merge pull request #1112 from Citadel-Station-13/upstream-merge-27502 LetterJay 2017-05-22 17:21:09 -05:00
  • 0ea672cdb9 Merge pull request #1113 from Citadel-Station-13/upstream-merge-27501 LetterJay 2017-05-22 17:20:53 -05:00
  • 25c1aa40dd Merge pull request #1079 from Citadel-Station-13/upstream-merge-27450 LetterJay 2017-05-22 17:14:14 -05:00
  • 953dde99aa Merge pull request #1073 from Citadel-Station-13/upstream-merge-27160 LetterJay 2017-05-22 17:07:45 -05:00
  • cbae09b538 rej cleanup/commit LetterJay 2017-05-22 16:59:39 -05:00
  • aad357bd74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27450 LetterJay 2017-05-22 16:56:18 -05:00
  • c56ae0396a Merge pull request #1071 from Citadel-Station-13/upstream-merge-27440 LetterJay 2017-05-22 16:30:07 -05:00
  • abbacd2c89 Merge branch 'master' into upstream-merge-27160 LetterJay 2017-05-22 16:29:43 -05:00
  • ab50a3eca5 Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283 LetterJay 2017-05-22 16:28:57 -05:00
  • e7caee1af7 Merge pull request #1065 from Citadel-Station-13/upstream-merge-27379 LetterJay 2017-05-22 16:28:00 -05:00
  • c414bcd26e Update equipment.dm LetterJay 2017-05-22 13:13:16 -05:00
  • 3f62929340 Merge branch 'master' into upstream-merge-27379 LetterJay 2017-05-22 12:45:18 -05:00
  • 9df8057e0e Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344 LetterJay 2017-05-22 12:40:18 -05:00
  • 8791ad036f Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268 LetterJay 2017-05-22 12:39:52 -05:00
  • e0f65beb37 World > SSticker LetterJay 2017-05-22 12:31:05 -05:00
  • 3548ed5e3e i'll fix this in another PR LetterJay 2017-05-22 12:27:59 -05:00
  • d1db0044d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 LetterJay 2017-05-22 11:52:18 -05:00
  • f860fce04e Mechs now take the correct amount of charge from inserted cells CitadelStationBot 2017-05-22 11:45:59 -05:00
  • 7a57898886 Ripleys will collect all ore in front of them when they move with a clamp and stored ore box CitadelStationBot 2017-05-22 11:44:54 -05:00
  • 84e30c6824 Adds extra investigate logs for SM CitadelStationBot 2017-05-22 11:36:40 -05:00