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

Commit Graph

  • 3d8c41e143 Changes up the blood stunhand against hostile cultists DeltaFire 2019-11-16 15:49:21 +01:00
  • 5db494330c Merge pull request #2 from Citadel-Station-13/master Seris02 2019-11-16 19:52:02 +08:00
  • f09a98fc58 this time without reverting several PRs YakumoChen 2019-11-16 06:50:27 -05:00
  • fb2aa5267b minor sprite edit YakumoChen 2019-11-16 06:44:47 -05:00
  • b146fd14f3 actually adds the winter coats Seris02 2019-11-16 18:25:05 +08:00
  • d9b24b20d1 Merge pull request #9817 from Ghommie/Ghommie-cit357 kevinz000 2019-11-16 03:02:43 -07:00
  • 5c89447cf9 Update plushes.dm YakumoChen 2019-11-16 09:56:57 +00:00
  • 5586747747 adds marisa to plush.dmi YakumoChen 2019-11-16 04:46:52 -05:00
  • 3326564f86 Merge pull request #13 from Citadel-Station-13/master YakumoChen 2019-11-16 04:39:32 -05:00
  • 8db64df364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix Seris02 2019-11-16 16:54:27 +08:00
  • a85142053d Makes it refund threat too (wow, didn't even think about it!) Putnam 2019-11-16 00:43:44 -08:00
  • c9de03675e actually no i'm reworking this Putnam 2019-11-16 00:36:09 -08:00
  • ca2dab13fb Automatic changelog generation for PR #9813 [ci skip] CitadelStationBot 2019-11-16 02:25:01 -06:00
  • 21775ad3ee Merge pull request #9813 from Ghommie/Ghommie-cit355 kevinz000 2019-11-16 01:24:58 -07:00
  • 8f5d59ffd4 Automatic changelog generation for PR #9769 [ci skip] CitadelStationBot 2019-11-16 02:17:26 -06:00
  • 66f8b5f404 Merge pull request #9769 from Ghommie/Ghommie-cit336 kevinz000 2019-11-16 01:17:23 -07:00
  • e247d44aff less transparency on the RD coat please Seris02 2019-11-16 16:17:13 +08:00
  • 23f84cb7fb Automatic changelog generation for PR #9557 [ci skip] CitadelStationBot 2019-11-16 02:08:27 -06:00
  • 8ac6a56993 Merge pull request #9557 from Putnam3145/super-special-awesome-dynamic kevinz000 2019-11-16 01:08:25 -07:00
  • e0e3c510d4 adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats Seris02 2019-11-16 15:31:20 +08:00
  • c1dfa4227b ok this works and i don't know why GrayRachnid 2019-11-16 00:52:52 -05:00
  • 206f3df25c i hate dogborgs and pixel_x GrayRachnid 2019-11-16 00:41:55 -05:00
  • 57027661a9 Changes blood halberd to no longer hardstun hostile cult when thrown DeltaFire 2019-11-16 04:51:59 +01:00
  • 6aa6eaafe6 Merge branch 'master' into abductor-update Lin 2019-11-15 23:24:51 +00:00
  • d0580e8ecb Comments were awful. Ghommie 2019-11-15 23:32:46 +01:00
  • 7a1f3dcdba Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor. Ghommie 2019-11-15 23:14:28 +01:00
  • 3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. GrayRachnid 2019-11-15 16:58:45 -05:00
  • 978b675986 FUCK Ghommie 2019-11-15 20:12:54 +01:00
  • 78c967fa20 A Ghommie 2019-11-15 18:42:04 +01:00
  • 2b104a7698 Ports "Fixes MMIs not being able to use mecha equipment" Ghommie 2019-11-15 18:40:45 +01:00
  • 85b0cb37b8 Little typofix DeltaFire 2019-11-15 18:12:57 +01:00
  • d34ef11bac Some more changes to clock stuff DeltaFire 2019-11-15 18:01:42 +01:00
  • 4f06a25951 Made staff of change require/cost threat Putnam 2019-11-14 23:26:59 -08:00
  • f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic Putnam 2019-11-14 22:31:48 -08:00
  • 009c0b46d5 Added some more blocking rules (whoops) Putnam 2019-11-14 22:28:42 -08:00
  • e68ad13983 Reduced RNG a bit more Putnam 2019-11-14 22:24:43 -08:00
  • 57bd0f5fb8 Revert "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS" lolman360 2019-11-15 16:42:34 +11:00
  • bc6c617c27 DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS lolman360 2019-11-15 16:42:26 +11:00
  • b8c45ba6a1 Update donator.dm kevinz000 2019-11-14 18:26:50 -07:00
  • 0dcb2d3b9c Update config_entry.dm kevinz000 2019-11-14 18:25:52 -07:00
  • 3624f90c45 Update donator_groupings.dm kevinz000 2019-11-14 18:22:59 -07:00
  • e8938f52a7 Update donator.dm kevinz000 2019-11-14 18:22:21 -07:00
  • a3ad224e0f Update config_entry.dm kevinz000 2019-11-14 18:21:08 -07:00
  • c7a3652d0a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 Ghommie 2019-11-15 01:12:36 +01:00
  • c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 Ghommie 2019-11-15 01:10:39 +01:00
  • f401e622c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 Ghommie 2019-11-15 01:01:08 +01:00
  • 5bb6247a6d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349 Ghommie 2019-11-15 00:57:38 +01:00
  • 354433cc94 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit342 Ghommie 2019-11-15 00:49:52 +01:00
  • 90b02db98c Automatic changelog generation for PR #9723 [ci skip] CitadelStationBot 2019-11-14 17:46:56 -06:00
  • 746bbccb9c Merge pull request #9723 from Ghommie/Ghommie-cit321 kevinz000 2019-11-14 16:46:54 -07:00
  • 02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326 kevinz000 2019-11-14 16:45:09 -07:00
  • 81220b8c7c Automatic changelog generation for PR #9742 [ci skip] CitadelStationBot 2019-11-14 17:44:43 -06:00
  • d5a245945c Merge pull request #9742 from Seris02/gpsthing kevinz000 2019-11-14 16:44:40 -07:00
  • 178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330 kevinz000 2019-11-14 16:38:27 -07:00
  • 40523802f3 Merge pull request #9804 from Ghommie/Ghommie-cit351 kevinz000 2019-11-14 16:36:55 -07:00
  • 6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2019-11-15 00:36:50 +01:00
  • 2476cf853a Automatic changelog generation for PR #9803 [ci skip] CitadelStationBot 2019-11-14 17:36:21 -06:00
  • ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350 kevinz000 2019-11-14 16:36:19 -07:00
  • 364e267598 Automatic changelog generation for PR #9801 [ci skip] CitadelStationBot 2019-11-14 17:28:10 -06:00
  • 5b5e655b18 Merge pull request #9801 from Ghommie/Ghommie-cit348 kevinz000 2019-11-14 16:28:07 -07:00
  • a3d2a983b4 Automatic changelog generation for PR #9800 [ci skip] CitadelStationBot 2019-11-14 17:25:55 -06:00
  • cf1db8a396 Merge pull request #9800 from Trilbyspaceclone/changlog_messing_MKII kevinz000 2019-11-14 16:25:53 -07:00
  • db09bf5fb1 Automatic changelog generation for PR #9797 [ci skip] CitadelStationBot 2019-11-14 17:25:24 -06:00
  • d3822378dc Merge pull request #9797 from PersianXerxes/permaVR kevinz000 2019-11-14 16:25:22 -07:00
  • d6f540faf7 Merge pull request #9796 from Ghommie/Ghommie-cit347 kevinz000 2019-11-14 16:24:56 -07:00
  • bd650e53da Merge pull request #9795 from Ghommie/Ghommie-cit346 kevinz000 2019-11-14 16:24:36 -07:00
  • 57c9d90db2 Automatic changelog generation for PR #9790 [ci skip] CitadelStationBot 2019-11-14 17:24:13 -06:00
  • b670c94ca4 Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings kevinz000 2019-11-14 16:24:10 -07:00
  • 5f3413fc10 Automatic changelog generation for PR #9788 [ci skip] CitadelStationBot 2019-11-14 17:23:59 -06:00
  • c3250cecc3 Merge pull request #9788 from Seris02/hemitapered kevinz000 2019-11-14 16:23:56 -07:00
  • c8195a18f4 Automatic changelog generation for PR #9786 [ci skip] CitadelStationBot 2019-11-14 17:22:57 -06:00
  • 81303b1225 Merge pull request #9786 from Ghommie/Ghommie-cit345 kevinz000 2019-11-14 16:22:54 -07:00
  • 4f7a39aef5 Automatic changelog generation for PR #9785 [ci skip] CitadelStationBot 2019-11-14 17:22:31 -06:00
  • 178501f415 Merge pull request #9785 from Ghommie/Ghommie-cit344 kevinz000 2019-11-14 16:22:28 -07:00
  • 1ab8e9e0c9 Automatic changelog generation for PR #9783 [ci skip] CitadelStationBot 2019-11-14 17:22:11 -06:00
  • 8c247a566a Merge pull request #9783 from Ghommie/Ghommie-cit343 kevinz000 2019-11-14 16:22:08 -07:00
  • 8c0bee81e4 Automatic changelog generation for PR #9781 [ci skip] CitadelStationBot 2019-11-14 17:18:33 -06:00
  • 9b56aa0cae Merge pull request #9781 from Hatterhat/northstar-fast-intents kevinz000 2019-11-14 16:18:31 -07:00
  • 51dcb044e0 Automatic changelog generation for PR #9780 [ci skip] CitadelStationBot 2019-11-14 17:15:12 -06:00
  • b8f59abe34 Merge pull request #9780 from Hatterhat/fastredbutton kevinz000 2019-11-14 16:15:10 -07:00
  • 42356fb2c6 Automatic changelog generation for PR #9614 [ci skip] CitadelStationBot 2019-11-14 17:07:46 -06:00
  • 4ad56ac1e2 Merge pull request #9614 from Trilbyspaceclone/patch-234 kevinz000 2019-11-14 16:07:43 -07:00
  • f7d8be5989 Automatic changelog generation for PR #9628 [ci skip] CitadelStationBot 2019-11-14 17:00:49 -06:00
  • 4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII kevinz000 2019-11-14 16:00:45 -07:00
  • 04b9e3fe91 Automatic changelog generation for PR #9632 [ci skip] CitadelStationBot 2019-11-14 16:58:55 -06:00
  • 6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 kevinz000 2019-11-14 15:58:53 -07:00
  • 2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 kevinz000 2019-11-14 15:55:04 -07:00
  • d128be6c38 Automatic changelog generation for PR #9663 [ci skip] CitadelStationBot 2019-11-14 16:54:41 -06:00
  • 499afa6666 Merge pull request #9663 from Trilbyspaceclone/patch-235 kevinz000 2019-11-14 15:54:38 -07:00
  • 1996d080d5 Automatic changelog generation for PR #9666 [ci skip] CitadelStationBot 2019-11-14 16:54:16 -06:00
  • 47f01907f0 Merge pull request #9666 from Ghommie/Ghommie-cit296 kevinz000 2019-11-14 15:54:13 -07:00
  • 5097dbc94c Automatic changelog generation for PR #9680 [ci skip] CitadelStationBot 2019-11-14 16:53:10 -06:00
  • d15a1b0e6b Merge pull request #9680 from Owai-Seek/extendedbounties kevinz000 2019-11-14 15:53:07 -07:00
  • 649e5bfb94 Automatic changelog generation for PR #9683 [ci skip] CitadelStationBot 2019-11-14 16:52:13 -06:00
  • 318c03cc28 Merge pull request #9683 from Ghommie/Ghommie-cit303 kevinz000 2019-11-14 15:52:11 -07:00
  • 3cf1b09e0c Automatic changelog generation for PR #9688 [ci skip] CitadelStationBot 2019-11-14 16:51:22 -06:00
  • 8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306 kevinz000 2019-11-14 15:51:20 -07:00
  • a4e47df4bb Automatic changelog generation for PR #9689 [ci skip] CitadelStationBot 2019-11-14 16:50:54 -06:00
  • d8e89b235f Merge pull request #9689 from Ghommie/Ghommie-cit307 kevinz000 2019-11-14 15:50:52 -07:00
  • 09e5cd95a3 Merge pull request #9690 from Ghommie/Ghommie-cit308 kevinz000 2019-11-14 15:50:20 -07:00