Commit Graph

  • 822cddc718 Update Hallucination.dm LetterJay 2017-08-14 08:55:45 -05:00
  • bc3e5419f2 Merge pull request #2368 from Citadel-Station-13/revert-2346-upstream-merge-29813 LetterJay 2017-08-14 08:33:23 -05:00
  • 281ed6cb79 Merge pull request #2146 from Citadel-Station-13/upstream-merge-29464 LetterJay 2017-08-14 08:31:46 -05:00
  • bfbc3e198c Merge branch 'master' into upstream-merge-29523 LetterJay 2017-08-14 08:30:40 -05:00
  • f52d120caf Update world.dm LetterJay 2017-08-14 08:27:50 -05:00
  • 80bb075eb3 Update Hallucination.dm.rej LetterJay 2017-08-14 08:24:58 -05:00
  • fdfdd4fc21 Update admin_investigate.dm LetterJay 2017-08-14 08:24:34 -05:00
  • 4edf9880d6 Update logging.dm LetterJay 2017-08-14 08:23:46 -05:00
  • cb861b28ca Merge pull request #2367 from Citadel-Station-13/upstream-merge-29841 LetterJay 2017-08-14 08:21:38 -05:00
  • 123454c45a Merge pull request #2366 from Citadel-Station-13/upstream-merge-29846 LetterJay 2017-08-14 08:21:24 -05:00
  • 77ce8f8031 Automatic changelog generation for PR #2363 [ci skip] CitadelStationBot 2017-08-14 08:20:58 -05:00
  • 7c6f9c4973 Merge pull request #2363 from Citadel-Station-13/upstream-merge-29867 LetterJay 2017-08-14 08:20:57 -05:00
  • 76da67e316 Merge pull request #2360 from Citadel-Station-13/upstream-merge-29828 LetterJay 2017-08-14 08:20:27 -05:00
  • b2f93c506b Automatic changelog generation for PR #2359 [ci skip] CitadelStationBot 2017-08-14 08:20:10 -05:00
  • 0b923ace24 Merge pull request #2359 from Citadel-Station-13/upstream-merge-29809 LetterJay 2017-08-14 08:20:09 -05:00
  • c73e58d587 Revert "[MIRROR] The wiki button now asks what page you want to be taken to" LetterJay 2017-08-14 08:19:27 -05:00
  • 2476d59be6 Makes the ahelp topic give the permissions warning CitadelStationBot 2017-08-14 06:54:44 -05:00
  • e986657b16 Makes mulligan antag check for gamemode required players CitadelStationBot 2017-08-14 06:25:03 -05:00
  • f840a18a9a Fix compile warning CitadelStationBot 2017-08-14 02:59:42 -05:00
  • 7fe8dd208d [s] Clean up some inputs CitadelStationBot 2017-08-14 02:44:24 -05:00
  • 726ffe1fdd Tweaks atmos canister lights. CitadelStationBot 2017-08-14 01:25:02 -05:00
  • 7aa960b499 Fixes a typo in the blobbernaut spawn text CitadelStationBot 2017-08-14 01:23:57 -05:00
  • 16428315aa Merges the two turf/Entereds CitadelStationBot 2017-08-13 18:01:40 -05:00
  • e354c9f289 Fixes turf slipping CitadelStationBot 2017-08-13 18:00:36 -05:00
  • 0e7b9a008e Ports a slightly edited version of Eris APC sprites CitadelStationBot 2017-08-13 17:54:27 -05:00
  • bd35823012 [ready]Makes bIcon better CitadelStationBot 2017-08-13 17:41:12 -05:00
  • 6d72705ff5 Automatic changelog generation for PR #2356 [ci skip] CitadelStationBot 2017-08-13 09:53:12 -05:00
  • 64da23febb Merge pull request #2356 from Citadel-Station-13/upstream-merge-29840 LetterJay 2017-08-13 09:53:11 -05:00
  • 3876ecab9e Merge pull request #2354 from Citadel-Station-13/upstream-merge-29853 LetterJay 2017-08-13 09:52:46 -05:00
  • 5db9c632c3 Merge pull request #2353 from Citadel-Station-13/upstream-merge-29855 LetterJay 2017-08-13 09:52:32 -05:00
  • 248d151b90 Merge pull request #2351 from Citadel-Station-13/upstream-merge-29861 LetterJay 2017-08-13 09:52:14 -05:00
  • be46c419e2 Automatic changelog generation for PR #2350 [ci skip] CitadelStationBot 2017-08-13 09:51:47 -05:00
  • d3e8815788 Merge pull request #2350 from Citadel-Station-13/upstream-merge-29864 LetterJay 2017-08-13 09:51:45 -05:00
  • 81dc5d2c09 Merge pull request #2349 from Citadel-Station-13/upstream-merge-29826 LetterJay 2017-08-13 09:51:29 -05:00
  • 47eb2e528f Merge pull request #2348 from Citadel-Station-13/upstream-merge-29843 LetterJay 2017-08-13 09:51:17 -05:00
  • fdfb61b527 Update client_procs.dm LetterJay 2017-08-13 09:50:51 -05:00
  • f257b44a19 Automatic changelog generation for PR #2346 [ci skip] CitadelStationBot 2017-08-13 09:49:43 -05:00
  • 0eddd2f58d Merge pull request #2346 from Citadel-Station-13/upstream-merge-29813 LetterJay 2017-08-13 09:49:41 -05:00
  • 8bdc12f916 Merge pull request #2345 from Citadel-Station-13/upstream-merge-29816 LetterJay 2017-08-13 09:49:32 -05:00
  • 1e3ea07d8b Adds icon_states to the unused and used Eldritch whetstones CitadelStationBot 2017-08-13 01:28:24 -05:00
  • deffc1b1f1 More baseturf helpers CitadelStationBot 2017-08-13 01:28:20 -05:00
  • dae3e121f2 critical priority roleplay grammatical patch (*surrender emote fix) CitadelStationBot 2017-08-13 01:28:16 -05:00
  • 1291b12273 Cleaned up stacked pipes CitadelStationBot 2017-08-13 01:28:11 -05:00
  • 7004797c8c Fixed sign description CitadelStationBot 2017-08-13 01:28:08 -05:00
  • 80f1fb8c58 Fix fireaxe cabinets spawned with broken icons CitadelStationBot 2017-08-13 01:28:03 -05:00
  • 714fc5ed4a Fixes minebots missing action icons CitadelStationBot 2017-08-13 01:27:58 -05:00
  • 3f562c113c get_head_slots() now returns wear_neck CitadelStationBot 2017-08-13 01:27:54 -05:00
  • e972a90ba9 Adds callback select system CitadelStationBot 2017-08-13 01:27:51 -05:00
  • 501972a2f8 Removes chat pings from href logs CitadelStationBot 2017-08-13 01:26:46 -05:00
  • 1b3ccfdfeb The wiki button now asks what page you want to be taken to CitadelStationBot 2017-08-13 01:26:42 -05:00
  • 6cb9a0088f Fixes admin mass deleting... not actually mass deleting... CitadelStationBot 2017-08-13 01:26:39 -05:00
  • f615bc0dff Merge pull request #2342 from Citadel-Station-13/bear-fix LetterJay 2017-08-12 07:05:38 -05:00
  • 53b1377402 Automatic changelog generation for PR #2339 [ci skip] CitadelStationBot 2017-08-12 06:36:59 -05:00
  • a9a7807473 Merge pull request #2339 from Citadel-Station-13/upstream-merge-29819 LetterJay 2017-08-12 06:36:57 -05:00
  • 040c250270 Merge pull request #2341 from Citadel-Station-13/upstream-merge-29865 LetterJay 2017-08-12 06:36:43 -05:00
  • dd6c9d6a04 Merge pull request #2334 from Citadel-Station-13/upstream-merge-29811 LetterJay 2017-08-12 06:36:15 -05:00
  • ad938dede1 Merge pull request #2336 from Citadel-Station-13/upstream-merge-29845 LetterJay 2017-08-12 06:35:56 -05:00
  • 4298f6539d Automatic changelog generation for PR #2335 [ci skip] CitadelStationBot 2017-08-12 06:35:46 -05:00
  • c00f0a99f0 Merge pull request #2335 from ktccd/Flavor-elevator LetterJay 2017-08-12 06:35:45 -05:00
  • 122727059b Merge pull request #2333 from Citadel-Station-13/upstream-merge-29804 LetterJay 2017-08-12 06:35:25 -05:00
  • c174eb3f5d Merge pull request #2331 from Citadel-Station-13/upstream-merge-29803 LetterJay 2017-08-12 06:35:09 -05:00
  • 8ca2a8d3bd Merge pull request #2330 from Citadel-Station-13/upstream-merge-29799 LetterJay 2017-08-12 06:34:56 -05:00
  • 1520c4facd Merge pull request #2327 from Citadel-Station-13/upstream-merge-29800 LetterJay 2017-08-12 06:34:41 -05:00
  • 6b6e5d0018 Merge pull request #2326 from Citadel-Station-13/upstream-merge-29805 LetterJay 2017-08-12 06:34:28 -05:00
  • 74636ffeb0 Automatic changelog generation for PR #2295 [ci skip] CitadelStationBot 2017-08-12 06:33:46 -05:00
  • e783997250 Merge pull request #2295 from Citadel-Station-13/upstream-merge-29742 LetterJay 2017-08-12 06:33:44 -05:00
  • 962d983079 Merge pull request #2294 from Citadel-Station-13/upstream-merge-29746 LetterJay 2017-08-12 06:33:29 -05:00
  • 73426d56ea file path fix LetterJay 2017-08-12 06:31:50 -05:00
  • 7addb0207b Fix travis CitadelStationBot 2017-08-12 04:42:44 -05:00
  • 5a7126a0dd Panic Bunker for moderator/trialmin access Poojawa 2017-08-12 01:15:42 -05:00
  • 4188db53a5 Flavortext transition finished ktccd 2017-08-11 23:48:46 +02:00
  • 1b2f2120ec DO NOT MERGE - Fixes random resetting of file ktccd 2017-08-11 23:10:05 +02:00
  • 582a106d8e His Grace now shows up on the orbit list CitadelStationBot 2017-08-11 15:09:24 -05:00
  • 630a4a7bc7 parsing from file work, still working on mobloading. kevinz000 2017-08-11 13:05:12 -07:00
  • d7ac827ea6 Testing Transition code, DO NOT MERGE YET!! ktccd 2017-08-11 21:59:35 +02:00
  • fca1df9a2b Fixes bad dirs CitadelStationBot 2017-08-11 14:54:00 -05:00
  • 12d4c7ade0 gorilla sprites CitadelStationBot 2017-08-11 14:52:55 -05:00
  • 84076d7bb9 intialize() supermatter sword (#2332) CitadelStationBot 2017-08-11 14:29:51 -05:00
  • 2102e0526a Automatic changelog generation for PR #2329 [ci skip] CitadelStationBot 2017-08-11 14:29:03 -05:00
  • 9ef1825ee0 Adds Taur cocks (#2329) ktccd 2017-08-11 21:29:01 +02:00
  • 62a7d4301f Refactored flavortext. ktccd 2017-08-11 20:13:01 +02:00
  • 6c6d8e5193 Fixes cable cuff inhand CitadelStationBot 2017-08-11 02:52:25 -05:00
  • dab46b002c Ports weaponry to Initialize CitadelStationBot 2017-08-11 02:50:20 -05:00
  • fa19568a06 Ports weapons to Initialize() CitadelStationBot 2017-08-11 02:49:11 -05:00
  • 4686340d3c Fixes help text for embedded objects CitadelStationBot 2017-08-11 02:47:05 -05:00
  • bd8289b29f Massively improves downloading/viewing logs. CitadelStationBot 2017-08-10 10:49:22 -05:00
  • f6da0f89c3 decapitalizes flyswatter in weaponry.dm CitadelStationBot 2017-08-10 08:09:25 -05:00
  • cad81a26e2 Automatic changelog generation for PR #2320 [ci skip] CitadelStationBot 2017-08-10 06:13:49 -05:00
  • da03284a6f Merge pull request #2320 from Citadel-Station-13/bear-humn LetterJay 2017-08-10 06:13:47 -05:00
  • 4d19a89519 Removes a great amount of machinery copypasta with circuitboards. CitadelStationBot 2017-08-09 19:24:19 -05:00
  • f91d7799f4 Merge branch 'master' into custom_roundstart_items kevinz000 2017-08-09 09:46:52 -07:00
  • 014487c808 Automatic changelog generation for PR #2319 [ci skip] CitadelStationBot 2017-08-09 11:25:04 -05:00
  • 43c774b72e Merge pull request #2319 from Citadel-Station-13/upstream-merge-29781 LetterJay 2017-08-09 11:25:02 -05:00
  • c73115b82c Merge pull request #2318 from Citadel-Station-13/upstream-merge-29752 LetterJay 2017-08-09 11:24:43 -05:00
  • f8565150a9 Merge pull request #2317 from Citadel-Station-13/upstream-merge-29632 LetterJay 2017-08-09 11:24:30 -05:00
  • 805aa06807 adds bear tails/ears to humans as well LetterJay 2017-08-09 11:23:09 -05:00
  • 83c546f143 Fixes swarmer shells having no ghost notifications CitadelStationBot 2017-08-09 03:26:14 -05:00
  • 0b516b5759 Makes [WIP] and [DNM] case insensitive for autotagging CitadelStationBot 2017-08-09 03:24:08 -05:00
  • 943599c5f1 Clock powerdrain now works on any device with a powercell CitadelStationBot 2017-08-09 03:05:47 -05:00
  • dc502b99a6 Merge pull request #2314 from Citadel-Station-13/upstream-merge-29753 LetterJay 2017-08-09 02:22:33 -05:00