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

Commit Graph

  • a0412933c0 Blood Generator QOL, put in hands, select slot to add bloodbag to Poojawa 2019-08-29 23:02:41 -05:00
  • 0170c691da Automatic changelog generation for PR #9210 [ci skip] CitadelStationBot 2019-08-29 22:27:19 -05:00
  • 45914b64d2 Merge pull request #9210 from EmeraldSundisk/dcdfix1 nik707 2019-08-29 22:27:17 -05:00
  • 4f5e9893b3 Requested changes. EmeraldSundisk 2019-08-29 19:32:32 -07:00
  • 96aae12057 readds TrilbySpaceClone 2019-08-29 21:19:16 -04:00
  • ea7235d089 Merge branch 'master' into fruit TrilbySpaceClone 2019-08-29 21:15:18 -04:00
  • 1256d9382e complie Trilbyspaceclone 2019-08-29 21:07:57 -04:00
  • 2307f7a2a6 Merge pull request #9146 from Raptorizer/Botany-Peaches nik707 2019-08-29 19:59:37 -05:00
  • 1132b75392 Merge pull request #9173 from Citadel-Station-13/kevinz000-patch-76 nik707 2019-08-29 19:53:37 -05:00
  • c641874aab Update unsorted.dm Trilbyspaceclone 2019-08-29 20:50:36 -04:00
  • 07a731acc6 Automatic changelog generation for PR #9178 [ci skip] CitadelStationBot 2019-08-29 19:45:13 -05:00
  • dfdbb23d99 Merge pull request #9178 from deathride58/polyfix nik707 2019-08-29 19:45:11 -05:00
  • 4e9077aa2d aaaaaaa Raptorizer 2019-08-29 19:34:14 -05:00
  • eacdd931d0 Automatic changelog generation for PR #9200 [ci skip] CitadelStationBot 2019-08-29 19:34:11 -05:00
  • e7b267254b Merge pull request #9200 from Owai-Seek/minor-fixes nik707 2019-08-29 19:34:09 -05:00
  • bff828d3be Merge pull request #9202 from Trilbyspaceclone/patch-216 nik707 2019-08-29 19:33:08 -05:00
  • 649dbf8627 Automatic changelog generation for PR #9204 [ci skip] CitadelStationBot 2019-08-29 19:31:42 -05:00
  • fccafd6bd9 Merge pull request #9204 from Trilbyspaceclone/patch-217 nik707 2019-08-29 19:31:40 -05:00
  • 48f6b9408a Cotton/Durathread added? Raptorizer 2019-08-29 19:31:11 -05:00
  • 01f732c57a Merge pull request #9207 from Ghommie/Ghommie-cit189 nik707 2019-08-29 19:29:14 -05:00
  • daf2ce5182 HHHHHH Raptorizer 2019-08-29 19:29:01 -05:00
  • c95492fcff Automatic changelog generation for PR #9208 [ci skip] CitadelStationBot 2019-08-29 19:28:04 -05:00
  • 36a07f134b Merge pull request #9208 from Ghommie/Ghommie-cit190 nik707 2019-08-29 19:28:01 -05:00
  • a83f4f96bb Update seeds.dmi Raptorizer 2019-08-29 19:27:49 -05:00
  • 54cee2ff87 Conflict Resolve Raptorizer 2019-08-29 19:26:46 -05:00
  • 8bb54bd8dd Automatic changelog generation for PR #9168 [ci skip] CitadelStationBot 2019-08-29 19:11:59 -05:00
  • 624d717d08 Merge pull request #9168 from Seris02/loochotkey nik707 2019-08-29 19:11:57 -05:00
  • aa6e3abaf6 Automatic changelog generation for PR #9172 [ci skip] CitadelStationBot 2019-08-29 19:11:20 -05:00
  • 121c2c2f53 Merge pull request #9172 from Citadel-Station-13/kevinz000-patch-75 nik707 2019-08-29 19:11:19 -05:00
  • fd2aec7efe Merge pull request #9171 from Citadel-Station-13/kevinz000-patch-74 nik707 2019-08-29 19:09:40 -05:00
  • 4f9b901a97 Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73 nik707 2019-08-29 19:06:04 -05:00
  • 607ce2ae7f Automatic changelog generation for PR #9132 [ci skip] CitadelStationBot 2019-08-29 18:56:53 -05:00
  • d2bb75c820 Merge pull request #9132 from Michiyamenotehifunana/Toricrates-Remastered nik707 2019-08-29 18:56:51 -05:00
  • d3852ebd56 even more TrilbySpaceClone 2019-08-29 19:39:10 -04:00
  • bfd17d66cd Merge pull request #9074 from Citadel-Station-13/donator_grouping nik707 2019-08-29 18:31:23 -05:00
  • 6a24d1fdc4 Automatic changelog generation for PR #9080 [ci skip] CitadelStationBot 2019-08-29 18:23:49 -05:00
  • 0a4090f4d3 Merge pull request #9080 from Thalpy/Newmusic nik707 2019-08-29 18:23:47 -05:00
  • 55fbc7eb95 Automatic changelog generation for PR #9184 [ci skip] CitadelStationBot 2019-08-29 18:19:46 -05:00
  • 2f7402f591 Merge pull request #9184 from Ghommie/Ghommie-cit188 nik707 2019-08-29 18:19:44 -05:00
  • 2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 Ghommie 2019-08-29 21:01:23 +02:00
  • b98a5016b3 aaaaaaaaaaaa Sishen 2019-08-29 01:56:52 -04:00
  • 07a2d19c34 Update supermatter.dm Sishen 2019-08-28 23:58:27 -04:00
  • 47ee3a8a6d fuck Sishen 2019-08-28 23:56:08 -04:00
  • 4da0556bb1 Driver should work now! EmeraldSundisk 2019-08-28 18:29:28 -07:00
  • d37cb76f42 part 3 TrilbySpaceClone 2019-08-28 21:18:51 -04:00
  • 0e5ddc88c1 Part 2 TrilbySpaceClone 2019-08-28 19:51:07 -04:00
  • c1d9e3f03b Failing is frustrating Fermi 2019-08-29 00:37:18 +01:00
  • a5b8a56f9a Realised it was impossible. Fermi 2019-08-29 00:32:05 +01:00
  • 5b144ef1c6 Removed unused var Fermi 2019-08-29 00:13:24 +01:00
  • 124d8503dc Tests and fixes. Fermi 2019-08-29 00:12:16 +01:00
  • ce56c154ff Todo: finish new words and review langauge Fermi 2019-08-28 22:22:10 +01:00
  • 7a7c810e7b Plasmaglass Tables, Spears, Shards (Take 2) Dap 2019-08-28 15:15:58 -06:00
  • b89430ccfd Update back.dmi Dap 2019-08-28 15:07:18 -06:00
  • 19678119c5 Merge branch 'plasmatables' into plasmaglass-tables-spears Dap 2019-08-28 14:55:01 -06:00
  • f0a1d44503 Part 1 TrilbySpaceClone 2019-08-28 16:54:10 -04:00
  • 68315657f5 Who left those earmuffs out anyway? EmeraldSundisk 2019-08-28 11:15:45 -07:00
  • 9a0b6a21f9 Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64 nik707 2019-08-28 13:05:56 -05:00
  • ac1e058d1c Some minor fixes. EmeraldSundisk 2019-08-28 10:08:12 -07:00
  • 5c1dffe6f1 Merge pull request #2 from Citadel-Station-13/master EmeraldSundisk 2019-08-28 09:50:31 -07:00
  • 49e1350127 re-adds plasmaspears to back.dmi cause bot is mean Dap 2019-08-28 01:34:16 -06:00
  • 9f2e7f5b43 revert back.dmi to maybe shut up the bot Dap 2019-08-28 01:30:58 -06:00
  • c664032e85 Update supermatter.dm Sishen 2019-08-28 02:23:24 -04:00
  • 5bd87fe72d Automatic changelog generation for PR #9186 [ci skip] CitadelStationBot 2019-08-28 00:02:41 -05:00
  • 8e40e9d887 Merge pull request #9186 from Sishen1542/walklikeanegyptian nik707 2019-08-28 00:02:39 -05:00
  • 22aee03d30 Automatic changelog generation for PR #9180 [ci skip] CitadelStationBot 2019-08-27 22:51:01 -05:00
  • bea4349056 Merge pull request #9180 from deathride58/buffspoly kevinz000 2019-08-27 20:50:59 -07:00
  • 0ffeb704af Socks color fix. Ghommie 2019-08-28 05:33:36 +02:00
  • 18b023b127 arg Ghommie 2019-08-28 04:47:53 +02:00
  • 93cea3272e Automatic changelog generation for PR #8537 [ci skip] CitadelStationBot 2019-08-27 20:54:05 -05:00
  • 4d6b9f5da1 Merge pull request #8537 from Ghommie/Ghommie-cit28 BlackMajor 2019-08-28 13:54:03 +12:00
  • e25697dc14 rocket fix. Ghommie 2019-08-28 03:37:35 +02:00
  • 3b2be43bd8 Slightly increased rubbershot damage from 12.5 to 15 per pellet. Tupinambis 2019-08-27 18:35:08 -05:00
  • 6cf4783486 fixed Trilbyspaceclone 2019-08-27 13:56:47 -04:00
  • 419ea7f58c Fancy_part1 TrilbySpaceClone 2019-08-27 12:41:47 -04:00
  • 77863119f2 Update wallets.dm Trilbyspaceclone 2019-08-27 11:31:52 -04:00
  • 5b4347c5ab Initial commit. Poojawa 2019-08-27 04:30:31 -05:00
  • 26c5aa6185 Update berries.dm Winter Flare 2019-08-27 03:47:56 -04:00
  • fd16520ac0 buffs toxinlover blood deletion penalty Poojawa 2019-08-27 02:42:45 -05:00
  • 1e6845491d Update mood.dm kevinz000 2019-08-26 19:54:34 -07:00
  • 28f91949de Automatic changelog generation for PR #9177 [ci skip] CitadelStationBot 2019-08-26 21:42:17 -05:00
  • f07cdc0665 Merge pull request #9177 from JTGSZ/fix kevinz000 2019-08-26 19:42:15 -07:00
  • 78c1ad972f Merge pull request #9179 from chefferz/master kevinz000 2019-08-26 19:39:46 -07:00
  • dd54cc9e7d Automatic changelog generation for PR #9194 [ci skip] CitadelStationBot 2019-08-26 21:37:29 -05:00
  • 37642cdac2 Merge pull request #9194 from kappa-sama/kappa-sama-keys kevinz000 2019-08-26 19:37:28 -07:00
  • ade3f2f847 Automatic changelog generation for PR #9169 [ci skip] CitadelStationBot 2019-08-26 21:37:19 -05:00
  • d696c2cf6b Merge pull request #9169 from EmeraldSundisk/delta2chapel kevinz000 2019-08-26 19:37:17 -07:00
  • 249258a8ac Automatic changelog generation for PR #9183 [ci skip] CitadelStationBot 2019-08-26 21:36:08 -05:00
  • 96278b45ad Merge pull request #9183 from Ghommie/Ghommie-cit187 kevinz000 2019-08-26 19:36:06 -07:00
  • c069e76304 Merge pull request #9181 from Linzolle/general-swordsky kevinz000 2019-08-26 19:35:51 -07:00
  • 67efddcd8f coding makes me want to hang myself with cat 5e lolman360 2019-08-27 10:35:46 +10:00
  • ce28e71cd3 2 free ones for anyone that wants them Trilbyspaceclone 2019-08-26 17:08:48 -04:00
  • d43b4599ef I was bullied to reduce click delay. Tupinambis 2019-08-26 15:53:44 -05:00
  • 13638ed5d6 Reverts some changes I deemed unneccesary. Undoes a fuckup Tupinambis 2019-08-26 15:08:36 -05:00
  • 00c01709b2 moves banners into crafting TrilbySpaceClone 2019-08-26 15:46:41 -04:00
  • bd49187ea7 on second thought, let's not try to half ass fancy ideas. Poojawa 2019-08-26 14:45:36 -05:00
  • a4fd2be7f7 Various Shotgun Nerfs. Tupinambis 2019-08-26 14:45:12 -05:00
  • 74a24fdcc1 WHAT IN TARNATION Poojawa 2019-08-26 14:30:27 -05:00
  • 9558252b93 Revert/replaces a lot of #8024 with bleed_rate Poojawa 2019-08-26 14:22:17 -05:00
  • bdae9e051b Fixes some errant issues with overlays Poojawa 2019-08-26 14:15:55 -05:00
  • eca17ad435 pls Dap 2019-08-26 13:09:18 -06:00