shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 66420d8504 Merge pull request #6116 from cebutris/moreminerloot LetterJay 2018-04-02 05:47:30 -05:00
  • 9c4a589f03 Automatic changelog generation for PR #6174 [ci skip] LetterJay 2018-04-02 05:43:22 -05:00
  • b09d271e17 Merge pull request #6174 from Michiyamenotehifunana/polychrome-Cloth-Globalize LetterJay 2018-04-02 05:43:18 -05:00
  • 9045de2c90 Merge pull request #6204 from Citadel-Station-13/upstream-merge-36873 LetterJay 2018-04-02 05:41:19 -05:00
  • af2cc17248 Merge pull request #6232 from Citadel-Station-13/upstream-merge-36886 LetterJay 2018-04-02 05:39:55 -05:00
  • daf2e6efa7 Merge pull request #6231 from Citadel-Station-13/upstream-merge-36721 LetterJay 2018-04-02 05:23:50 -05:00
  • 242fd0556d Merge pull request #6230 from Citadel-Station-13/upstream-merge-36875 LetterJay 2018-04-02 05:22:20 -05:00
  • e1cfdff3e7 things with stuff (#6233) Poojawa 2018-04-02 03:53:25 -05:00
  • 5161f9b8fa servant blockers no longer glitch out when deleted without force CitadelStationBot 2018-04-02 02:13:03 -05:00
  • 91f9596eec damnit (#36886) kevinz000 2018-04-02 00:12:43 -07:00
  • dc7585fabf [MIRROR] Moves quick equip hotkey up to /mob (#6229) CitadelStationBot 2018-04-02 01:36:42 -05:00
  • 03a4db4983 Update beam_rifle.dm kevinz000 2018-04-01 23:07:35 -07:00
  • 494c3e076d Fix crafting tools tooltips CitadelStationBot 2018-04-01 22:02:46 -05:00
  • 4c97bc84e7 Merge pull request #36721 from GrayRachnid/fix-crafting-tools Jordan Brown 2018-04-01 23:01:57 -04:00
  • c5da65b20b adds a sprite to the "show roundend report" button CitadelStationBot 2018-04-01 21:51:08 -05:00
  • b87addc531 adds a sprite to the "show roundend report" button (#36875) MrDoomBringer 2018-04-01 22:51:13 -04:00
  • e4c6ce0a98 Update dance_machine.dm LetterJay 2018-04-01 19:53:15 -05:00
  • a9c91b4d00 Merge pull request #6127 from Citadel-Station-13/upstream-merge-36689 LetterJay 2018-04-01 19:51:58 -05:00
  • 022ac2e6c3 Merge pull request #6178 from Citadel-Station-13/shit LetterJay 2018-04-01 19:51:39 -05:00
  • 7682dd2a7f Merge pull request #6188 from Citadel-Station-13/upstream-merge-36822 LetterJay 2018-04-01 19:51:17 -05:00
  • a5ec18d566 Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816 LetterJay 2018-04-01 19:50:58 -05:00
  • dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548 LetterJay 2018-04-01 19:50:43 -05:00
  • f7be23e78a Merge branch 'master' into upstream-merge-36442 LetterJay 2018-04-01 19:50:37 -05:00
  • 28e188cbbe Merge pull request #6169 from Citadel-Station-13/upstream-merge-36722 LetterJay 2018-04-01 19:49:55 -05:00
  • 77a4b58c60 Merge pull request #6132 from Michiyamenotehifunana/gimme-da-blasta LetterJay 2018-04-01 19:49:27 -05:00
  • 31bb211cb3 Update communications.dm LetterJay 2018-04-01 19:48:15 -05:00
  • 1077b94c4e nerf kevinz000 2018-04-01 16:37:44 -07:00
  • 2d038f3f94 gay loginsandylogout 2018-04-01 18:31:26 -05:00
  • 57ed2fcb70 Merge pull request #6215 from Citadel-Station-13/iconstate LetterJay 2018-04-01 17:48:13 -05:00
  • 8bd10ebb2e Merge pull request #6216 from Citadel-Station-13/upstream-merge-36850 LetterJay 2018-04-01 17:47:59 -05:00
  • 661f8b3468 Merge pull request #6217 from Citadel-Station-13/upstream-merge-36851 LetterJay 2018-04-01 17:47:37 -05:00
  • b6873e9bd4 Merge pull request #6219 from Citadel-Station-13/upstream-merge-36857 LetterJay 2018-04-01 17:47:07 -05:00
  • 982eef4158 Merge pull request #6227 from Citadel-Station-13/upstream-merge-36524 LetterJay 2018-04-01 17:46:45 -05:00
  • 7d1746a84a Merge pull request #6226 from Citadel-Station-13/upstream-merge-36865 LetterJay 2018-04-01 17:46:22 -05:00
  • 2177a51a09 Merge pull request #6225 from Citadel-Station-13/upstream-merge-36856 LetterJay 2018-04-01 17:46:03 -05:00
  • f5b2315531 Merge pull request #6223 from Citadel-Station-13/upstream-merge-36885 LetterJay 2018-04-01 17:45:41 -05:00
  • a11f0c4eb7 Merge pull request #6222 from Citadel-Station-13/upstream-merge-36829 LetterJay 2018-04-01 17:45:21 -05:00
  • 64705aaf07 Merge pull request #6221 from Citadel-Station-13/upstream-merge-36864 LetterJay 2018-04-01 17:45:04 -05:00
  • 954027e16d Merge branch 'master' into upstream-merge-36722 LetterJay 2018-04-01 17:44:41 -05:00
  • 6d117d18a3 Update spellbook.dm LetterJay 2018-04-01 17:44:04 -05:00
  • 6b50b35897 Merge pull request #6140 from Citadel-Station-13/upstream-merge-36743 LetterJay 2018-04-01 17:41:34 -05:00
  • 9bb405d27c Merge pull request #6147 from Citadel-Station-13/upstream-merge-36738 LetterJay 2018-04-01 17:40:38 -05:00
  • c4ac6e63f7 Update combat.dm LetterJay 2018-04-01 17:39:41 -05:00
  • 5c817dfd01 Update humans.dm LetterJay 2018-04-01 17:39:26 -05:00
  • d63ff01364 Update components.dm LetterJay 2018-04-01 17:38:50 -05:00
  • 34bb9d51b8 Walls made entirely of wood! CitadelStationBot 2018-04-01 12:24:33 -05:00
  • 7826515aed Walls made entirely of wood! (#36524) fludd12 2018-04-01 13:24:26 -04:00
  • 216da37e08 adds a "the" to robo's supervisor in job description CitadelStationBot 2018-04-01 11:16:57 -05:00
  • 4d0df4ab16 Merge pull request #36865 from factoryman942/master Jordan Brown 2018-04-01 12:17:12 -04:00
  • 626f584ef4 The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed CitadelStationBot 2018-04-01 11:11:38 -05:00
  • 9b8ca10da2 Merge pull request #36856 from iskyp/resin+egg Jordan Brown 2018-04-01 12:11:38 -04:00
  • 01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files KorPhaeron 2018-04-01 09:42:32 -05:00
  • 4e9287029a Fixes revenants being unable to siphon after failing a siphon CitadelStationBot 2018-04-01 08:33:39 -05:00
  • a18aec6fa5 Fixes revenants being unable to siphon after failing a siphon YPOQ 2018-03-31 19:33:59 -06:00
  • a5b4884027 [s]Minor Refactor of click code, anti-auto clicker protection CitadelStationBot 2018-04-01 08:24:12 -05:00
  • ae61521e67 Merge pull request #36829 from MrStonedOne/onclick_rework vuonojenmustaturska 2018-04-01 16:23:54 +03:00
  • 00038dfc88 Cleaned up tile pointer circuit and converted to absolute coordinates CitadelStationBot 2018-04-01 08:19:53 -05:00
  • cf3826f3bf Merge pull request #36864 from robbym/master vuonojenmustaturska 2018-04-01 16:19:57 +03:00
  • 1112581b47 you can now walk through abductor table frames CitadelStationBot 2018-04-01 07:33:14 -05:00
  • 7e639116f6 Merge pull request #36857 from iskyp/ayytableframes vuonojenmustaturska 2018-04-01 15:33:25 +03:00
  • 9d678a1435 Adds singular_name to BS polycrystals CitadelStationBot 2018-04-01 07:27:45 -05:00
  • 76a9540f80 Merge pull request #36851 from 81Denton/bs-polycrystal-name vuonojenmustaturska 2018-04-01 15:27:35 +03:00
  • 69642fe2f3 Pubby: fixes bomb testing site cam networks CitadelStationBot 2018-04-01 07:26:31 -05:00
  • b58c0a8157 Merge pull request #36850 from 81Denton/pubby-bombsite-cams vuonojenmustaturska 2018-04-01 15:26:42 +03:00
  • 70264c238b icon state fix LetterJay 2018-04-01 06:18:26 -05:00
  • f9d963a634 Update _lists.dm LetterJay 2018-04-01 04:40:47 -05:00
  • 9dfa66afea Update spellbook.dm LetterJay 2018-04-01 04:40:12 -05:00
  • 88f328651f Update food_reagents.dm LetterJay 2018-04-01 04:39:21 -05:00
  • 610a001ad5 Update computer_ui.dm LetterJay 2018-04-01 04:37:57 -05:00
  • 75a49c53c8 Fixes dogborg sitting (#6112) Poojawa 2018-04-01 04:06:10 -05:00
  • 9d229ebb8c Merge pull request #6207 from Citadel-Station-13/paperhat LetterJay 2018-04-01 01:04:42 -05:00
  • 17e92ca86b Merge pull request #6152 from Citadel-Station-13/upstream-merge-36734 LetterJay 2018-04-01 01:03:46 -05:00
  • bd28b80a10 Merge pull request #6182 from Citadel-Station-13/upstream-merge-36838 LetterJay 2018-04-01 01:03:33 -05:00
  • c19f285322 Merge pull request #6179 from Citadel-Station-13/upstream-merge-36807 LetterJay 2018-04-01 01:03:10 -05:00
  • 24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147 LetterJay 2018-04-01 01:01:55 -05:00
  • cccab00fed Merge pull request #6134 from Citadel-Station-13/upstream-merge-36230 LetterJay 2018-04-01 01:01:42 -05:00
  • 81815605e2 Merge pull request #6213 from Citadel-Station-13/upstream-merge-36840 LetterJay 2018-04-01 01:00:07 -05:00
  • 5ee3f578e8 Merge pull request #6212 from Citadel-Station-13/upstream-merge-36824 LetterJay 2018-04-01 00:59:47 -05:00
  • aa7ea70862 Fixes singularity power output CitadelStationBot 2018-04-01 00:18:37 -05:00
  • d27541d5fb Merge pull request #36840 from 81Denton/singulo-power Jordan Brown 2018-04-01 01:18:48 -04:00
  • acc4e7f894 Monkeys can now die of bloodloss CitadelStationBot 2018-04-01 00:17:26 -05:00
  • 7c6845b750 Merge pull request #36824 from Robustin/mblood Jordan Brown 2018-04-01 01:17:28 -04:00
  • 20953ba97b Removes advanced darkness CitadelStationBot 2018-04-01 00:08:54 -05:00
  • c47a034069 Merge pull request #36834 from KorPhaeron/darkness2 Jordan Brown 2018-04-01 01:08:54 -04:00
  • d36fac0662 another donator item LetterJay 2018-03-31 21:49:15 -05:00
  • c670eaa613 Merge pull request #6202 from Citadel-Station-13/upstream-merge-36836 LetterJay 2018-03-31 19:03:55 -05:00
  • ecc453a823 Merge pull request #6200 from Citadel-Station-13/upstream-merge-36826 LetterJay 2018-03-31 19:03:44 -05:00
  • 212e82dece Merge pull request #6199 from Citadel-Station-13/upstream-merge-36783 LetterJay 2018-03-31 19:03:31 -05:00
  • 38a1a0fca7 Merge pull request #6198 from Citadel-Station-13/upstream-merge-36804 LetterJay 2018-03-31 19:03:13 -05:00
  • 9b913a462b Merge pull request #6197 from Citadel-Station-13/upstream-merge-36796 LetterJay 2018-03-31 18:44:41 -05:00
  • dfc437a00f Merge pull request #6196 from Citadel-Station-13/upstream-merge-36805 LetterJay 2018-03-31 18:44:25 -05:00
  • df8f936cf8 Merge pull request #6195 from Citadel-Station-13/upstream-merge-36803 LetterJay 2018-03-31 18:44:11 -05:00
  • d5f94e6ce6 Merge pull request #6194 from Citadel-Station-13/upstream-merge-36794 LetterJay 2018-03-31 18:43:53 -05:00
  • 961c69a8e5 Merge pull request #6193 from Citadel-Station-13/upstream-merge-36800 LetterJay 2018-03-31 18:43:34 -05:00
  • 1ff35776a7 Merge pull request #6192 from Citadel-Station-13/upstream-merge-36795 LetterJay 2018-03-31 18:43:06 -05:00
  • 19df345067 Merge pull request #6191 from Citadel-Station-13/upstream-merge-36787 LetterJay 2018-03-31 18:42:51 -05:00
  • 54feba8901 Merge pull request #6190 from Citadel-Station-13/upstream-merge-36780 LetterJay 2018-03-31 18:42:31 -05:00
  • e3eda7c49a Merge pull request #6189 from Citadel-Station-13/upstream-merge-36770 LetterJay 2018-03-31 18:42:09 -05:00
  • 29bd14c0c2 Merge pull request #6187 from Citadel-Station-13/upstream-merge-36827 LetterJay 2018-03-31 18:41:55 -05:00
  • 043f05e466 Merge pull request #6186 from Citadel-Station-13/upstream-merge-36785 LetterJay 2018-03-31 18:41:24 -05:00