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

Commit Graph

  • ff41020b6f aaaa No I like it like this.... Fermi 2019-07-15 23:34:55 +01:00
  • bb17af0f30 Better limit it a lil. Fermi 2019-07-15 23:30:29 +01:00
  • d8a46dd0e3 Another fix to reduce spam. Fermi 2019-07-15 23:10:16 +01:00
  • c746cb3078 Quick fix Fermi 2019-07-15 23:07:49 +01:00
  • 55cc4f45f2 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 Fermi 2019-07-15 22:13:45 +01:00
  • f08e34cde6 Sigh. Fermi 2019-07-15 22:13:34 +01:00
  • 3422dad9ec Update bottle.dm Trilbyspaceclone 2019-07-15 17:07:53 -04:00
  • 9c7b1dee97 Merge branch 'master' into master Thalpy 2019-07-15 21:23:04 +01:00
  • 2fec4a51b0 Update traitor_bro.dm Bapldap 2019-07-15 13:26:21 -05:00
  • dbb17a258a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 Ghommie 2019-07-15 17:52:34 +02:00
  • 16a7f6e5b2 Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54 Ghommie 2019-07-15 17:46:13 +02:00
  • fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 Ghommie 2019-07-15 17:42:47 +02:00
  • 1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 Ghommie 2019-07-15 17:33:41 +02:00
  • 4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 Ghommie 2019-07-15 17:23:01 +02:00
  • 59f45d3e35 adds abductor replication lab with advanced tools Seris02 2019-07-15 15:18:04 +08:00
  • 7c0cd0e40d Removes duplicate belts.dmi Carlen White 2019-07-14 21:01:20 -04:00
  • bb81a0850b Merge branch 'master' into batch-check-injuries Carlen White 2019-07-14 20:46:11 -04:00
  • 3504f15c01 Travis Bump Carlen White 2019-07-14 20:29:23 -04:00
  • 2a78caa127 Merge branch 'master' into Unmodular Trilbyspaceclone 2019-07-14 18:27:37 -04:00
  • 8c1b7c4f22 Automatic changelog generation for PR #8693 [ci skip] CitadelStationBot 2019-07-14 16:52:31 -05:00
  • 61bc43a0d7 Merge pull request #8693 from Ghommie/Ghommie-cit70 kevinz000 2019-07-14 14:52:29 -07:00
  • 628244c0ba Merge pull request #8869 from Ghommie/Ghommie-cit129 kevinz000 2019-07-14 14:49:11 -07:00
  • f19b3d9ae2 Automatic changelog generation for PR #8877 [ci skip] CitadelStationBot 2019-07-14 16:48:51 -05:00
  • c06d495731 Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC kevinz000 2019-07-14 14:48:49 -07:00
  • c1fbd2d04b Automatic changelog generation for PR #8725 [ci skip] CitadelStationBot 2019-07-14 16:48:29 -05:00
  • 1564f38ff8 Merge pull request #8725 from Trilbyspaceclone/meme_tools kevinz000 2019-07-14 14:48:27 -07:00
  • 8a1e31e123 Automatic changelog generation for PR #8676 [ci skip] CitadelStationBot 2019-07-14 16:46:46 -05:00
  • 2c41141d2f Merge pull request #8676 from Trilbyspaceclone/patch-176 kevinz000 2019-07-14 14:46:44 -07:00
  • a11d92b242 Automatic changelog generation for PR #8796 [ci skip] CitadelStationBot 2019-07-14 16:44:03 -05:00
  • 0c658ba41a Merge pull request #8796 from Trilbyspaceclone/patch-190 kevinz000 2019-07-14 14:44:01 -07:00
  • 122dda798d Automatic changelog generation for PR #8880 [ci skip] CitadelStationBot 2019-07-14 16:20:55 -05:00
  • 9de885da32 Merge pull request #8880 from CameronWoof/air-alarms-should-be-green kevinz000 2019-07-14 14:20:54 -07:00
  • c52ceb7ecf Automatic changelog generation for PR #8724 [ci skip] CitadelStationBot 2019-07-14 16:20:06 -05:00
  • 705b12fc50 Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup kevinz000 2019-07-14 14:20:03 -07:00
  • 33250dfcbe buffs it a bit kevinz000 2019-07-14 14:16:44 -07:00
  • f13d16e4a1 Automatic changelog generation for PR #7544 [ci skip] CitadelStationBot 2019-07-14 16:15:55 -05:00
  • 102bede4be Merge pull request #7544 from deathride58/nanitepoolnerf kevinz000 2019-07-14 14:15:53 -07:00
  • b138b2420a Automatic changelog generation for PR #8785 [ci skip] CitadelStationBot 2019-07-14 16:11:12 -05:00
  • da8b43f054 Merge pull request #8785 from Trilbyspaceclone/Just_Smile! kevinz000 2019-07-14 14:11:09 -07:00
  • 2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 kevinz000 2019-07-14 14:05:20 -07:00
  • 5be6b358f0 Automatic changelog generation for PR #8887 [ci skip] CitadelStationBot 2019-07-14 16:04:22 -05:00
  • a573689101 Merge pull request #8887 from Poojawa/last-word-hearing-psychics kevinz000 2019-07-14 14:04:20 -07:00
  • bd3f9bddf7 Updates Blood Brother Bapldap 2019-07-14 13:54:32 -05:00
  • 67510809ef Webedits are a bad trip. Fermi 2019-07-14 15:14:21 +01:00
  • f77bcc9765 Merge branch 'master' into master Thalpy 2019-07-14 15:10:32 +01:00
  • a3a2fb03b6 My bad, my bad. Ghommie 2019-07-14 14:21:28 +02:00
  • 835e91d46e compile kevinz000 2019-07-14 05:13:47 -07:00
  • 0299cb3dcf tgfusion kevinz000 2019-07-14 03:55:35 -07:00
  • 570fa0cd3b fix kevinz000 2019-07-14 03:53:15 -07:00
  • 395b89d0a1 Update RPD.dm kevinz000 2019-07-14 03:42:26 -07:00
  • 090decbbc1 Automatic changelog generation for PR #8857 [ci skip] CitadelStationBot 2019-07-14 05:38:47 -05:00
  • b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127 kevinz000 2019-07-14 03:38:45 -07:00
  • 2c4b47e038 Automatic changelog generation for PR #8873 [ci skip] CitadelStationBot 2019-07-14 05:38:06 -05:00
  • 44474ddbd0 Merge pull request #8873 from Ghommie/Ghommie-cit131 kevinz000 2019-07-14 03:38:04 -07:00
  • f67162d27a Automatic changelog generation for PR #8884 [ci skip] CitadelStationBot 2019-07-14 05:37:39 -05:00
  • d5f156925d Merge pull request #8884 from Ghommie/Ghommie-cit135 kevinz000 2019-07-14 03:37:36 -07:00
  • 3fb213425c Automatic changelog generation for PR #8845 [ci skip] CitadelStationBot 2019-07-14 05:35:35 -05:00
  • 735fc5fab6 Merge pull request #8845 from Ghommie/Ghommie-cit121 kevinz000 2019-07-14 03:35:33 -07:00
  • dbad6f49b5 Automatic changelog generation for PR #8883 [ci skip] CitadelStationBot 2019-07-14 05:34:39 -05:00
  • 44e9721d37 Merge pull request #8883 from CameronWoof/codifying-mrp kevinz000 2019-07-14 03:34:37 -07:00
  • e7eda42260 Merge pull request #8876 from Poojawa/patch-1 kevinz000 2019-07-14 03:34:05 -07:00
  • a045059c30 Automatic changelog generation for PR #8874 [ci skip] CitadelStationBot 2019-07-14 05:33:40 -05:00
  • 2259ea2e1c Merge pull request #8874 from Ghommie/Ghommie-cit132 kevinz000 2019-07-14 03:33:37 -07:00
  • 22d1c383f6 Automatic changelog generation for PR #8885 [ci skip] CitadelStationBot 2019-07-14 05:33:13 -05:00
  • 5048db3668 Merge pull request #8885 from Ghommie/Ghommie-cit136 kevinz000 2019-07-14 03:33:11 -07:00
  • 0adb33474d Update buffing.dm kevinz000 2019-07-14 03:24:59 -07:00
  • 7161870c8b Astral Tweak. Fermi 2019-07-14 04:06:06 +01:00
  • 28072a31dc Update magweapon.dm kevinz000 2019-07-13 20:03:39 -07:00
  • 5a9fbf8487 Automatic changelog generation for PR #8752 [ci skip] CitadelStationBot 2019-07-13 19:15:30 -05:00
  • a27222fba7 Merge pull request #8752 from Sishen1542/uhhhhh deathride58 2019-07-13 20:15:28 -04:00
  • 8d12d0f017 I am very smart Fermi 2019-07-13 20:02:53 +01:00
  • 6c9f37790b Fixing bugs from merge conflicts. Fermi 2019-07-13 20:02:27 +01:00
  • 4c4dbd0e17 Merge branch 'master' into master Thalpy 2019-07-13 19:33:46 +01:00
  • 6a5d5fe494 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 Fermi 2019-07-13 19:18:46 +01:00
  • f2076ba276 Weird pushing error. Fermi 2019-07-13 19:18:42 +01:00
  • 110f0cbb83 Fixes and making a message clearer so people don't think it's admins. Fermi 2019-07-13 19:17:19 +01:00
  • 245bd3e650 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics Poojawa 2019-07-13 10:18:13 -05:00
  • 4d895ae6c0 Gang victory news report and last words for discord bot Poojawa 2019-07-13 08:38:19 -05:00
  • 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" Ghommie 2019-07-13 10:27:39 +02:00
  • 68c6aa4fa9 ghommie's suggestions CameronWoof 2019-07-12 22:34:25 -07:00
  • 71720f8a32 missed bits. Ghommie 2019-07-13 07:12:37 +02:00
  • 8f410429de Ports "Renames SSsqueak to SSminor_mapping" Ghommie 2019-07-13 07:08:03 +02:00
  • 31bd9104bb Ports "Adds blueshirt items to sectech and defines them better." Ghommie 2019-07-13 06:42:09 +02:00
  • ea77d524e6 guess ill fuck up Trilbyspaceclone 2019-07-12 21:48:03 -04:00
  • 067ec1ac92 Removes forced climax from hexacrocin overdose CameronWoof 2019-07-12 18:33:13 -07:00
  • f68501b101 rng TrilbySpaceClone 2019-07-12 21:24:44 -04:00
  • b2345b19ce critcal TrilbySpaceClone 2019-07-12 21:21:52 -04:00
  • b7c8909a18 Fixing a reagent ID typo. Ghommie 2019-07-13 02:12:01 +02:00
  • d944c0bb27 Normalizes Air Alarms CameronWoof 2019-07-12 15:04:43 -07:00
  • 751736ac09 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 Thalpy 2019-07-12 16:39:14 +01:00
  • 63eb375b74 Decreased impossibility of catchem Thalpy 2019-07-12 16:39:10 +01:00
  • 194e420a1c Automatic changelog generation for PR #8734 [ci skip] CitadelStationBot 2019-07-12 09:43:14 -05:00
  • c012418cf7 Merge pull request #8734 from Ghommie/Ghommie-cit84 kevinz000 2019-07-12 07:43:12 -07:00
  • a863941fa1 Automatic changelog generation for PR #8812 [ci skip] CitadelStationBot 2019-07-12 09:42:14 -05:00
  • 13b1e5d409 Merge pull request #8812 from Sishen1542/surgery-hugboxing kevinz000 2019-07-12 07:42:11 -07:00
  • 8dc09d5279 Automatic changelog generation for PR #8860 [ci skip] CitadelStationBot 2019-07-12 09:41:30 -05:00
  • 280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil kevinz000 2019-07-12 07:41:28 -07:00
  • 15c42c1928 Automatic changelog generation for PR #8870 [ci skip] CitadelStationBot 2019-07-12 09:40:21 -05:00
  • f2e67f2b9a Merge pull request #8870 from Ghommie/Ghommie-cit130 kevinz000 2019-07-12 07:40:19 -07:00
  • 9c07979b34 Automatic changelog generation for PR #8842 [ci skip] CitadelStationBot 2019-07-12 09:36:50 -05:00