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

Commit Graph

  • 0b60d5e6ef derp GrayRachnid 2019-11-24 17:48:09 -05:00
  • 453bb6ca32 Automatic changelog generation for PR #9867 [ci skip] CitadelStationBot 2019-11-24 16:31:05 -06:00
  • c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 BlackMajor 2019-11-25 11:31:03 +13:00
  • 315082fc91 Automatic changelog generation for PR #9902 [ci skip] CitadelStationBot 2019-11-24 16:30:45 -06:00
  • 6f98efb18e Merge pull request #9902 from Useroth/new-tg-plants BlackMajor 2019-11-25 11:30:43 +13:00
  • 47b5dbeaaa Merge pull request #9625 from Ghommie/Ghommie-cit277 BlackMajor 2019-11-25 11:30:31 +13:00
  • 18e7e85e87 Automatic changelog generation for PR #9907 [ci skip] CitadelStationBot 2019-11-24 14:01:39 -06:00
  • 7481661182 Merge pull request #9907 from Putnam3145/midround-Vr-fix Lin 2019-11-24 20:01:36 +00:00
  • 6a59cc1c99 Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle. Useroth 2019-11-24 10:14:16 +01:00
  • 6c51f09a82 Make organs no longer contaminable. Putnam 2019-11-23 21:14:24 -08:00
  • 99e9c606c0 I dunno what I did but it's fixed... somehow. Fermi 2019-11-24 04:03:51 +00:00
  • 614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" Fermi 2019-11-24 03:33:02 +00:00
  • ba4fa1ef67 Revert "PLASE" Fermi 2019-11-24 03:06:08 +00:00
  • aeb8606ce0 Revert "Revert "PLASE"" Fermi 2019-11-24 03:04:52 +00:00
  • 25fe5ec14b Revert "Revert "Alright"" Fermi 2019-11-24 03:04:37 +00:00
  • 1df097b8ed Revert "Revert "hark"" Fermi 2019-11-24 03:04:31 +00:00
  • f03b90f2e2 Revert "Revert "I can't spell"" Fermi 2019-11-24 03:04:30 +00:00
  • 2501b5c88c Revert "Revert "Okay"" Fermi 2019-11-24 03:04:27 +00:00
  • 6729a62200 Revert "Revert "Well"" Fermi 2019-11-24 03:04:25 +00:00
  • 994c01c8ec Revert "Revert "Trust your insincts"" Fermi 2019-11-24 03:04:23 +00:00
  • 3155e3ffb3 Revert "Revert "Removes the random love"" Fermi 2019-11-24 03:04:20 +00:00
  • 1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'" Fermi 2019-11-24 03:04:13 +00:00
  • c8b206a4cf Revert "pls" Fermi 2019-11-24 03:04:04 +00:00
  • 4c1c257035 Revert "Revert "pls"" Fermi 2019-11-24 03:02:21 +00:00
  • 9eaed4ea8e Revert "pls2" Fermi 2019-11-24 03:02:04 +00:00
  • 8ea6618f5d Revert "ARGH" Fermi 2019-11-24 03:01:59 +00:00
  • cb4bfa65d1 Revert "?" Fermi 2019-11-24 03:01:55 +00:00
  • 1f7e9d8ab5 Revert "please" Fermi 2019-11-24 03:01:51 +00:00
  • ac53c26d87 please Fermi 2019-11-24 02:58:15 +00:00
  • 05d18171e0 ? Fermi 2019-11-24 02:57:46 +00:00
  • f0f52ce3f8 ARGH Fermi 2019-11-24 02:55:50 +00:00
  • 0eb635b908 pls2 Fermi 2019-11-24 02:52:17 +00:00
  • b23f2a4460 Revert "pls" Fermi 2019-11-24 02:49:20 +00:00
  • 8c97511871 pls Fermi 2019-11-24 02:47:52 +00:00
  • 135608551f Merge remote-tracking branch 'upstream/master' Fermi 2019-11-24 02:45:28 +00:00
  • ce7e9ac452 Revert "Removes the random love" Fermi 2019-11-24 02:45:06 +00:00
  • 82c3e3cd9d Revert "Trust your insincts" Fermi 2019-11-24 02:44:52 +00:00
  • df5814c30e Revert "Well" Fermi 2019-11-24 02:44:36 +00:00
  • fb2c29caff Revert "Okay" Fermi 2019-11-24 02:44:32 +00:00
  • 3d713b6c96 Revert "I can't spell" Fermi 2019-11-24 02:44:28 +00:00
  • f4b54f15d2 Revert "hark" Fermi 2019-11-24 02:44:19 +00:00
  • 505e15a3e1 Revert "Alright" Fermi 2019-11-24 02:44:10 +00:00
  • 00601a0c87 Revert "PLASE" Fermi 2019-11-24 02:44:00 +00:00
  • 8af225e6e3 PLASE Fermi 2019-11-24 02:41:21 +00:00
  • fb4a47d310 Added more items to vendors. Winter Flare 2019-11-23 15:58:04 -05:00
  • e19b85c823 change recipe Linzolle 2019-11-23 12:58:42 -06:00
  • 63e96a1402 Automatic changelog generation for PR #9874 [ci skip] CitadelStationBot 2019-11-23 12:49:35 -06:00
  • f0996208a3 Merge pull request #9874 from Ghommie/Ghommie-cit379 kevinz000 2019-11-23 11:49:32 -07:00
  • 40d787133d Automatic changelog generation for PR #9891 [ci skip] CitadelStationBot 2019-11-23 12:46:30 -06:00
  • aba39f0b36 Merge pull request #9891 from Putnam3145/dynamic-traitor-fix kevinz000 2019-11-23 11:46:28 -07:00
  • 589055628a Automatic changelog generation for PR #9881 [ci skip] CitadelStationBot 2019-11-23 12:46:00 -06:00
  • f28a6feb5f Merge pull request #9881 from Putnam3145/persistent-dynamic-weights kevinz000 2019-11-23 11:45:58 -07:00
  • be679b97a6 Merge pull request #9885 from Commandersand/cuckcult kevinz000 2019-11-23 11:45:24 -07:00
  • 0700b050e1 Automatic changelog generation for PR #9909 [ci skip] CitadelStationBot 2019-11-23 12:44:54 -06:00
  • f88ed98ee4 Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert kevinz000 2019-11-23 11:44:52 -07:00
  • 6b19420a83 Automatic changelog generation for PR #9749 [ci skip] CitadelStationBot 2019-11-23 12:42:40 -06:00
  • 75510d8da9 Merge pull request #9749 from Trilbyspaceclone/patch-238 kevinz000 2019-11-23 11:42:37 -07:00
  • c8235def34 Automatic changelog generation for PR #9864 [ci skip] CitadelStationBot 2019-11-23 12:39:38 -06:00
  • 88762c5d89 Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand kevinz000 2019-11-23 11:39:35 -07:00
  • 9ee4acd143 Persi's Sleepers KathrinBailey 2019-11-23 16:00:30 +00:00
  • eee8c8c108 Shields Bounty is now 2 for 3000 Winter Flare 2019-11-23 03:11:00 -05:00
  • a69b4b4916 removes creep GrayRachnid 2019-11-23 02:28:31 -05:00
  • 532fab092f Bugfix from testmerge KathrinBailey 2019-11-23 06:41:23 +00:00
  • c8fe354e91 Automatic changelog generation for PR #9898 [ci skip] CitadelStationBot 2019-11-22 23:52:46 -06:00
  • e954cec58c Merge pull request #9898 from Ghommie/Ghommie-cit387 Lin 2019-11-23 05:52:44 +00:00
  • 88d126794c Automatic changelog generation for PR #9896 [ci skip] CitadelStationBot 2019-11-22 23:52:13 -06:00
  • 592dcdb6fd Merge pull request #9896 from Ghommie/Ghommie-cit386 Lin 2019-11-23 05:52:11 +00:00
  • 028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383 Lin 2019-11-23 05:39:33 +00:00
  • d07266e432 new VG icons, un-animates holograms YakumoChen 2019-11-23 00:09:17 -05:00
  • 496d81b76a New VG AI icons, fixes Yes Man. YakumoChen 2019-11-23 00:00:48 -05:00
  • 038887e27b Adds new AI display options removes duplicate entry YakumoChen 2019-11-23 04:59:52 +00:00
  • 6ebab6300a Adds AI icons and fixes the comma. Again. YakumoChen 2019-11-23 04:41:36 +00:00
  • 6d5c4c3bdb Adds AI core display options YakumoChen 2019-11-23 04:35:50 +00:00
  • 1c8b557466 fixes AI.dm again YakumoChen 2019-11-23 04:13:30 +00:00
  • 2a22a7a3c2 update AI.dmi YakumoChen 2019-11-22 23:00:16 -05:00
  • 6426e5dade makes the icons not break YakumoChen 2019-11-23 03:54:39 +00:00
  • a6ff44782a adds more unique ai holograms YakumoChen 2019-11-23 03:51:04 +00:00
  • 45ad9a6598 update AI.dmi YakumoChen 2019-11-22 22:46:58 -05:00
  • 66c6bb55f3 Merge pull request #14 from Citadel-Station-13/master YakumoChen 2019-11-22 22:29:10 -05:00
  • 037b278e9e Merge pull request #9918 from Ghommie/Ghommie-cit384 Putnam3145 2019-11-22 18:14:41 -08:00
  • 77800cf720 Oh yea it's a list Ghommie 2019-11-23 03:02:29 +01:00
  • 2d1edf661b Fixes travis. Ghommie 2019-11-23 02:58:03 +01:00
  • 38cc9a546b welp Ghommie 2019-11-23 02:56:25 +01:00
  • ea4fdf727b Merge pull request #9917 from Ghommie/Ghommie-cit384 Putnam3145 2019-11-22 17:06:50 -08:00
  • b756f37ff6 Alright Fermi 2019-11-23 01:05:42 +00:00
  • 89bcb00ef1 hark Fermi 2019-11-23 00:54:40 +00:00
  • 82d97ff4a7 This way is better Ghommie 2019-11-23 01:51:31 +01:00
  • 24c93d9df6 [S] bikehorn fix 2: sound() datum doesn't accept double quotes, my bad. Ghommie 2019-11-23 01:46:59 +01:00
  • 0fed6d49e4 I can't spell Fermi 2019-11-23 00:32:33 +00:00
  • 37ac0ccb66 Okay Fermi 2019-11-23 00:23:43 +00:00
  • b55acee223 mam tails stuff Ghommie 2019-11-23 01:20:19 +01:00
  • e44c8c0a4a Well I guess Fermi 2019-11-23 00:18:45 +00:00
  • 7a605b4ba6 Trust your insincts Fermi 2019-11-23 00:16:34 +00:00
  • b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks Fermi 2019-11-23 00:10:33 +00:00
  • 399986f3f7 Forgot to update the procs Fermi 2019-11-22 23:57:09 +00:00
  • 7bbc90d747 makes the freezing list a typecache Fermi 2019-11-22 23:56:05 +00:00
  • 77913406ed Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs GrayRachnid 2019-11-22 18:50:24 -05:00
  • 0c76e9a6d0 Automatic changelog generation for PR #9886 [ci skip] CitadelStationBot 2019-11-22 17:48:30 -06:00
  • 6145cd0d96 Merge pull request #9886 from Ghommie/Ghommie-cit384 Putnam3145 2019-11-22 15:48:28 -08:00
  • b056d91ea5 Removes the random love Fermi 2019-11-22 23:48:21 +00:00