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

Commit Graph

  • 13a1eb5742 Fixes swarmers breaking the SM's containment CitadelStationBot 2017-09-07 05:17:51 -05:00
  • 7fb4426011 Fixes swarmers breaking the SM's containment (#30426) ShizCalev 2017-09-07 06:16:48 -04:00
  • d8a3b87719 Fixes brains counting towards highlander killstreaks ShizCalev 2017-09-07 06:14:17 -04:00
  • d5151ed918 fixes deathride58 2017-09-07 01:01:23 -04:00
  • f7ed0b2165 CERESTATION DOES NOT EXIST, COMRADE. (#2618) CitadelStationBot 2017-09-06 23:40:17 -05:00
  • d73b82cf11 Gets rid of manual overlay manipulation tortellinitony 2017-09-07 00:38:24 -04:00
  • a972a6272f chef objective deathride58 2017-09-06 22:54:51 -04:00
  • 5829f56727 Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176 LetterJay 2017-09-06 21:31:28 -05:00
  • 68a6ff5cfb just,,, compile, please deathride58 2017-09-06 22:24:10 -04:00
  • 3c1bce5c21 Update merge-upstream-pull-request.sh LetterJay 2017-09-06 21:20:29 -05:00
  • 749bb70d72 Allows atmos techs to download the SM monitor CitadelStationBot 2017-09-06 21:00:25 -05:00
  • 4282d82e33 Allows atmos techs to download the SM monitor (#30458) ShizCalev 2017-09-06 21:59:22 -04:00
  • d2363394d0 Adds CE power tool sprites for the toolbelt CitadelStationBot 2017-09-06 20:59:17 -05:00
  • 4099a17c52 Adds CE power tool sprites for the toolbelt (#30456) Ashe Higgs 2017-09-06 21:59:05 -04:00
  • 7f07205de3 Alters the pressure plate crafting recipe CitadelStationBot 2017-09-06 20:35:50 -05:00
  • ee41b3da6f Alters the pressure plate crafting recipe (#30452) Anonmare 2017-09-07 02:35:50 +01:00
  • 382b25fb5b Automatic changelog generation for PR #2631 [ci skip] CitadelStationBot 2017-09-06 20:18:29 -05:00
  • 3efa1d6134 Merge pull request #2631 from Citadel-Station-13/upstream-merge-30416 LetterJay 2017-09-06 20:18:27 -05:00
  • fec0c13ff1 Merge pull request #2630 from Citadel-Station-13/upstream-merge-30418 LetterJay 2017-09-06 20:18:05 -05:00
  • 6078f653cb Merge pull request #2627 from Citadel-Station-13/upstream-merge-30445 LetterJay 2017-09-06 20:17:24 -05:00
  • ac84046180 Merge pull request #2626 from Citadel-Station-13/upstream-merge-30438 LetterJay 2017-09-06 20:17:10 -05:00
  • 15ab156b86 moves crew objectives into separate files deathride58 2017-09-06 21:04:45 -04:00
  • fb0fd1ca10 adds comma deathride58 2017-09-06 20:52:28 -04:00
  • 16669efe4a thERE WE GO deathride58 2017-09-06 20:39:49 -04:00
  • fe4839db72 compile dammit deathride58 2017-09-06 20:30:12 -04:00
  • 19628a2d9f hnnnnnnnnngh deathride58 2017-09-06 20:23:19 -04:00
  • 57679f0514 Large bun hair substitution (#2629) CitadelStationBot 2017-09-06 19:16:25 -05:00
  • 2a6140dcea Adds "shiny" variants of lavaland mobs CitadelStationBot 2017-09-06 19:15:26 -05:00
  • dcd0fa67f0 Adds "shiny" variants of lavaland mobs (#30416) Ashe Higgs 2017-09-06 20:14:55 -04:00
  • 879eb6e448 more objectives, hopefully fixes compiling errors deathride58 2017-09-06 20:04:19 -04:00
  • 2b1b00e45d Cleans up more paper fluff varedits. CitadelStationBot 2017-09-06 18:42:43 -05:00
  • 849deb5e4e Cleans up more paper fluff varedits. (#30418) ShizCalev 2017-09-06 19:41:46 -04:00
  • 3f71fdcb4e Merge pull request #2628 from Citadel-Station-13/mirrorRebase LetterJay 2017-09-06 18:00:50 -05:00
  • 5e25464e1a sweet jesus im absolutely horrid at this deathride58 2017-09-06 18:56:59 -04:00
  • 2f3f56352c Merge branch 'master' into upstream-merge-30176 LetterJay 2017-09-06 17:43:07 -05:00
  • 9265694418 Update _compile_options.dm LetterJay 2017-09-06 17:41:02 -05:00
  • f9ef2bb068 commit LetterJay 2017-09-06 17:36:32 -05:00
  • 8ef2b39d44 adds clown slip objective deathride58 2017-09-06 18:34:05 -04:00
  • 188966c14a Remove unused nightvision var CitadelStationBot 2017-09-06 17:32:57 -05:00
  • cb51ffca31 Remove unused nightvision var (#30445) pubby 2017-09-06 14:08:07 -05:00
  • 17db844180 another mirror rebase for the PRMirror being down LetterJay 2017-09-06 17:32:49 -05:00
  • 5f3c0ccc30 Converts map_config.dm to tabs CitadelStationBot 2017-09-06 17:32:45 -05:00
  • b028ef41cd Merge pull request #30438 from Cyberboss/FixSpaces KorPhaeron 2017-09-06 14:08:57 -05:00
  • 0b04dd5211 no harmful viruses objective for virologists deathride58 2017-09-06 17:50:41 -04:00
  • f52fa8e2e9 it's probably a better idea to do this while sober deathride58 2017-09-06 17:18:45 -04:00
  • 98e30a70a7 adds druglorg objective to botanist deathride58 2017-09-06 17:12:12 -04:00
  • 44729f3944 ya shittin me right now? deathride58 2017-09-06 16:55:31 -04:00
  • 49152d4bdb Bluh deathride58 2017-09-06 16:46:28 -04:00
  • 4bcb9f1629 druglord objective + fixes deathride58 2017-09-06 16:34:38 -04:00
  • bbab9d8d5a donation LetterJay 2017-09-06 14:41:35 -05:00
  • 1753a4509a there we go. compiling errors fixed. deathride58 2017-09-06 14:51:28 -04:00
  • be5013c2a0 aaaAAAUUGH deathride58 2017-09-06 14:37:59 -04:00
  • 367c6c8ada im bad at this coding thing deathride58 2017-09-06 14:37:01 -04:00
  • 02cc0b2db1 should fix compiling errors deathride58 2017-09-06 14:19:25 -04:00
  • 94354c3dd6 more janitor adjustments deathride58 2017-09-06 14:14:18 -04:00
  • d996b7ab75 adds "kill bubblegum" objective for shaft miners deathride58 2017-09-06 13:35:56 -04:00
  • c9a340de27 fixes janitor objective, tones down other objectives deathride58 2017-09-06 13:18:39 -04:00
  • 8a723c664b OOOOGGG Poojawa 2017-09-06 11:21:29 -05:00
  • a16ba4e4cd Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953 LetterJay 2017-09-06 10:11:16 -05:00
  • 4ed411d353 Merge pull request #2462 from Citadel-Station-13/upstream-merge-30079 LetterJay 2017-09-06 10:11:08 -05:00
  • 3104d36330 Automatic changelog generation for PR #2440 [ci skip] CitadelStationBot 2017-09-06 10:11:00 -05:00
  • d4f018952e Merge pull request #2440 from Citadel-Station-13/upstream-merge-29866 LetterJay 2017-09-06 10:10:58 -05:00
  • 82f36f0d28 Delete client_procs.dm.rej LetterJay 2017-09-06 09:27:57 -05:00
  • ce1e5c69dc Delete blackbox.dm.rej LetterJay 2017-09-06 09:27:55 -05:00
  • 9436f8d839 Delete database_changelog.txt.rej LetterJay 2017-09-06 09:27:53 -05:00
  • b07ebeed57 Merge pull request #2480 from Citadel-Station-13/upstream-merge-30140 LetterJay 2017-09-06 09:26:12 -05:00
  • 24a7aa5a9f Merge branch 'master' into upstream-merge-30079 LetterJay 2017-09-06 09:24:23 -05:00
  • b2d7ee0e51 Merge pull request #2537 from Citadel-Station-13/upstream-merge-30248 LetterJay 2017-09-06 09:23:02 -05:00
  • ea10c4402e Merge pull request #2443 from Citadel-Station-13/upstream-merge-30027 LetterJay 2017-09-06 09:22:44 -05:00
  • 00199af27d Merge branch 'master' into upstream-merge-29866 LetterJay 2017-09-06 09:21:53 -05:00
  • 72a8f7aa54 Merge branch 'master' into upstream-merge-29953 LetterJay 2017-09-06 09:17:57 -05:00
  • 31f7b42935 Delete database_changelog.txt.rej LetterJay 2017-09-06 09:17:02 -05:00
  • cf46abecb3 Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004 LetterJay 2017-09-06 09:15:11 -05:00
  • 27ae29664b Merge pull request #2444 from Citadel-Station-13/upstream-merge-30035 LetterJay 2017-09-06 09:09:59 -05:00
  • edb8177a81 Merge branch 'master' into upstream-merge-30035 LetterJay 2017-09-06 09:09:52 -05:00
  • 2086ba6895 Delete database_changelog.txt.rej LetterJay 2017-09-06 09:09:20 -05:00
  • e7c62f9759 Update database_changelog.txt.rej LetterJay 2017-09-06 09:09:08 -05:00
  • b6f6970ebb Update disease.dm LetterJay 2017-09-06 09:06:59 -05:00
  • 1f872675b0 Update disease.dm LetterJay 2017-09-06 09:06:30 -05:00
  • f5e8e06041 Update dogborgstuff.dm LetterJay 2017-09-06 09:04:33 -05:00
  • 2d469c62ef Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve LetterJay 2017-09-06 08:59:20 -05:00
  • 76f8b02ee6 Automatic changelog generation for PR #2623 [ci skip] CitadelStationBot 2017-09-06 07:54:25 -05:00
  • 3ba2f650dd Adds Paradise Sofas (#2623) Poojawa 2017-09-06 07:54:23 -05:00
  • ff4f4c63d5 Automatic changelog generation for PR #2625 [ci skip] CitadelStationBot 2017-09-06 07:06:48 -05:00
  • 0a97730ded Disables oldstation.dmm (#2625) Raeschen 2017-09-06 13:06:46 +01:00
  • 1be71b61dc It's a good version (#2621) Poojawa 2017-09-06 07:05:51 -05:00
  • e13ff54c44 disables Pubby from rotation (#2624) Poojawa 2017-09-06 07:05:16 -05:00
  • 146d11dfad nerfs bad rng deathride58 2017-09-06 02:06:36 -04:00
  • 855455a6ca nerfs runtimes, buffs memory retention deathride58 2017-09-05 22:27:27 -04:00
  • fc95b9594c Re-disables sabresune, because wew Poojawa 2017-09-05 21:23:15 -05:00
  • c1d1cc5cb1 gramatically correct spaghetti code deathride58 2017-09-05 21:56:59 -04:00
  • dda6e59817 I haven't had a breath of fresh air for two days now deathride58 2017-09-05 21:49:00 -04:00
  • a5b335885f janitor cleaning objective deathride58 2017-09-05 21:41:11 -04:00
  • 4c6585de7a Update merge-upstream-pull-request.sh LetterJay 2017-09-05 20:11:43 -05:00
  • dd0f5506cf updates error text deathride58 2017-09-05 20:08:19 -04:00
  • 830eef1207 ... theres a var for that deathride58 2017-09-05 20:00:26 -04:00
  • a196eccb26 should fix responsibility objective. hopefully deathride58 2017-09-05 19:21:29 -04:00
  • 71ae573260 patches ANOTHER runtime. jesus im bad at this deathride58 2017-09-05 18:03:34 -04:00
  • ef79e47884 Update merge-upstream-pull-request.sh LetterJay 2017-09-05 17:00:16 -05:00
  • 60e9682ce2 I'm blind deathride58 2017-09-05 17:50:20 -04:00