Commit Graph

  • 22a8b7c1bf Merge pull request #963 from Citadel-Station-13/upstream-merge-27217 LetterJay 2017-05-14 16:24:13 -04:00
  • 015369c24a Automatic changelog generation for PR #964 [ci skip] CitadelStationBot 2017-05-14 15:23:52 -05:00
  • 33b38b07b1 Merge pull request #964 from Citadel-Station-13/upstream-merge-27186 LetterJay 2017-05-14 16:23:51 -04:00
  • abc74c8b06 Fixes engraved messages CitadelStationBot 2017-05-14 14:50:49 -05:00
  • c8c86a98da Glowshrooms have a less saturated glow CitadelStationBot 2017-05-14 11:31:47 -05:00
  • 5f603b7d85 Makes turrets less of a joke CitadelStationBot 2017-05-14 08:01:28 -05:00
  • 4a67fe55a4 Buffs nitrous oxide CitadelStationBot 2017-05-14 07:39:05 -05:00
  • e661d82030 Goats eat glowshrooms CitadelStationBot 2017-05-14 07:38:00 -05:00
  • 962d114339 Petting is better CitadelStationBot 2017-05-14 07:36:55 -05:00
  • 7b0532089f Job assign at roundstart now favors empty positions first CitadelStationBot 2017-05-14 07:34:50 -05:00
  • 155f1d3ad0 Merge pull request #789 from Citadel-Station-13/upstream-merge-26908 LetterJay 2017-05-14 01:35:52 -04:00
  • 4b72cc0486 Merge pull request #712 from Citadel-Station-13/upstream-merge-26760 LetterJay 2017-05-14 01:32:52 -04:00
  • 00b17f1649 maybe LetterJay 2017-05-14 00:28:07 -05:00
  • fb639b569e Automatic changelog generation for PR #739 [ci skip] CitadelStationBot 2017-05-14 00:12:36 -05:00
  • e36d24ee24 Merge pull request #739 from Citadel-Station-13/upstream-merge-26783 LetterJay 2017-05-14 01:12:34 -04:00
  • 7613a1618e Merge pull request #786 from Citadel-Station-13/upstream-merge-26958 LetterJay 2017-05-14 01:12:07 -04:00
  • 8d237cd8bb define var LetterJay 2017-05-14 00:11:23 -05:00
  • 3d0a1b2573 commit LetterJay 2017-05-14 00:05:53 -05:00
  • a9e0b28872 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26908 LetterJay 2017-05-14 00:04:52 -05:00
  • 44036f1c6d Merge pull request #725 from Citadel-Station-13/upstream-merge-26840 LetterJay 2017-05-14 01:03:03 -04:00
  • 52fa1f314f Merge branch 'master' into upstream-merge-26760 LetterJay 2017-05-14 01:02:26 -04:00
  • ca1f0ef04e commit LetterJay 2017-05-13 23:59:54 -05:00
  • e6ccfeaa51 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26958 LetterJay 2017-05-13 23:58:14 -05:00
  • ebb4e134cb commit LetterJay 2017-05-13 23:45:02 -05:00
  • 38eeeaa6d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783 LetterJay 2017-05-13 23:42:19 -05:00
  • a09e1ff34b Merge branch 'master' into upstream-merge-26840 LetterJay 2017-05-14 00:37:03 -04:00
  • e66cbfd7db my v key is broken LetterJay 2017-05-13 23:32:47 -05:00
  • 36de555483 commit LetterJay 2017-05-13 23:32:23 -05:00
  • 4b2b5e7520 commit LetterJay 2017-05-13 23:21:40 -05:00
  • 73101cbd88 Free Golems can purchase their own royal capes CitadelStationBot 2017-05-13 21:17:37 -05:00
  • e59c48b20d Soul Vessels now have the proper laws CitadelStationBot 2017-05-13 21:15:32 -05:00
  • 25024432fe more procs and roundstart loading files kevinz000 2017-05-13 16:23:43 -07:00
  • 9dcac046ef WHOSE FOOTPRINTS ARE THESE CitadelStationBot 2017-05-13 18:01:40 -05:00
  • dcc6e9ced1 Adds sixteen new OOC emoticons CitadelStationBot 2017-05-13 18:01:36 -05:00
  • eacd4305e6 Clipboard Initialize + GC fixes CitadelStationBot 2017-05-13 18:01:26 -05:00
  • a57afab0a9 Fixes an overlays runtime CitadelStationBot 2017-05-13 18:01:22 -05:00
  • d9a2939143 Fixes pizza box icons CitadelStationBot 2017-05-13 18:01:19 -05:00
  • b0bfcdabe9 Fixes something not using create_reagents CitadelStationBot 2017-05-13 18:01:12 -05:00
  • b19b680467 Fixes the recycler gibbing brainmobs CitadelStationBot 2017-05-13 18:01:09 -05:00
  • 80de24c491 Make Hermit Ruin more self-sufficient CitadelStationBot 2017-05-13 18:01:05 -05:00
  • b9e3e99faa Adds Several Butter-filled Foods CitadelStationBot 2017-05-13 18:00:57 -05:00
  • b9ad2c31c9 Buffs honey CitadelStationBot 2017-05-13 18:00:53 -05:00
  • 3d4356cd7c Explosion flame_range now defaults to light range instead of zero CitadelStationBot 2017-05-13 18:00:49 -05:00
  • 474fd582ea Ports dakimakuras from HippieStation. CitadelStationBot 2017-05-13 18:00:32 -05:00
  • 9e0866871e lists and stuff kevinz000 2017-05-13 11:26:07 -07:00
  • 55dd3876e5 Merge pull request #703 from Citadel-Station-13/upstream-merge-26140 LetterJay 2017-05-13 04:27:29 -04:00
  • 22aef374e2 Merge branch 'master' into upstream-merge-26140 LetterJay 2017-05-13 01:28:34 -04:00
  • 485bca003f Merge pull request #640 from Citadel-Station-13/upstream-merge-26527 LetterJay 2017-05-13 01:24:55 -04:00
  • bba7b9246d rej cleanup LetterJay 2017-05-13 00:12:05 -05:00
  • 084781a4c4 Automatic changelog generation for PR #697 [ci skip] CitadelStationBot 2017-05-12 23:57:49 -05:00
  • 8c4fbd35e7 Merge pull request #697 from Citadel-Station-13/upstream-merge-25596 LetterJay 2017-05-13 00:57:48 -04:00
  • f5e8a7e4e4 rej merges LetterJay 2017-05-12 23:57:11 -05:00
  • 18bb37f34a rej remove LetterJay 2017-05-12 23:03:48 -05:00
  • a7a32e6127 commit LetterJay 2017-05-12 23:03:27 -05:00
  • 74ea8ce4b4 Merge pull request #790 from Citadel-Station-13/upstream-merge-26962 LetterJay 2017-05-12 23:54:29 -04:00
  • fad7920c1e Automatic changelog generation for PR #927 [ci skip] CitadelStationBot 2017-05-12 22:54:10 -05:00
  • 26caca8312 Merge pull request #927 from Citadel-Station-13/upstream-merge-27152 LetterJay 2017-05-12 23:54:09 -04:00
  • c5ed5b84e3 Zombies can see in the dark CitadelStationBot 2017-05-12 15:57:11 -05:00
  • 6989a33584 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-05-12 15:25:26 -05:00
  • adc1b96b74 this is kenzie's fault LetterJay 2017-05-12 15:25:11 -05:00
  • ab3c30f40c Automatic changelog generation for PR #898 [ci skip] CitadelStationBot 2017-05-12 15:24:18 -05:00
  • a1c04dd314 Merge pull request #898 from LetterJay/master LetterJay 2017-05-12 16:24:17 -04:00
  • 4280c20af8 Adds a visible message to teleport runes being teleported to CitadelStationBot 2017-05-12 15:12:46 -05:00
  • 5625ff030a Dominators require an open space, except it works this time CitadelStationBot 2017-05-12 11:11:34 -05:00
  • 91c58632b3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-05-12 10:55:10 -05:00
  • 6d1fb0d48a the ride never ends LetterJay 2017-05-12 10:54:57 -05:00
  • 2abeadb92b Merge pull request #845 from Citadel-Station-13/upstream-merge-27056 LetterJay 2017-05-12 11:08:18 -04:00
  • 745bf3b321 client procs... client procs.... client procs.... LetterJay 2017-05-12 09:57:20 -05:00
  • 55492bb8ec even more client fixes! this time with added admin fixes LetterJay 2017-05-12 09:52:42 -05:00
  • 59497ff049 more client fixes LetterJay 2017-05-12 02:41:12 -05:00
  • e748d40401 Update client_procs.dm LetterJay 2017-05-12 02:29:03 -05:00
  • 19db647c58 Merge pull request #793 from Citadel-Station-13/upstream-merge-26922 LetterJay 2017-05-12 03:16:06 -04:00
  • c7fce18213 travis LetterJay 2017-05-12 01:54:20 -05:00
  • fd5b7566fd update client_procs.dm LetterJay 2017-05-12 01:49:56 -05:00
  • 7fbc21744f Merge pull request #762 from Citadel-Station-13/upstream-merge-26425 LetterJay 2017-05-12 02:14:55 -04:00
  • 6a1cac4e1e Merge branch 'master' into upstream-merge-26425 LetterJay 2017-05-12 00:08:32 -04:00
  • 8bb34472b7 fuck LetterJay 2017-05-11 23:07:50 -05:00
  • ff414d3a27 rej cleanup LetterJay 2017-05-11 23:00:26 -05:00
  • 6c4524700b Fixes character saves getting fucked up if there are no configured round start races. (#742) CitadelStationBot 2017-05-11 21:24:59 -05:00
  • 4c2d6e4ef5 Wraiths now refund part of Phase Shift's cooldown by attacking CitadelStationBot 2017-05-11 20:40:18 -05:00
  • b6fde40d97 Automatic changelog generation for PR #900 [ci skip] CitadelStationBot 2017-05-11 20:27:06 -05:00
  • ff7125efb6 pAI requests now tell ghosts who is making the request. (#900) CitadelStationBot 2017-05-11 20:27:05 -05:00
  • 779ba7ac89 Fixes a GC error with holocalls (#903) CitadelStationBot 2017-05-11 20:26:52 -05:00
  • ce65bd28b0 Hopefully fixes a holocall runtime (#902) CitadelStationBot 2017-05-11 20:26:33 -05:00
  • a679933cc7 SDQL cleanup (#904) CitadelStationBot 2017-05-11 20:26:15 -05:00
  • 395929c5e4 Travis CI build script fix (#912) CitadelStationBot 2017-05-11 20:25:44 -05:00
  • 0265ab60ff Cleans up an MC statement (#907) CitadelStationBot 2017-05-11 20:24:48 -05:00
  • b6c5f0b4fa Removes explosion delays (#911) CitadelStationBot 2017-05-11 20:24:28 -05:00
  • 7f0f7e1cc6 Cleans up meter's Initialize (#905) CitadelStationBot 2017-05-11 20:24:00 -05:00
  • eadee76e87 Adds a few more abductee objectives. (#909) CitadelStationBot 2017-05-11 20:23:47 -05:00
  • 916b1536ef Merge pull request #899 from Citadel-Station-13/config_loading LetterJay 2017-05-10 23:41:42 -04:00
  • b7acf503eb rej cleanup LetterJay 2017-05-10 22:35:01 -05:00
  • cbffd533ba Automatic changelog generation for PR #832 [ci skip] CitadelStationBot 2017-05-10 22:05:38 -05:00
  • a66e0c949e Merge pull request #832 from Citadel-Station-13/upstream-merge-23201 LetterJay 2017-05-10 23:05:37 -04:00
  • 746da812bf Delete client_procs.dm.rej LetterJay 2017-05-10 22:00:44 -05:00
  • 43318a88a5 rej fix LetterJay 2017-05-10 21:59:41 -05:00
  • 0411299a23 fixes issue with config loading LetterJay 2017-05-10 21:42:48 -05:00
  • 51d5c735a0 Automatic changelog generation for PR #722 [ci skip] CitadelStationBot 2017-05-10 20:12:10 -05:00
  • 3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645 LetterJay 2017-05-10 21:12:08 -04:00
  • 9f7dd3fe16 Update ghost.dm kevinz000 2017-05-10 17:53:27 -07:00