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

Commit Graph

  • ecc34b1de1 make vote last longer, too Putnam 2019-12-21 13:24:13 -08:00
  • d42ed1ca49 Added extended, deobfuscated, made "how many to vote" bigger Putnam 2019-12-21 12:52:35 -08:00
  • 0b63e79098 Merge branch 'master' into glassware Trilbyspaceclone 2019-12-21 15:41:45 -05:00
  • 84d99c8fe8 Fix indentation r4d6 2019-12-21 15:00:53 -05:00
  • 383e09651f Suggestions r4d6 2019-12-21 14:55:37 -05:00
  • 7c1bd7f8a7 how one = can make a difference Putnam 2019-12-21 11:34:41 -08:00
  • fac4c01d10 Automatic changelog generation for PR #9830 [ci skip] CitadelStationBot 2019-12-21 12:02:03 -06:00
  • 6b2fe333f4 Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture Ghom 2019-12-21 19:02:00 +01:00
  • c5f7046d36 Automatic changelog generation for PR #10190 [ci skip] CitadelStationBot 2019-12-21 11:34:37 -06:00
  • a33065a728 Merge pull request #10190 from Trilbyspaceclone/honeysoda Ghom 2019-12-21 18:34:35 +01:00
  • 8c5e506a17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382 Ghommie 2019-12-21 18:22:58 +01:00
  • e38396e984 Made vote not fire every tick, added "force" option that pops as soon as vote starts Putnam 2019-12-21 08:59:48 -08:00
  • 395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 Ghommie 2019-12-21 17:59:32 +01:00
  • 32ec9d6f50 i believe they call this a "weh" Putnam 2019-12-21 08:36:00 -08:00
  • d575b20e77 Added statbus support Putnam 2019-12-21 08:34:16 -08:00
  • 128b857d99 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers Putnam 2019-12-21 08:31:44 -08:00
  • a12b2c9954 Automatic changelog generation for PR #9950 [ci skip] CitadelStationBot 2019-12-21 10:26:07 -06:00
  • 2b2a3c2721 Merge pull request #9950 from Citadel-Station-13/marauder-nerf-1 Ghom 2019-12-21 17:26:04 +01:00
  • 7bf504247b should be mutually exclusive whoops Putnam 2019-12-21 08:21:15 -08:00
  • a30a13639a Automatic changelog generation for PR #10096 [ci skip] CitadelStationBot 2019-12-21 09:48:58 -06:00
  • 2bc401e2d2 Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123 Ghom 2019-12-21 16:48:56 +01:00
  • 2a76743747 I'm playing dirty because we have too many PRs to merge anyway. Ghom 2019-12-21 16:42:27 +01:00
  • 5c3d3f4cc5 Is merging someone else's PR you personally fixed considerable as self-merging? Ghom 2019-12-21 16:40:32 +01:00
  • daf099388e Unnecessary OOC note. Ghom 2019-12-21 16:37:28 +01:00
  • 4624a1739a typo Ghom 2019-12-21 16:30:02 +01:00
  • bb99be2504 Automatic changelog generation for PR #10257 [ci skip] CitadelStationBot 2019-12-21 08:33:30 -06:00
  • 9d00072072 Merge pull request #10257 from DeltaFire15/communication-magicnumbad Ghom 2019-12-21 15:33:27 +01:00
  • fa3584f5a6 git y u do dis Michiyamenotehifunana 2019-12-21 22:31:57 +08:00
  • 7396d19e69 Automatic changelog generation for PR #10120 [ci skip] CitadelStationBot 2019-12-21 08:30:35 -06:00
  • aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision Ghom 2019-12-21 15:30:32 +01:00
  • 6d41bfdab1 Automatic changelog generation for PR #10164 [ci skip] CitadelStationBot 2019-12-21 08:24:08 -06:00
  • a384b1782b Merge pull request #10164 from kappa-sama/martialartist Ghom 2019-12-21 15:24:06 +01:00
  • e06b2407b4 oh god please don't mess up Michiyamenotehifunana 2019-12-21 22:22:43 +08:00
  • 3920e6a38d Merge remote-tracking branch 'upstream/master' into polyshorts-for-digis Michiyamenotehifunana 2019-12-21 22:22:12 +08:00
  • 06cbb381d3 Better safe than sorry. Ghom 2019-12-21 15:17:29 +01:00
  • c5aef98252 Make things even more organized r4d6 2019-12-21 09:17:15 -05:00
  • 3738156340 Magic number baaad DeltaFire 2019-12-21 15:16:28 +01:00
  • fb078e18f9 QoL Update r4d6 2019-12-21 09:12:04 -05:00
  • 0b2568a9cf Modernizes Polychromic Uniform Code Michiyamenotehifunana 2019-12-21 21:38:04 +08:00
  • ce34bcf2e4 Merge pull request #10012 from Commandersand/INEEDAMEDICBAG Ghom 2019-12-21 14:34:43 +01:00
  • 7f0ae5dbde I gotta go fast. Ghom 2019-12-21 13:04:27 +01:00
  • f30be0ace6 Merge pull request #10077 from ForrestWick/uplinkchanges Ghom 2019-12-21 12:43:18 +01:00
  • 4cd4a795ea Begone crap. Ghom 2019-12-21 12:20:02 +01:00
  • 1d5c37e3cc Automatic changelog generation for PR #10141 [ci skip] CitadelStationBot 2019-12-21 04:45:47 -06:00
  • 3df8619980 Merge pull request #10141 from Putnam3145/dynamic-statbus Ghom 2019-12-21 11:45:44 +01:00
  • 7bc583e27e Automatic changelog generation for PR #10232 [ci skip] CitadelStationBot 2019-12-21 04:27:06 -06:00
  • 71d0c3e257 Merge pull request #10232 from DeltaFire15/cc-headmessages Ghom 2019-12-21 11:27:04 +01:00
  • c5a1774bdf Automatic changelog generation for PR #9940 [ci skip] CitadelStationBot 2019-12-21 04:20:27 -06:00
  • 848ad4b39b Merge pull request #9940 from Putnam3145/dynamic-roundstart-overhaul Ghom 2019-12-21 11:20:24 +01:00
  • 301aa72f4a Automatic changelog generation for PR #9596 [ci skip] CitadelStationBot 2019-12-21 04:15:32 -06:00
  • 19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update Ghom 2019-12-21 11:15:29 +01:00
  • 85fca5c560 Automatic changelog generation for PR #10059 [ci skip] CitadelStationBot 2019-12-21 04:05:39 -06:00
  • a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi Ghom 2019-12-21 11:05:36 +01:00
  • 01def96b3d Automatic changelog generation for PR #10058 [ci skip] CitadelStationBot 2019-12-21 00:20:52 -06:00
  • 97f678b542 Merge pull request #10058 from Ghommie/Ghommie-cit432 kevinz000 2019-12-20 23:20:49 -07:00
  • b490873f2a ff lolman360 2019-12-21 13:13:37 +11:00
  • 4c7cc3615e ff lolman360 2019-12-21 12:48:09 +11:00
  • 3043a4f8c9 ghom help lolman360 2019-12-21 12:47:36 +11:00
  • 7048e4e5ab hhh lolman360 2019-12-21 12:43:48 +11:00
  • b02ffa2e2d Update inhand_holder.dm lolman360 2019-12-21 12:40:41 +11:00
  • 758e66ac2d yeah alcohol intolerance Putnam 2019-12-20 16:46:38 -08:00
  • b10f6c8762 Hopefully fixes the broken Christmas clothes that no one knows how they broke? Unknown 2019-12-20 16:56:32 -07:00
  • efdded7e48 Remove extra indentations r4d6 2019-12-20 18:38:47 -05:00
  • bc70bc3882 Fix the nose boop. r4d6 2019-12-20 18:10:02 -05:00
  • ef360838da errors Putnam 2019-12-20 14:50:08 -08:00
  • c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs Putnam 2019-12-20 14:47:09 -08:00
  • 9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2019-12-20 23:40:21 +01:00
  • 353564811c Automatic changelog generation for PR #10200 [ci skip] CitadelStationBot 2019-12-20 15:55:25 -06:00
  • a398b7c413 Merge pull request #10200 from Citadel-Station-13/kevinz000-patch-125 Ghom 2019-12-20 22:55:22 +01:00
  • ce0e1734fc Automatic changelog generation for PR #10235 [ci skip] CitadelStationBot 2019-12-20 09:27:49 -06:00
  • 9a38612ec4 Merge pull request #10235 from Citadel-Station-13/kevinz000-patch-128 Ghom 2019-12-20 16:27:47 +01:00
  • 7be6112411 Automatic changelog generation for PR #10231 [ci skip] CitadelStationBot 2019-12-20 09:18:09 -06:00
  • 6673646813 Merge pull request #10231 from Seris02/wintercoatcolors Ghom 2019-12-20 16:18:06 +01:00
  • 685425ed55 Atomises out the magicnumber change DeltaFire 2019-12-20 15:26:16 +01:00
  • 4016835b0a Merge pull request #9798 from Citadel-Station-13/kevinz000-patch-114 Ghom 2019-12-20 14:32:42 +01:00
  • a62610780e Automatic changelog generation for PR #9563 [ci skip] CitadelStationBot 2019-12-20 07:28:24 -06:00
  • b581f97fba Merge pull request #9563 from Thalpy/Superbases-goodbye Ghom 2019-12-20 14:28:21 +01:00
  • d33feb6c35 Merge pull request #9888 from Citadel-Station-13/kevinz000-patch-116 Ghom 2019-12-20 14:26:50 +01:00
  • fd9c836509 Automatic changelog generation for PR #9925 [ci skip] CitadelStationBot 2019-12-20 07:26:27 -06:00
  • f56684a473 Merge pull request #9925 from Linzolle/cosmic-brain Ghom 2019-12-20 14:26:24 +01:00
  • 152f95bbdf Automatic changelog generation for PR #10051 [ci skip] CitadelStationBot 2019-12-20 07:25:13 -06:00
  • 6d824c99cf Merge pull request #10051 from kappa-sama/patch-9 Ghom 2019-12-20 14:25:09 +01:00
  • 5cb9dd71ad Automatic changelog generation for PR #10142 [ci skip] CitadelStationBot 2019-12-20 06:36:06 -06:00
  • d52a469933 Merge pull request #10142 from Trilbyspaceclone/patch-244 Ghom 2019-12-20 13:36:02 +01:00
  • 906a59503f Automatic changelog generation for PR #10126 [ci skip] CitadelStationBot 2019-12-20 06:34:50 -06:00
  • e526f26f46 Merge pull request #10126 from Putnam3145/he-tweaks Ghom 2019-12-20 13:34:47 +01:00
  • d28811fe89 Automatic changelog generation for PR #10054 [ci skip] CitadelStationBot 2019-12-20 06:27:50 -06:00
  • 1748a5ee4b Merge pull request #10054 from kappa-sama/patch-10 Ghom 2019-12-20 13:27:35 +01:00
  • 9567d53007 I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive? Ghom 2019-12-20 13:24:48 +01:00
  • fa11979355 Automatic changelog generation for PR #10193 [ci skip] CitadelStationBot 2019-12-20 06:15:57 -06:00
  • 481371bca7 Merge pull request #10193 from Commandersand/yeet Ghom 2019-12-20 13:15:54 +01:00
  • 832d58a071 Adds a hacky framework for digitigrade polyclothes Michiyamenotehifunana 2019-12-20 19:44:22 +08:00
  • 61ab3685f1 atmos firelock, changes to temp blocking Seris02 2019-12-20 14:14:01 +08:00
  • 6188ec034d h lolman360 2019-12-20 16:10:13 +11:00
  • 445a7fb855 Redo my changes on Box r4d6 2019-12-19 23:57:49 -05:00
  • 61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 r4d6 2019-12-19 23:51:14 -05:00
  • 0feb54bf70 Update mob.dm kevinz000 2019-12-19 17:54:01 -07:00
  • 2f78c0a5db Update mob.dm kevinz000 2019-12-19 17:51:23 -07:00
  • 4d466e17f3 Merge pull request #10173 from Ghommie/Ghommie-cit461 Lin 2019-12-19 23:43:16 +00:00
  • 702aff08c4 Automatic changelog generation for PR #10214 [ci skip] CitadelStationBot 2019-12-19 17:42:09 -06:00