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

Commit Graph

  • afb4bebf2d merge conflicts Seris02 2020-01-30 12:47:48 +08:00
  • beb90d39a6 polychromic winter coat Seris02 2020-01-30 12:44:40 +08:00
  • 1a439b8758 Update stun.dm kevinz000 2020-01-29 20:51:31 -07:00
  • 0612649eb7 Update stun.dm kevinz000 2020-01-29 20:50:06 -07:00
  • 55a0e4e55d Automatic changelog generation for PR #9860 [ci skip] CitadelStationBot 2020-01-29 21:15:26 -06:00
  • e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374 kevinz000 2020-01-29 20:15:22 -07:00
  • 1caa2af4cf Update weaponry.dm Ghom 2020-01-30 04:05:35 +01:00
  • 0316a15142 Automatic changelog generation for PR #10746 [ci skip] CitadelStationBot 2020-01-29 21:01:19 -06:00
  • c96267eb06 Merge pull request #10746 from Citadel-Station-13/kevinz000-patch-9 Ghom 2020-01-30 04:01:17 +01:00
  • 96e6e5903d Merge pull request #10783 from r4d6/fix Ghom 2020-01-30 04:00:07 +01:00
  • cd048ebd77 AAAAAAH r4d6 2020-01-29 21:50:55 -05:00
  • 05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 Ghommie 2020-01-30 03:42:50 +01:00
  • 793cc26ddc Update weaponry.dm Ghom 2020-01-30 03:28:47 +01:00
  • 096d9e01e1 Update weaponry.dm Ghom 2020-01-30 03:19:04 +01:00
  • b2ca380a13 Update weaponry.dm Ghom 2020-01-30 03:15:24 +01:00
  • 831fafb72b Update dueling.dm kevinz000 2020-01-29 19:06:11 -07:00
  • 562659b5b8 Update dueling.dm kevinz000 2020-01-29 19:00:11 -07:00
  • 58b969b8c6 Update RPD.dm r4d6 2020-01-29 20:34:57 -05:00
  • 0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. Ghommie 2020-01-30 02:17:02 +01:00
  • 9df12f94d4 Merge branch 'master' into one_last_taser_attempt kevinz000 2020-01-29 16:27:58 -07:00
  • 0e1c46150f Merge pull request #10767 from KeRSedChaplain/gangnerf kevinz000 2020-01-29 16:24:51 -07:00
  • c1b60db699 Automatic changelog generation for PR #10749 [ci skip] CitadelStationBot 2020-01-29 17:19:40 -06:00
  • f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley Ghom 2020-01-30 00:19:37 +01:00
  • 0f4e30c2db Update crayons.dm kevinz000 2020-01-29 16:13:29 -07:00
  • 27019974f8 Automatic changelog generation for PR #10773 [ci skip] CitadelStationBot 2020-01-29 16:51:04 -06:00
  • cff69db1c3 Merge pull request #10773 from Putnam3145/whoops-gaseous kevinz000 2020-01-29 15:51:01 -07:00
  • e3a3c8f241 woops kevinz000 2020-01-29 15:45:57 -07:00
  • 41a3dc64d5 what Hatterhat 2020-01-29 16:44:01 -06:00
  • cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534 Lin 2020-01-29 19:58:26 +00:00
  • 15f36fab60 Merge pull request #10763 from Citadel-Station-13/cosmosbedsheet Lin 2020-01-29 19:43:01 +00:00
  • 293e6576c8 Merge pull request #10564 from kevinz000/optimization_1 Lin 2020-01-29 19:25:13 +00:00
  • 319973f2eb Merge pull request #10775 from r4d6/fix Ghom 2020-01-29 19:01:57 +01:00
  • c57dedd808 fix r4d6 2020-01-29 12:30:05 -05:00
  • 1a40bec44b merge maybe fix Seris02 2020-01-29 18:45:21 +08:00
  • e6f8f478d7 prototype Seris02 2020-01-29 18:43:15 +08:00
  • b26d6c443f Update ticker.dm kevinz000 2020-01-29 02:23:54 -07:00
  • 7626750c49 hypno tweaks Putnam 2020-01-28 23:03:29 -08:00
  • 20e08d992f Removing unused vore files and commented out code. Ghommie 2020-01-29 06:38:09 +01:00
  • 4ca79e93a5 ? Ghommie 2020-01-29 06:29:17 +01:00
  • da90b67d07 Removes an unused file and outdated procs. Ghommie 2020-01-29 06:01:23 +01:00
  • 6553aa634f Automatic changelog generation for PR #10295 [ci skip] CitadelStationBot 2020-01-28 22:34:52 -06:00
  • 7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 Ghom 2020-01-29 05:34:49 +01:00
  • cbd1fd2a67 Automatic changelog generation for PR #10761 [ci skip] CitadelStationBot 2020-01-28 22:31:21 -06:00
  • dca1d8bcd3 Merge pull request #10761 from Putnam3145/fix-forced-gender Ghom 2020-01-29 05:31:18 +01:00
  • f9d6a9b9c4 Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc necromanceranne 2020-01-29 14:23:50 +11:00
  • 8e3830f4a1 Adds the pool to box(again) to fix a merge conflict- implements some feedback Detective Google 2020-01-28 21:22:17 -06:00
  • 31f24b8600 Automatic changelog generation for PR #10728 [ci skip] CitadelStationBot 2020-01-28 20:46:34 -06:00
  • bf97c2da3e Merge pull request #10728 from kevinz000/hugbox_meteor_time Ghom 2020-01-29 03:46:32 +01:00
  • cc2ce746d8 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l Detective Google 2020-01-28 20:19:55 -06:00
  • b61269c7e2 brings the map back to standard (so I can re-do it and make it not conflict) Detective Google 2020-01-28 20:06:15 -06:00
  • 44c141f009 Merge branch 'master' into hugbox_meteor_time Ghom 2020-01-29 02:28:12 +01:00
  • d358913bde linter is right, whoops Putnam 2020-01-28 17:26:32 -08:00
  • 754fb126f5 Automatic changelog generation for PR #10751 [ci skip] CitadelStationBot 2020-01-28 19:16:41 -06:00
  • 3671f58612 Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1 Ghom 2020-01-29 02:16:38 +01:00
  • 987e0e16e2 Automatic changelog generation for PR #10748 [ci skip] CitadelStationBot 2020-01-28 18:59:45 -06:00
  • 2643fd053b Merge pull request #10748 from Trilbyspaceclone/door- Ghom 2020-01-29 01:59:42 +01:00
  • cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-01-29 01:59:09 +01:00
  • d3343a1e26 Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-01-28 17:59:00 -07:00
  • c5fdc24e73 Merge pull request #10696 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-01-28 17:58:40 -07:00
  • b08503de70 Merge pull request #10699 from Putnam3145/no-newline-on-txts kevinz000 2020-01-28 17:58:23 -07:00
  • 3de59b75fa Merge pull request #10678 from Ghommie/Ghommie-cit516 kevinz000 2020-01-28 17:58:07 -07:00
  • 6d6c101044 Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7 Putnam3145 2020-01-28 16:57:50 -08:00
  • 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 kevinz000 2020-01-28 17:57:26 -07:00
  • a00d1fb05e Merge pull request #10729 from Citadel-Station-13/kevinz000-patch-5 Putnam3145 2020-01-28 16:56:50 -08:00
  • 3ed288dd14 Merge pull request #10750 from LetterN/patch-1 kevinz000 2020-01-28 17:56:21 -07:00
  • 540e76d118 Automatic changelog generation for PR #10754 [ci skip] CitadelStationBot 2020-01-28 18:56:14 -06:00
  • 96df844aa3 Merge pull request #10754 from MalricB/Virgomangood kevinz000 2020-01-28 17:56:11 -07:00
  • 194d26b044 Automatic changelog generation for PR #10753 [ci skip] CitadelStationBot 2020-01-28 18:55:52 -06:00
  • 70d4be0ea6 Merge pull request #10753 from Trilbyspaceclone/changlog_messing3 kevinz000 2020-01-28 17:55:49 -07:00
  • 3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3 kevinz000 2020-01-28 17:55:39 -07:00
  • 9dfcef68ed Merge branch 'master' into duke_moxley kevinz000 2020-01-28 17:53:08 -07:00
  • f430fbcbd6 doubles stutter kevinz000 2020-01-28 17:48:56 -07:00
  • 9cf02ac96f moth sounds kevinz000 2020-01-28 17:36:10 -07:00
  • a3ce2b06f6 tada TrilbySpaceClone 2020-01-28 16:09:49 -05:00
  • 92e355267f Revert "correct door to vault being all access" TrilbySpaceClone 2020-01-28 16:07:15 -05:00
  • 9c18d4fdad makes stimulants no longer purchasable by gangs KeRSe 2020-01-28 15:53:29 -05:00
  • ee9a302af0 Merge pull request #16 from Citadel-Station-13/master EmeraldSundisk 2020-01-28 09:23:19 -08:00
  • 94d1b7a035 Automatic changelog generation for PR #10414 [ci skip] CitadelStationBot 2020-01-28 11:12:33 -06:00
  • fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi Ghom 2020-01-28 18:12:30 +01:00
  • 678c0f0ff5 Automatic changelog generation for PR #10752 [ci skip] CitadelStationBot 2020-01-28 11:09:03 -06:00
  • fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass Ghom 2020-01-28 18:08:58 +01:00
  • 6b0dc5d438 Automatic changelog generation for PR #10590 [ci skip] CitadelStationBot 2020-01-28 10:58:47 -06:00
  • 7ff01ac152 Merge pull request #10590 from KathrinBailey/Kat'sBoxRework Ghom 2020-01-28 17:58:44 +01:00
  • f6d79e8846 Automatic changelog generation for PR #10765 [ci skip] CitadelStationBot 2020-01-28 05:01:36 -06:00
  • 8e0a674845 Merge pull request #10765 from Citadel-Station-13/kevinz000-patch-15 Putnam3145 2020-01-28 03:01:33 -08:00
  • a1a2d45be6 Update closets.dm kevinz000 2020-01-28 02:41:04 -07:00
  • 8bae366652 Automatic changelog generation for PR #10764 [ci skip] CitadelStationBot 2020-01-28 00:38:08 -06:00
  • b903c110d9 Merge pull request #10764 from deathride58/antinyoom kevinz000 2020-01-27 23:38:05 -07:00
  • 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-01-27 23:35:35 -07:00
  • 4c2b0a826a WEW LAD kevinz000 2020-01-27 23:26:24 -07:00
  • 6cc995a137 atom color kevinz000 2020-01-27 23:10:16 -07:00
  • 59e41c20bf changes kevinz000 2020-01-27 23:09:34 -07:00
  • 70970b78f4 forcemove kevinz000 2020-01-27 23:00:03 -07:00
  • feca294f48 tada Seris02 2020-01-28 13:56:37 +08:00
  • d89b8d95cf BRAINLETMOMENT kevinz000 2020-01-27 22:44:51 -07:00
  • 6eac97524f compile kevinz000 2020-01-27 22:42:48 -07:00
  • 8c0d8b694c missing bracket kevinz000 2020-01-27 22:39:16 -07:00
  • c76bf202a8 ladder climb kevinz000 2020-01-27 22:34:31 -07:00
  • 9867d7b377 -20% kevinz000 2020-01-27 22:28:28 -07:00
  • 3ce1fe2585 changes kevinz000 2020-01-27 22:26:43 -07:00