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

Commit Graph

  • ff10b70ffe 2cat heating up YakumoChen 2020-02-24 10:20:47 +00:00
  • 495db5f09f OH GOD CATSPLOSIONN YakumoChen 2020-02-24 05:18:36 -05:00
  • b7fd779f18 OH GOD CATSPLOSION YakumoChen 2020-02-24 04:59:52 -05:00
  • 7a759f68aa Merge pull request #24 from YakumoChen/master YakumoChen 2020-02-24 04:58:07 -05:00
  • 8733585adb Merge pull request #23 from Citadel-Station-13/master YakumoChen 2020-02-24 04:56:57 -05:00
  • 96bf8d6969 Update tails.dm YakumoChen 2020-02-24 09:55:39 +00:00
  • c4e9472b85 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into nomoreailipreading Seris02 2020-02-24 17:48:58 +08:00
  • cbdb12e110 yes Seris02 2020-02-24 17:47:29 +08:00
  • 6b43ca03da Automatic changelog generation for PR #11201 [ci skip] CitadelStationBot 2020-02-24 03:33:56 -06:00
  • 8cf41997f5 Merge pull request #11201 from Hatterhat/bows kevinz000 2020-02-24 02:33:54 -07:00
  • f23f347d99 More minor fixes, TODO: sleepers white screen, chem master can't make containers Persi 2020-02-24 04:33:37 -05:00
  • 0cfa6699b1 yeah ok fine kevinz000 2020-02-24 02:31:14 -07:00
  • 43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic kevinz000 2020-02-24 02:30:36 -07:00
  • 0caed52ca5 removes the epic and cool access and makes it less epic and more cool Detective-Google 2020-02-24 03:28:33 -06:00
  • fc3ca40b06 Automatic changelog generation for PR #11216 [ci skip] CitadelStationBot 2020-02-24 03:27:29 -06:00
  • 3e77952652 Merge pull request #11216 from Putnam3145/rename-logging kevinz000 2020-02-24 02:27:27 -07:00
  • 14565025fa Automatic changelog generation for PR #11183 [ci skip] CitadelStationBot 2020-02-24 03:27:08 -06:00
  • 59074d1174 Merge pull request #11183 from Trilbyspaceclone/patch-291 kevinz000 2020-02-24 02:27:05 -07:00
  • 9a9558f95f Automatic changelog generation for PR #11188 [ci skip] CitadelStationBot 2020-02-24 03:24:22 -06:00
  • 6dcbf4df6f Merge pull request #11188 from Trilbyspaceclone/more_sweets kevinz000 2020-02-24 02:24:19 -07:00
  • 1c8afe1a5b Automatic changelog generation for PR #11185 [ci skip] CitadelStationBot 2020-02-24 03:24:08 -06:00
  • 4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N kevinz000 2020-02-24 02:24:06 -07:00
  • 592c3fb843 Automatic changelog generation for PR #11184 [ci skip] CitadelStationBot 2020-02-24 03:23:47 -06:00
  • 493d62c17e Merge pull request #11184 from Trilbyspaceclone/patch-292 kevinz000 2020-02-24 02:23:45 -07:00
  • f7d8f8f59b Automatic changelog generation for PR #11214 [ci skip] CitadelStationBot 2020-02-24 03:23:32 -06:00
  • ae6c388510 Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3 kevinz000 2020-02-24 02:23:30 -07:00
  • 76542208a6 Automatic changelog generation for PR #11199 [ci skip] CitadelStationBot 2020-02-24 03:23:20 -06:00
  • 73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png kevinz000 2020-02-24 02:23:17 -07:00
  • e76eff6966 Update plushes.dm kevinz000 2020-02-24 02:21:51 -07:00
  • cadfdc52d6 Minor fixes to TGUI Next Chem Master Persi 2020-02-24 04:15:06 -05:00
  • 424eb48d9e fixes kevinz000 2020-02-24 01:59:45 -07:00
  • 51c0f500ef Adds four TGUI Next UIs Persi 2020-02-24 03:52:10 -05:00
  • 27b7cd560c Update plushes.dm kevinz000 2020-02-24 01:32:04 -07:00
  • f7e0eb43f8 Adds rename logging Putnam 2020-02-23 22:53:20 -08:00
  • ca6341aac4 Merge branch 'master' into SpaceRuins BlackMajor 2020-02-24 19:47:52 +13:00
  • 687e0aaa75 Merge pull request #31 from Citadel-Station-13/master BlackMajor 2020-02-24 19:46:45 +13:00
  • 19ae30ea5b alright ghom i hope this works Hatterhat 2020-02-23 21:20:57 -06:00
  • 5037f28eaf Automatic changelog generation for PR #11162 [ci skip] CitadelStationBot 2020-02-23 15:48:10 -06:00
  • 565fa77cf9 Merge pull request #11162 from Hatterhat/quickpatch-enzyme Ghom 2020-02-23 22:48:07 +01:00
  • 6dce641061 Automatic changelog generation for PR #11187 [ci skip] CitadelStationBot 2020-02-23 15:47:39 -06:00
  • f5dbb0b20d Merge pull request #11187 from Trilbyspaceclone/sweet Ghom 2020-02-23 22:47:37 +01:00
  • 3e232f93d9 Update barsigns.dm Ghom 2020-02-23 22:47:21 +01:00
  • 825beb41c1 Update paicard.dm Ghom 2020-02-23 22:44:38 +01:00
  • 4c03d552ee Gettin Salty. Fish is now Seafood. Winter Flare 2020-02-23 16:22:19 -05:00
  • 112c203216 Merge pull request #11213 from Hatterhat/combifans Ghom 2020-02-23 21:35:15 +01:00
  • b3149d930f Fixing pAI radios inability to be toggled on/off Ghom 2020-02-23 21:31:53 +01:00
  • 31a93d9f32 you'd think i'd have remembered to change paths Hatterhat 2020-02-23 14:27:40 -06:00
  • 12ea22fdbf Fix r4d6 2020-02-23 14:52:12 -05:00
  • 094b92e58b silk, time, rods Hatterhat 2020-02-23 13:12:25 -06:00
  • ae42db8674 Merge pull request #11210 from Ghommie/Ghommie-cit588 kevinz000 2020-02-23 06:02:13 -07:00
  • 485241a361 cleanup detail Ghom 2020-02-23 13:32:46 +01:00
  • 9085c9865b Automatic changelog generation for PR #11206 [ci skip] CitadelStationBot 2020-02-23 06:30:25 -06:00
  • 2075147ee9 Merge pull request #11206 from Trilbyspaceclone/patch-294 Ghom 2020-02-23 13:30:23 +01:00
  • 0d67e81ad5 Yo. Ghommie 2020-02-23 13:18:16 +01:00
  • 2b740f9bad [s] Fixing an issue with slot machines crashing the server. Ghommie 2020-02-23 13:09:21 +01:00
  • fd5051361e Automatic changelog generation for PR #11207 [ci skip] CitadelStationBot 2020-02-23 05:37:20 -06:00
  • b4bca3663c Merge pull request #11207 from Trilbyspaceclone/patch-295 Ghom 2020-02-23 12:37:17 +01:00
  • 4c21d71301 Okay, now this should fix it? Persi 2020-02-23 02:34:29 -05:00
  • 4af2eee9dd Haha, okay... this will break Kilo Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo Persi 2020-02-23 02:28:18 -05:00
  • 501019ef75 idk what else to do at this point... Persi 2020-02-23 02:24:27 -05:00
  • 1dbf2023e7 Maybe I should remember to rename the areas after pasting them in Persi 2020-02-23 02:19:46 -05:00
  • f15540c473 Should fix the merge conflict from the pool having its own area Persi 2020-02-23 01:56:31 -05:00
  • 845e719ade But what if we did it right? TrilbySpaceClone 2020-02-23 01:52:36 -05:00
  • 2dea3cf15c Gives ash sandstone Trilbyspaceclone 2020-02-23 00:53:42 -05:00
  • 342f1cd4c1 Update snacks_meat.dm Trilbyspaceclone 2020-02-22 23:17:30 -05:00
  • ba81184fef Merge branch 'master' into quickpatch-enzyme Hatterhat 2020-02-22 18:06:17 -06:00
  • 2cd8adf4da Update medical_designs.dm Trilbyspaceclone 2020-02-22 19:06:11 -05:00
  • 60b4c10215 Fish Category, Misc Moves Winter Flare 2020-02-22 19:02:43 -05:00
  • cf8b41723d Update medical_designs.dm Trilbyspaceclone 2020-02-22 18:35:40 -05:00
  • c638a83e23 Merge branch 'master' into more_implants TrilbySpaceClone 2020-02-22 18:34:02 -05:00
  • becdd3c4c1 Merge branch 'master' into more_crates+bags Trilbyspaceclone 2020-02-22 18:33:26 -05:00
  • 511692a7cb Update medical_designs.dm Trilbyspaceclone 2020-02-22 18:30:32 -05:00
  • aeacb06dfc charrrries TrilbySpaceClone 2020-02-22 18:21:47 -05:00
  • 27655cd760 Merge branch 'master' into more_sweets TrilbySpaceClone 2020-02-22 18:20:39 -05:00
  • 18bfde5a0a Update augments_arms.dm Trilbyspaceclone 2020-02-22 17:58:50 -05:00
  • 3fd93a3bad Update shields.dm Trilbyspaceclone 2020-02-22 17:57:36 -05:00
  • a4d1bb0995 Update kitchen.dm Trilbyspaceclone 2020-02-22 17:56:31 -05:00
  • 6a8c874779 Three new posters! TrilbySpaceClone 2020-02-22 17:38:25 -05:00
  • b89a2314a2 mmm that's compiling i don't like that Hatterhat 2020-02-22 16:17:51 -06:00
  • 214cd92fef Automatic changelog generation for PR #11179 [ci skip] CitadelStationBot 2020-02-22 15:49:11 -06:00
  • 0c558f53d9 Merge pull request #11179 from Trilbyspaceclone/patch-290 Ghom 2020-02-22 22:49:08 +01:00
  • 99475488d3 mistake Hatterhat 2020-02-22 15:45:06 -06:00
  • accc4ce776 grammar shit, silkstring buff, arrow costs, yikes Hatterhat 2020-02-22 15:33:07 -06:00
  • 9e37f30aed Automatic changelog generation for PR #11182 [ci skip] CitadelStationBot 2020-02-22 15:30:36 -06:00
  • 211be93718 Merge pull request #11182 from Trilbyspaceclone/doner_begone! Ghom 2020-02-22 22:30:34 +01:00
  • 8dbf2b9a7d Automatic changelog generation for PR #11191 [ci skip] CitadelStationBot 2020-02-22 15:24:22 -06:00
  • 520f5eab83 Merge pull request #11191 from YakumoChen/beelord Ghom 2020-02-22 22:24:20 +01:00
  • 75a5a6cd45 ellipses. dot dot dot. Hatterhat 2020-02-22 15:21:12 -06:00
  • 2d29b37ce9 slab spawns and grammar shidd Hatterhat 2020-02-22 15:14:09 -06:00
  • 0cd936e33e bowstrings Hatterhat 2020-02-22 15:02:07 -06:00
  • 061548240a why were the colors reversed Hatterhat 2020-02-22 14:50:40 -06:00
  • e1ec2497b1 Automatic changelog generation for PR #11172 [ci skip] CitadelStationBot 2020-02-22 08:53:30 -06:00
  • 6f181365c2 Merge pull request #11172 from Trilbyspaceclone/bows! Ghom 2020-02-22 15:53:27 +01:00
  • 2e5a829e6c Automatic changelog generation for PR #11186 [ci skip] CitadelStationBot 2020-02-22 08:10:01 -06:00
  • b7fab93209 Merge pull request #11186 from Putnam3145/fixed-flavor Ghom 2020-02-22 15:09:58 +01:00
  • 59acbe0125 yee Seris02 2020-02-22 20:45:16 +08:00
  • 9028169caf fixed? Seris02 2020-02-22 20:16:40 +08:00
  • 68f15e16e7 fixed Seris02 2020-02-22 20:06:35 +08:00
  • c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics Seris02 2020-02-22 19:54:10 +08:00
  • 88ae429720 runtime fix Seris02 2020-02-22 19:45:57 +08:00