Commit Graph

  • 0947177b6e Update tgstation.dme LetterJay 2017-09-02 07:58:53 -05:00
  • 5e75fc6f27 Automatic changelog generation for PR #2442 [ci skip] CitadelStationBot 2017-09-02 07:49:04 -05:00
  • 8aa7dbdbb6 Merge pull request #2442 from Citadel-Station-13/upstream-merge-29105 LetterJay 2017-09-02 07:49:03 -05:00
  • 28b64099a7 Delete cebusoap.dmi LetterJay 2017-09-02 07:48:32 -05:00
  • f8413517bb testing LetterJay 2017-09-02 07:43:34 -05:00
  • 7aa042cff1 Update randomverbs.dm LetterJay 2017-09-02 07:33:45 -05:00
  • 7711b73ca7 Update randomverbs.dm LetterJay 2017-09-02 07:31:52 -05:00
  • a94ffca643 Update admin.dm LetterJay 2017-09-02 07:28:33 -05:00
  • f4b08d32a7 Update admin.dm LetterJay 2017-09-02 07:26:16 -05:00
  • 3e0ead1204 Merge branch 'master' into upstream-merge-29105 LetterJay 2017-09-02 07:11:32 -05:00
  • 8731fb7e1c Delete database_changelog.txt.rej LetterJay 2017-09-02 07:07:39 -05:00
  • 2bfc7872fa cleanup LetterJay 2017-09-02 07:06:37 -05:00
  • 31e3f6135a Update tgstation_schema.sql LetterJay 2017-09-02 07:01:05 -05:00
  • ea0f489f95 Update tgstation_schema_prefixed.sql LetterJay 2017-09-02 07:01:01 -05:00
  • 2161084ba1 Update database_changelog.txt LetterJay 2017-09-02 06:59:47 -05:00
  • 8f7368bc57 Update config.txt LetterJay 2017-09-02 06:58:30 -05:00
  • fed956efec Update job_exp.dm LetterJay 2017-09-02 06:56:35 -05:00
  • 74307f2858 Update preferences.dm LetterJay 2017-09-02 06:55:52 -05:00
  • 7fea74994f Update randomverbs.dm LetterJay 2017-09-02 06:53:49 -05:00
  • 88b452595f Update antag_spawner.dm LetterJay 2017-09-02 06:52:03 -05:00
  • 7617164617 Update blackbox.dm LetterJay 2017-09-02 06:50:35 -05:00
  • 4a1bb5addb Update configuration.dm LetterJay 2017-09-02 06:49:21 -05:00
  • 7734469152 Merge pull request #2580 from Citadel-Station-13/MirrorF LetterJay 2017-09-02 06:01:16 -05:00
  • 78ed8f0913 Fixes mecha drill not working on windoors. LetterJay 2017-09-02 05:35:36 -05:00
  • d8679dbfcf Prevents hallucinations revealing people's identity LetterJay 2017-09-02 05:33:55 -05:00
  • 5d1c2c523b Fixes no drop implant LetterJay 2017-09-02 05:31:15 -05:00
  • e310435892 UI objects should PIXEL_SCALE LetterJay 2017-09-02 05:26:22 -05:00
  • 96c790a81f Unruntimes fdel on savefiles LetterJay 2017-09-02 05:23:35 -05:00
  • b1302230c0 Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121 LetterJay 2017-09-02 05:20:31 -05:00
  • 29f0e2edd4 Rename toolsmerge-upstream-pull-request.sh to merge-upstream-pull-request.sh LetterJay 2017-09-01 22:31:16 -05:00
  • 0d36f6dd47 Update toolsmerge-upstream-pull-request.sh (#2579) kevinz000 2017-09-01 19:02:13 -07:00
  • fafc1b2d14 Merge pull request #965 from Citadel-Station-13/custom_roundstart_items LetterJay 2017-09-01 11:41:12 -05:00
  • 98da910178 Update read_from_file.dm LetterJay 2017-09-01 11:21:50 -05:00
  • 430833c462 Automatic changelog generation for PR #2578 [ci skip] CitadelStationBot 2017-09-01 10:29:57 -05:00
  • 07e65fac7c Merge pull request #2578 from Citadel-Station-13/upstream-merge-30102 LetterJay 2017-09-01 10:29:55 -05:00
  • a6aa71e0b9 commit LetterJay 2017-09-01 09:52:29 -05:00
  • e8bb79d7c9 kk kevinz000 2017-09-01 07:12:08 -07:00
  • 3b91a51de2 Various Ninja Fixes CitadelStationBot 2017-09-01 09:03:42 -05:00
  • 5aa4631af8 final kevinz000 2017-09-01 06:58:59 -07:00
  • ddb49cd1ca kek kevinz000 2017-09-01 06:58:31 -07:00
  • b193d77c1c hm kevinz000 2017-09-01 03:36:18 -07:00
  • 4a9b59cba1 Merge pull request #2576 from Citadel-Station-13/upstream-merge-30292 LetterJay 2017-08-31 22:25:43 -05:00
  • 98dcb56a27 Merge pull request #2569 from Citadel-Station-13/upstream-merge-30266 LetterJay 2017-08-31 22:24:55 -05:00
  • 8ac267eafa Merge pull request #2567 from Citadel-Station-13/upstream-merge-30277 LetterJay 2017-08-31 22:24:37 -05:00
  • 9253da58ae Merge pull request #2570 from Citadel-Station-13/upstream-merge-30257 LetterJay 2017-08-31 22:24:19 -05:00
  • 64681b2fb3 Merge pull request #2571 from Citadel-Station-13/upstream-merge-30285 LetterJay 2017-08-31 22:23:12 -05:00
  • 41318e715c Merge branch 'master' into custom_roundstart_items kevinz000 2017-08-31 18:23:56 -07:00
  • 57f4b77d6c Removes fucking gangs CitadelStationBot 2017-08-31 15:32:43 -05:00
  • 78a3fd627b Rearranges the antagonist panel: now with 150 more hours of testing CitadelStationBot 2017-08-31 14:39:42 -05:00
  • 528b7a86b8 Merge pull request #30292 from Xhuis/revert-30289-RevertAntag Jordan Brown 2017-08-31 15:38:43 -04:00
  • 9e90d582e5 Fixes dummy unequip runtimes. CitadelStationBot 2017-08-31 08:39:56 -05:00
  • 2244301bb5 Merge pull request #2563 from JamieH/patch-1 LetterJay 2017-08-31 06:38:25 -05:00
  • 4b202faa1e Tiny PubbyStation update CitadelStationBot 2017-08-30 17:06:42 -05:00
  • e70b6ceb33 Chasms will alert mobs below them when they form CitadelStationBot 2017-08-30 17:06:38 -05:00
  • e2a7a40ce2 Fixed Omega comms power CitadelStationBot 2017-08-30 17:06:29 -05:00
  • 50b88388da Crew monitoring rework part 1: crew pinpointers CitadelStationBot 2017-08-30 17:03:20 -05:00
  • 120c1724ed Update toolsmerge-upstream-pull-request.sh JamieH 2017-08-30 16:31:40 +01:00
  • c2a792d577 Converts npc saves to jsons CitadelStationBot 2017-08-30 08:01:36 -05:00
  • acd129ac37 Adds db connectivity check to jobban cache building CitadelStationBot 2017-08-30 08:01:27 -05:00
  • 93647d77ad [DNM] Fixes the codebase (#2556) kevinz000 2017-08-30 00:08:40 -07:00
  • 3847312367 Automatic changelog generation for PR #2545 [ci skip] CitadelStationBot 2017-08-30 00:44:09 -05:00
  • 34088432b6 Automatic changelog generation for PR #2509 [ci skip] CitadelStationBot 2017-08-30 00:44:06 -05:00
  • 28ea6f3ad2 Merge pull request #2499 kevinz000 2017-08-29 22:43:54 -07:00
  • e96a529d8b Merge pull request #2500 kevinz000 2017-08-29 22:43:21 -07:00
  • 26b0c001f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 kevinz000 2017-08-29 22:42:07 -07:00
  • 3c1114daf2 Merge pull request #2502 kevinz000 2017-08-29 22:41:56 -07:00
  • f5689b656a Merge pull request #2509 kevinz000 2017-08-29 22:40:08 -07:00
  • 874bad1203 Merge pull request #2524 kevinz000 2017-08-29 22:40:05 -07:00
  • cf93e511ce Merge pull request #2527 kevinz000 2017-08-29 22:40:02 -07:00
  • bd8a9dc435 Merge pull request #2528 kevinz000 2017-08-29 22:40:00 -07:00
  • 17142cc247 Merge pull request #2530 kevinz000 2017-08-29 22:39:57 -07:00
  • f70fd6a980 Merge pull request #2536 kevinz000 2017-08-29 22:39:54 -07:00
  • 3c4704efa1 Merge pull request #2538 kevinz000 2017-08-29 22:39:51 -07:00
  • 039aea1724 Merge pull request #2541 kevinz000 2017-08-29 22:39:48 -07:00
  • 967d0c5dee Merge pull request #2542 kevinz000 2017-08-29 22:39:45 -07:00
  • 00362331d3 Merge pull request #2543 kevinz000 2017-08-29 22:39:43 -07:00
  • 7239a44ef1 Merge pull request #2545 kevinz000 2017-08-29 22:39:08 -07:00
  • d4c23fdcd1 Merge pull request #2546 kevinz000 2017-08-29 22:39:06 -07:00
  • 7c7da67169 Merge pull request #2547 kevinz000 2017-08-29 22:39:03 -07:00
  • fa91df9ef8 Merge pull request #2548 kevinz000 2017-08-29 22:39:00 -07:00
  • 44c3aecb3b Merge pull request #2549 kevinz000 2017-08-29 22:38:57 -07:00
  • f982cd1d5a Merge pull request #2550 kevinz000 2017-08-29 22:38:54 -07:00
  • b340bb0851 Merge pull request #2551 kevinz000 2017-08-29 22:38:51 -07:00
  • ae59532c0d Merge pull request #2552 kevinz000 2017-08-29 22:38:30 -07:00
  • d5296e65a8 Merge pull request #2554 kevinz000 2017-08-29 22:38:20 -07:00
  • 2daf874cd7 Automatic changelog generation for PR #2463 [ci skip] CitadelStationBot 2017-08-30 00:32:30 -05:00
  • 8693a933b4 Merge pull request #2482 kevinz000 2017-08-29 22:27:42 -07:00
  • b7e74bd3ab Merge pull request #2473 kevinz000 2017-08-29 22:27:39 -07:00
  • 967dd49261 Merge pull request #2467 kevinz000 2017-08-29 22:27:36 -07:00
  • 3a6c5969ee Merge pull request #2466 kevinz000 2017-08-29 22:27:33 -07:00
  • e7a3586ab4 Merge pull request #2464 kevinz000 2017-08-29 22:27:30 -07:00
  • 0f37872fb5 Merge pull request #2463 kevinz000 2017-08-29 22:27:27 -07:00
  • 2cce781728 Merge pull request #2430 kevinz000 2017-08-29 22:27:24 -07:00
  • 9cb65df70d Merge pull request #2426 kevinz000 2017-08-29 22:27:21 -07:00
  • 7549fb09fa Merge pull request #2416 kevinz000 2017-08-29 22:27:19 -07:00
  • 4b32cf2e0f Merge pull request #2415 kevinz000 2017-08-29 22:27:15 -07:00
  • 25e1a78b51 Merge pull request #2407 kevinz000 2017-08-29 22:27:13 -07:00
  • 5c7b743cfa Merge pull request #2405 kevinz000 2017-08-29 22:27:10 -07:00
  • 5dc670e282 Merge pull request #2401 kevinz000 2017-08-29 22:27:07 -07:00
  • 9b9e071258 Merge pull request #2393 kevinz000 2017-08-29 22:27:04 -07:00