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

Commit Graph

  • 6d28c27f36 aoaoaoaooaoa Hatterhat 2021-02-17 23:24:44 -06:00
  • bf61249fcd new pain sounds dzahlus 2021-02-18 04:38:02 +01:00
  • 8c96ccb3ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Citadel-Station-13-master dzahlus 2021-02-18 04:26:43 +01:00
  • 7f96ac2847 Automatic changelog compile [ci skip] Changelogs 2021-02-18 00:13:49 +00:00
  • a07b588c9f Automatic changelog generation for PR #14239 [ci skip] CitadelStationBot 2021-02-17 17:29:06 -06:00
  • 3b9f1cb4ec Merge pull request #14239 from Hatterhat/golem-gps-pass2 Lin 2021-02-17 17:29:03 -06:00
  • e5e66be6b3 Automatic changelog generation for PR #14248 [ci skip] CitadelStationBot 2021-02-17 17:28:05 -06:00
  • 460042bc33 Merge pull request #14248 from shellspeed1/trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs Lin 2021-02-17 17:28:03 -06:00
  • a6919de075 Automatic changelog generation for PR #14252 [ci skip] CitadelStationBot 2021-02-17 16:57:04 -06:00
  • a27e4ba9e9 Merge pull request #14252 from silicons/pet_peeve Lin 2021-02-17 16:57:01 -06:00
  • 6558ace359 Automatic changelog generation for PR #14255 [ci skip] CitadelStationBot 2021-02-17 14:24:10 -06:00
  • 2b67893ed1 Merge pull request #14255 from LetterN/patch-4 Lin 2021-02-17 14:24:06 -06:00
  • 96d80901e4 Update PDA.dm Timothy Teakettle 2021-02-17 17:26:45 +00:00
  • 2ec2f55eb7 updates fork Dan-Neposh 2021-02-17 12:01:26 -05:00
  • 2265dcd792 Merge remote-tracking branch 'origin/master' Dan-Neposh 2021-02-17 11:40:53 -05:00
  • aeabfcc837 Merge pull request #20 from Citadel-Station-13/master Heretical Lizard 2021-02-17 12:09:54 -05:00
  • fecf879b0c Fixed SmArtKar 2021-02-17 18:54:59 +03:00
  • 756be084bc Decks are saveable! SmArtKar 2021-02-17 18:50:23 +03:00
  • ace2512812 solves run linter errors Dan-Neposh 2021-02-17 10:19:52 -05:00
  • 3fe46423a8 Automatic changelog generation for PR #14254 [ci skip] CitadelStationBot 2021-02-17 09:21:44 -06:00
  • d1a6fa972f Merge pull request #14254 from BlueWildrose/holodick Putnam3145 2021-02-17 07:21:41 -08:00
  • 015bd0b145 reeee SmArtKar 2021-02-17 17:16:52 +03:00
  • eae7e36b95 E SmArtKar 2021-02-17 17:16:33 +03:00
  • 0b3b1cef7a Small QoL changes to TCG SmArtKar 2021-02-17 17:07:15 +03:00
  • be15f67dee Automatic changelog generation for PR #14236 [ci skip] CitadelStationBot 2021-02-17 07:35:30 -06:00
  • 74e6f9198b Merge pull request #14236 from dzahlus/toxic-objective-removal Putnam3145 2021-02-17 05:35:27 -08:00
  • 8dfb0aa5d0 Automatic changelog generation for PR #14186 [ci skip] CitadelStationBot 2021-02-17 02:30:16 -06:00
  • e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game silicons 2021-02-17 01:30:13 -07:00
  • 303d35074d Another fix for infinite floor tiles shellspeed1 2021-02-16 20:24:50 -08:00
  • 76b4d4a7dc Update mentor.dm Timothy Teakettle 2021-02-16 21:02:35 +00:00
  • e50073e636 Update eldritch_effects.dm Timothy Teakettle 2021-02-16 20:54:37 +00:00
  • 3e95e28f85 Illegal cards will now permanently be marked, not for just one round SmArtKar 2021-02-16 20:05:59 +03:00
  • 598c19996c Oopsie SmArtKar 2021-02-16 19:53:27 +03:00
  • e4afe49687 Adds card crafting!" SmArtKar 2021-02-16 19:38:48 +03:00
  • 664f81585b Adds undef SmArtKar 2021-02-16 19:11:04 +03:00
  • 0e1e3aaaed and more SmArtKar 2021-02-16 18:57:43 +03:00
  • f6721d02b3 Adds chemicals I missed on the first pass. The0bserver 2021-02-16 09:53:09 -05:00
  • 9b519c048f Merge remote-tracking branch 'Upstream/master' The0bserver 2021-02-16 09:34:47 -05:00
  • 7ff8b41874 Update spacevine.dm IronEleven 2021-02-16 09:14:27 -05:00
  • 799917bc70 and more SmArtKar 2021-02-16 16:24:37 +03:00
  • 8abce43547 Fixes SmArtKar 2021-02-16 16:04:31 +03:00
  • 3da4c73fbe Slight changes to balance, new cards SmArtKar 2021-02-16 15:57:05 +03:00
  • b3bfeb9858 it does not exist Letter N 2021-02-16 20:42:42 +08:00
  • 31e577bf89 disabled for reasons :) Letter N 2021-02-16 20:35:36 +08:00
  • 7b24456e2d does not exist Letter N 2021-02-16 20:33:46 +08:00
  • 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 Letter N 2021-02-16 19:41:53 +08:00
  • 4c6685333b Polychromic Pants & Jacket Adelphon 2021-02-16 05:24:45 -05:00
  • a17716be5b bye Letter N 2021-02-16 18:15:02 +08:00
  • cf76b9d740 Fixes card saving, fixes some icons, adds rulebook SmArtKar 2021-02-16 12:12:20 +03:00
  • 6f25b65290 Apply suggestions from code review TyrianTyrell 2021-02-16 03:24:27 -05:00
  • 99a1991e0a Messages admins of certain holodeck actions Blue Wildrose 2021-02-15 19:55:05 -07:00
  • d87ac38e58 Eutactic Blade Restoration + Hyperblade keronshb 2021-02-15 21:36:47 -05:00
  • 3cac44b2f0 a silicons 2021-02-15 19:35:16 -07:00
  • 8257283cef Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm Chiirno 2021-02-15 22:03:12 -04:00
  • 975c98731e Merge pull request #14242 from timothyteakettle/age-gate-2-electric-boogaloo Lin 2021-02-15 18:16:44 -06:00
  • 6ee8ae12c7 Automatic changelog compile [ci skip] Changelogs 2021-02-16 00:14:28 +00:00
  • 8ea8f4e7e9 just a little tweak Chiirno 2021-02-15 18:31:07 -04:00
  • 915b911a40 Update say.dm TyrianTyrell 2021-02-15 17:15:30 -05:00
  • cef0226b0b Merge pull request #14244 from silicons/botany_logging Lin 2021-02-15 14:22:36 -06:00
  • 2b46d87742 Packs now put cards into your hand SmArtKar 2021-02-15 21:15:08 +03:00
  • 3ba4a9d670 FUCKING FINALLY SmArtKar 2021-02-15 21:02:54 +03:00
  • 924cfd1007 i hate this PR SmArtKar 2021-02-15 20:25:27 +03:00
  • c89a3c073a reeeee SmArtKar 2021-02-15 20:19:43 +03:00
  • 893f5b42e7 I hate trigonometry so here you go, propper formula for card rotation SmArtKar 2021-02-15 20:10:17 +03:00
  • 375a6891bf Adds new nuclear cards SmArtKar 2021-02-15 19:44:47 +03:00
  • d965834048 Set buzz fuzz's addiction threshold to actually be what the comment says. Putnam 2021-02-15 00:52:17 -08:00
  • 013588b748 Automatic changelog generation for PR #14245 [ci skip] CitadelStationBot 2021-02-14 22:52:46 -06:00
  • 142be853dc Merge pull request #14245 from silicons/sprint_staging Lin 2021-02-14 22:52:44 -06:00
  • 3222703917 makes floor bots place a plate before a tile shellspeed1 2021-02-14 16:42:59 -08:00
  • 52298a771d Automatic changelog compile [ci skip] Changelogs 2021-02-15 00:13:29 +00:00
  • 4e18044450 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui SandPoot 2021-02-14 20:10:41 -03:00
  • 27e3e8de26 Merge pull request #14247 from timothyteakettle/another-dumb-href-exploit Lin 2021-02-14 17:05:43 -06:00
  • 8f0fbb75ac Update security.dm timothyteakettle 2021-02-14 22:21:11 +00:00
  • 1d00bc51cb Merge pull request #14238 from Citadel-Station-13/silicons-patch-13 Lin 2021-02-14 13:34:25 -06:00
  • 58469ea2a1 Update say.dm TyrianTyrell 2021-02-14 11:53:44 -05:00
  • f1d9f288cb Update say.dm TyrianTyrell 2021-02-14 11:47:26 -05:00
  • a889f41a86 Update say.dm TyrianTyrell 2021-02-14 11:41:29 -05:00
  • 15d1146531 Update say.dm TyrianTyrell 2021-02-14 11:33:41 -05:00
  • 11bae949e5 Update say.dm TyrianTyrell 2021-02-14 11:32:36 -05:00
  • 95c9e8b94c Update say.dm TyrianTyrell 2021-02-14 11:24:19 -05:00
  • 4650c97c61 Update say.dm TyrianTyrell 2021-02-14 11:23:43 -05:00
  • 7b227e5d3e fixing annoying merge conflicts zerothebigboy 2021-02-14 10:48:56 -05:00
  • b9f7acf99c Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-02-14 10:43:22 -05:00
  • a5de2a6620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-02-14 10:42:59 -05:00
  • 3f88079d6f Merge remote-tracking branch 'Upstream/master' The0bserver 2021-02-14 07:01:13 -05:00
  • 6703bd7205 Update say.dm TyrianTyrell 2021-02-14 06:35:55 -05:00
  • 7a7c15f266 Update say.dm TyrianTyrell 2021-02-14 06:11:09 -05:00
  • 1c552480d8 Update say.dm TyrianTyrell 2021-02-14 06:10:10 -05:00
  • e9e82cedc2 Update say.dm TyrianTyrell 2021-02-14 06:07:30 -05:00
  • 6c76e584f8 Update say.dm TyrianTyrell 2021-02-14 06:02:21 -05:00
  • 72ae19e036 Update say.dm TyrianTyrell 2021-02-14 06:00:26 -05:00
  • f49deabe0f Update say.dm TyrianTyrell 2021-02-14 05:58:41 -05:00
  • 6c6cad632b Update say.dm TyrianTyrell 2021-02-14 05:53:21 -05:00
  • b40d875d11 Update say.dm TyrianTyrell 2021-02-14 05:52:16 -05:00
  • 78ef87b012 minor fixes, compile but still bugged Letter N 2021-02-14 17:08:16 +08:00
  • 91bb195249 Automatic changelog generation for PR #14140 [ci skip] CitadelStationBot 2021-02-13 23:30:16 -06:00
  • 7576c25666 Merge pull request #14140 from silicons/tgui_fix Lin 2021-02-13 23:30:14 -06:00
  • 6855d5d57a Automatic changelog generation for PR #14096 [ci skip] CitadelStationBot 2021-02-13 23:30:03 -06:00
  • 62fe42513b Merge pull request #14096 from Citadel-Station-13/silicons-patch-27 Lin 2021-02-13 23:30:00 -06:00
  • 8a076571dd Merge pull request #14243 from silicons/virus_logging Lin 2021-02-13 22:56:19 -06:00