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

Commit Graph

  • c16381b570 Merge pull request #12583 from Detective-Google/eyepatch Ghom 2020-06-23 03:20:46 +02:00
  • ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 Ghommie 2020-06-23 03:12:49 +02:00
  • 46805bc872 more progress Detective Google 2020-06-22 20:11:18 -05:00
  • a8b6bb7957 step 2; de-looting the caves Detective Google 2020-06-22 19:46:48 -05:00
  • dc81519380 whoops me forget to hit save first Detective Google 2020-06-22 19:29:01 -05:00
  • d4dd1a162a loot-yeet #1; wizard academy Detective Google 2020-06-22 19:28:47 -05:00
  • 1b8ab9799d Update cola.dm dapnee 2020-06-22 18:17:21 -06:00
  • 09051189a3 fixes one of the icon states for the diagnostic hud eyepatch Detective Google 2020-06-22 18:37:28 -05:00
  • 29ab16c3ed Update mechfabricator_designs.dm Detective-Google 2020-06-22 18:27:58 -05:00
  • de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 Ghommie 2020-06-23 00:13:14 +02:00
  • a899bde0ba Let's try again dapnee 2020-06-22 15:25:42 -06:00
  • e63f6aed42 Merge remote-tracking branch 'upstream/master' into meme dapnee 2020-06-22 15:15:28 -06:00
  • 7d8da1df0b empty commit to reroll bots Detective Google 2020-06-22 16:03:08 -05:00
  • 099f594a30 SMESes should now work with self-charging cells (tg#51240) Detective Google 2020-06-22 15:56:51 -05:00
  • 715b1f85da prevents shunted AIs from doomsdaying (tg#51284) Detective Google 2020-06-22 15:53:55 -05:00
  • da68163c80 ghosts now appear at round-end Detective Google 2020-06-22 15:43:32 -05:00
  • 472ed97b8c port tg#51713 Detective Google 2020-06-22 15:32:23 -05:00
  • 78df740d19 Update debuffs.dm silicons 2020-06-22 13:24:36 -07:00
  • a02e6ab03e Compile Artur 2020-06-22 21:30:54 +03:00
  • aff4e5f93f Linter fixes Artur 2020-06-22 17:58:52 +03:00
  • c41d2e78be Conflicts!!! Artur 2020-06-22 17:39:24 +03:00
  • 66cbdd1174 Fixes the dreaded examine bug Artur 2020-06-22 17:25:40 +03:00
  • bdaaa6d944 Merge pull request #3 from Citadel-Station-13/master Heretical Lizard 2020-06-21 21:27:36 -04:00
  • 0f15b0ce84 hey look, I'm finished with a single meme item dapnee 2020-06-21 18:49:58 -06:00
  • a0a4007332 Merge pull request #12567 from Citadel-Station-13/kevinz000-patch-5 Lin 2020-06-21 19:37:54 -05:00
  • cfff6677b4 wataur dapnee 2020-06-21 18:14:34 -06:00
  • dc75f56378 Automatic changelog compile [ci skip] Changelogs 2020-06-22 00:08:41 +00:00
  • 2920a89791 Automatic changelog generation for PR #12557 [ci skip] CitadelStationBot 2020-06-21 18:33:02 -05:00
  • 2cd18f3dba Merge pull request #12557 from silicons/life Lin 2020-06-21 18:32:58 -05:00
  • 80ec5b12f8 Automatic changelog generation for PR #12561 [ci skip] CitadelStationBot 2020-06-21 16:11:13 -05:00
  • 99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems silicons 2020-06-21 14:11:10 -07:00
  • 94cfb4ba22 Automatic changelog generation for PR #12488 [ci skip] CitadelStationBot 2020-06-21 16:10:49 -05:00
  • 8cd81ff89b Merge pull request #12488 from Ghommie/Ghommie-cit813 silicons 2020-06-21 14:10:45 -07:00
  • 753fcbb84a Merge pull request #12556 from Detective-Google/bald-bald-bald-bald-bald-bald-bald silicons 2020-06-21 14:10:29 -07:00
  • 983aac10a2 fixes it properly Timothy Teakettle 2020-06-21 17:39:36 +01:00
  • 9e7b884e86 Adds remaining TOSOrvikepi Anonymous 2020-06-21 13:25:23 +03:00
  • 384e951b1c Merge branch 'master' into orvilike_bonus Anonymous 2020-06-21 12:03:28 +03:00
  • 7f6e8f8670 Update OmegaStation.dmm EmeraldSundisk 2020-06-21 00:30:30 -07:00
  • 82d21e4824 smol fix DeltaFire 2020-06-21 03:44:12 +02:00
  • 038f439b7d Automatic changelog compile [ci skip] Changelogs 2020-06-21 00:18:47 +00:00
  • 9a3e464af9 Automatic changelog compile [ci skip] Changelogs 2020-06-21 00:10:23 +00:00
  • 36c46c3c4c Automatic changelog compile [ci skip] Changelogs 2020-06-21 00:08:22 +00:00
  • 06f0d42ee9 makes chem packs slightly cheaper shellspeed1 2020-06-20 16:53:39 -07:00
  • 33cae67acf Automatic changelog generation for PR #12558 [ci skip] CitadelStationBot 2020-06-20 18:44:21 -05:00
  • 905d4ee74d Merge pull request #12558 from Citadel-Station-13/kevinz000-patch-4 Lin 2020-06-20 18:44:17 -05:00
  • 6cababd09b yeeah no more free random nullcrates DeltaFire 2020-06-21 01:30:39 +02:00
  • c15d53237b Revert "free random null crate man bad" DeltaFire 2020-06-21 00:55:35 +02:00
  • 6fc3462d05 free random null crate man bad DeltaFire 2020-06-21 00:55:17 +02:00
  • bb06a1b1d6 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-06-21 00:16:48 +02:00
  • b7d2382875 lil' sprite goof Detective Google 2020-06-20 16:35:21 -05:00
  • ab05e48149 adds the medical gygax Detective Google 2020-06-20 16:22:28 -05:00
  • 45dab7fa66 Kepi and Orvilike Kepi Anonymous 2020-06-20 22:52:33 +03:00
  • 4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald Detective Google 2020-06-20 14:00:14 -05:00
  • 1959b491fc unnecessary? Linzolle 2020-06-19 22:53:55 -05:00
  • b873f244c9 finally Linzolle 2020-06-19 22:46:31 -05:00
  • 60c260c52e Merge pull request #46 from Citadel-Station-13/master EmeraldSundisk 2020-06-19 19:48:52 -07:00
  • 354cc7d0c7 Update jellypeople.dm kevinz000 2020-06-19 19:31:38 -07:00
  • 2e8a2fee66 Automatic changelog compile [ci skip] Changelogs 2020-06-20 00:07:58 +00:00
  • e23569d470 compile Linzolle 2020-06-19 18:42:19 -05:00
  • d023f67b1e add analysis screen check Linzolle 2020-06-19 18:27:26 -05:00
  • 48c13fcc10 Removing now unused old embed behavior Ghommie 2020-06-20 00:15:52 +02:00
  • 29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 Ghommie 2020-06-20 00:07:47 +02:00
  • 6516e07bd8 Merge pull request #12566 from Ghommie/Ghommie-cit818 kevinz000 2020-06-19 14:22:40 -07:00
  • d805ba3d9b Automatic changelog generation for PR #12414 [ci skip] CitadelStationBot 2020-06-19 16:09:13 -05:00
  • e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing Ghom 2020-06-19 23:09:09 +02:00
  • ca7f452a7f Automatic changelog generation for PR #12542 [ci skip] CitadelStationBot 2020-06-19 16:07:26 -05:00
  • dd009ada48 Merge pull request #12542 from bunny232/scrubber Ghom 2020-06-19 23:07:23 +02:00
  • 43acf79dd3 oh wow Ghommie 2020-06-19 21:55:01 +02:00
  • 162549a3c2 Fixing stuff. Ghommie 2020-06-19 20:34:51 +02:00
  • d555394290 Let's just use tgstation's. Ghommie 2020-06-19 19:01:05 +02:00
  • 7fa5107b4b all methods of cooking define quality Timothy Teakettle 2020-06-19 17:16:34 +01:00
  • a8f4988c36 alter form updates hair Timothy Teakettle 2020-06-19 17:09:54 +01:00
  • 9197cb4813 allows storage in medbelts and organ boxes. shellspeed1 2020-06-18 21:06:22 -07:00
  • 0d197e82f8 Merge branch 'master' into cool-ipcs Timothy Teakettle 2020-06-19 01:57:02 +01:00
  • 915b147367 Automatic changelog compile [ci skip] Changelogs 2020-06-19 00:07:42 +00:00
  • 8303de3c00 Merge pull request #12564 from kevinz000/sigh Lin 2020-06-18 17:10:19 -05:00
  • c7e42c8d88 groan kevinz000 2020-06-18 14:31:34 -07:00
  • f60f9555ee Automatic changelog generation for PR #12487 [ci skip] CitadelStationBot 2020-06-18 13:37:14 -05:00
  • 3cdc73ff35 Merge pull request #12487 from kevinz000/erp_2 Lin 2020-06-18 13:37:10 -05:00
  • 7d30d7c7ff Merge pull request #12545 from Citadel-Station-13/kevinz000-patch-1 Lin 2020-06-18 13:34:31 -05:00
  • 1f53cd34d3 Merge pull request #12563 from kevinz000/shuttles nik707 2020-06-18 10:41:20 -05:00
  • 828f6686cf Merge pull request #12553 from Citadel-Station-13/kevinz000-patch-3 nik707 2020-06-18 10:40:47 -05:00
  • 8a90590263 Update species.dm kevinz000 2020-06-18 08:25:49 -07:00
  • 407ed71d38 Automatic changelog generation for PR #12560 [ci skip] CitadelStationBot 2020-06-18 10:24:59 -05:00
  • e381f7060e Merge pull request #12560 from SmArtKar/runtime_fixes kevinz000 2020-06-18 08:24:57 -07:00
  • c655a0451c Update shuttle.dm kevinz000 2020-06-18 08:24:51 -07:00
  • 1b5ea90c8f sigh kevinz000 2020-06-18 08:16:05 -07:00
  • 1e99990b38 Revert "Automatic changelog compile [ci skip]" shellspeed1 2020-06-18 02:45:44 -07:00
  • b490f02c78 Ports IV bags from TG shellspeed1 2020-06-18 02:30:58 -07:00
  • 17c38efbb0 Runtime Fixes SmArtKar 2020-06-18 11:24:08 +03:00
  • 291004d0fb Update species.dm kevinz000 2020-06-17 22:44:08 -07:00
  • 78fadafa05 alright kevinz000 2020-06-17 21:44:49 -07:00
  • 409dbd2835 carbons and humans kevinz000 2020-06-17 21:42:04 -07:00
  • 1336404eb6 last ones kevinz000 2020-06-17 21:37:19 -07:00
  • 445d94f335 haha whew kevinz000 2020-06-17 21:32:10 -07:00
  • da704db97d Automatic changelog generation for PR #12548 [ci skip] CitadelStationBot 2020-06-17 22:10:07 -05:00
  • 118ac1a775 Merge pull request #12548 from timothyteakettle/more-events kevinz000 2020-06-17 20:10:04 -07:00
  • 4035812c0f Automatic changelog generation for PR #12555 [ci skip] CitadelStationBot 2020-06-17 22:08:13 -05:00
  • c42889feb6 Merge pull request #12555 from Funce/sqrt-circuit-fix kevinz000 2020-06-17 20:08:11 -07:00
  • 98e0999c63 Automatic changelog generation for PR #12554 [ci skip] CitadelStationBot 2020-06-17 22:06:54 -05:00