Commit Graph

  • 876232c1bc cultist boot cultist boot? kappa-sama 2019-09-04 20:38:51 -04:00
  • f1f762ef48 Darnit bobby Fermi 2019-09-04 21:45:55 +01:00
  • f4ed7d04f0 help screen Linzolle 2019-09-04 14:19:14 -05:00
  • c663e7d324 smaller and bigger TrilbySpaceClone 2019-09-04 14:21:25 -04:00
  • adddb77e6a bruh Linzolle 2019-09-04 13:21:22 -05:00
  • dbdaae83b6 Update medicine_reagents.dm Trilbyspaceclone 2019-09-04 13:29:58 -04:00
  • 0edca307ad move to modular citadel Linzolle 2019-09-04 11:47:20 -05:00
  • eee1ccbe2c merge oracle ui from kepler Alonefromhell 2019-08-27 22:12:00 +02:00
  • 084b37ae4e tada TrilbySpaceClone 2019-09-04 10:13:32 -04:00
  • d431ee1a20 baseball bat Sishen 2019-09-04 03:01:47 -04:00
  • f742a34fb0 Automatic changelog generation for PR #9235 [ci skip] CitadelStationBot 2019-09-03 16:50:17 -05:00
  • 2b251d0f5a Merge pull request #9235 from YakumoChen/autoscan-autoban-revengeance kevinz000 2019-09-03 14:50:15 -07:00
  • 91cace6812 Merge remote-tracking branch 'upstream/master' into FERMICHEMCurTweaks Fermi 2019-09-03 20:33:33 +01:00
  • 7890ad08d5 what is this Fermi 2019-09-03 20:30:21 +01:00
  • 60bd6bf387 Merge branch 'FERMICHEMCurTweaks' of https://github.com/Thalpy/Citadel-Station-13 into FERMICHEMCurTweaks Fermi 2019-09-03 20:21:38 +01:00
  • a605d2a776 Todo: finish new words and review langauge Fermi 2019-08-28 22:22:10 +01:00
  • 9ec97579bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 Ghommie 2019-09-03 21:08:09 +02:00
  • fd585aa6ea Merge branch 'master' into more_cooking2 TrilbySpaceClone 2019-09-03 11:22:38 -04:00
  • 74fc240f0e weh TrilbySpaceClone 2019-09-03 11:13:11 -04:00
  • 5eba0d55f9 Update trash.dm Trilbyspaceclone 2019-09-03 11:09:03 -04:00
  • 7476f117da pie Trilbyspaceclone 2019-09-03 10:45:33 -04:00
  • 8394f2f1c7 grammer Trilbyspaceclone 2019-09-03 10:44:59 -04:00
  • 3f957ea488 grammer Trilbyspaceclone 2019-09-03 10:43:29 -04:00
  • 5168f2b233 Update granters.dm Trilbyspaceclone 2019-09-03 07:37:37 -04:00
  • a3967b6f77 aaaaaaaa Sishen 2019-09-03 02:29:08 -04:00
  • 807f7f4771 completely removes autoscan as originally intended YakumoChen 2019-09-03 06:03:46 +00:00
  • fbcce02f78 still removes autoscan YakumoChen 2019-09-03 05:44:51 +00:00
  • 7146cc6455 bigger again, but space so less lag* TrilbySpaceClone 2019-09-02 22:38:01 -04:00
  • 08e49574f6 Less lag* TrilbySpaceClone 2019-09-02 22:20:01 -04:00
  • c616c0e288 Update food_reagents.dm Trilbyspaceclone 2019-09-02 20:00:38 -04:00
  • c7941fda58 Automatic changelog generation for PR #9209 [ci skip] CitadelStationBot 2019-09-02 18:37:44 -05:00
  • 44c15897c7 Merge pull request #9209 from Sishen1542/ass-ass-ass nik707 2019-09-02 18:37:42 -05:00
  • 024c44255a Automatic changelog generation for PR #9212 [ci skip] CitadelStationBot 2019-09-02 18:37:24 -05:00
  • 2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears nik707 2019-09-02 18:37:22 -05:00
  • 67f4276aab Merge pull request #9104 from Sishen1542/tbaton nik707 2019-09-02 18:35:56 -05:00
  • ca8166f940 Merge pull request #9041 from Citadel-Station-13/kevinz000-patch-68 nik707 2019-09-02 18:28:05 -05:00
  • 5e04cc2409 Automatic changelog generation for PR #9057 [ci skip] CitadelStationBot 2019-09-02 18:27:06 -05:00
  • dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox nik707 2019-09-02 18:27:03 -05:00
  • 2f42202f5c Automatic changelog generation for PR #8649 [ci skip] CitadelStationBot 2019-09-02 18:25:32 -05:00
  • 3ea520d443 Merge pull request #8649 from Ghommie/Ghommie-cit50 nik707 2019-09-02 18:25:30 -05:00
  • bddaafe7de Automatic changelog generation for PR #8932 [ci skip] CitadelStationBot 2019-09-02 18:23:49 -05:00
  • df324b7f9a Merge pull request #8932 from EmeraldSundisk/gunrangebox nik707 2019-09-02 18:23:48 -05:00
  • 238faae042 Merge pull request #8919 from Citadel-Station-13/kevinz000-patch-47 nik707 2019-09-02 18:23:34 -05:00
  • 71aeddd6f6 Packbrakeout TrilbySpaceClone 2019-09-02 11:17:55 -04:00
  • 3f954f10a7 Update runes.dm Sishen 2019-09-02 02:09:59 -04:00
  • 0b6eb6e34c Update holy_weapons.dm Sishen 2019-09-01 22:36:39 -04:00
  • b474af1a66 Update DeltaStation2.dmm EmeraldSundisk 2019-09-01 09:58:22 -07:00
  • e66b95b9c9 More lines of code rewriting fermis' mess. Ghommie 2019-09-01 05:58:57 +02:00
  • 36ffd3d6a8 More lines. Ghommie 2019-09-01 03:35:36 +02:00
  • 473cde6a9d huh Trilbyspaceclone 2019-08-31 21:16:14 -04:00
  • 58458a6740 the seeds TrilbySpaceClone 2019-08-31 21:12:27 -04:00
  • 4d16abc141 Merge branch 'master' into fruit TrilbySpaceClone 2019-08-31 21:11:22 -04:00
  • c2f189bbdb Merge branch 'master' into fruit TrilbySpaceClone 2019-08-31 21:09:59 -04:00
  • 2f3bf39450 Automatic changelog generation for PR #9227 [ci skip] CitadelStationBot 2019-08-31 20:04:56 -05:00
  • bd60e00924 Merge pull request #9227 from Trilbyspaceclone/spritefiddles nik707 2019-08-31 20:04:54 -05:00
  • db3c36fd9a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 Ghommie 2019-09-01 01:59:00 +02:00
  • 4085b479d1 Fixing clockie mass recall that I apparently didn't really fix before. Ghommie 2019-09-01 01:45:33 +02:00
  • 3b40f73266 prayer beads no longer instantly deconvert, now inject holy water Sishen 2019-08-31 18:37:00 -04:00
  • f9e12378e9 Update ids.dm Trilbyspaceclone 2019-08-31 18:34:20 -04:00
  • a43a497114 Update ids.dm Trilbyspaceclone 2019-08-31 18:15:32 -04:00
  • b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description Sishen 2019-08-31 18:05:09 -04:00
  • 279a6ed83e bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths Sishen 2019-08-31 17:57:36 -04:00
  • d9fff579b1 damage and stamina balances Sishen 2019-08-31 17:39:51 -04:00
  • 98c268d6ac fix TrilbySpaceClone 2019-08-31 16:58:03 -04:00
  • e37983f20c Have a heart! TrilbySpaceClone 2019-08-31 15:45:33 -04:00
  • 36695d556f Lets have all the ammo and kegs together TrilbySpaceClone 2019-08-31 15:38:26 -04:00
  • 0b9b237e34 Merge branch 'master' into minor-fixes Winter Flare 2019-08-31 04:03:58 -04:00
  • b03c4c9928 Merge branch 'master' into minor-fixes Winter Flare 2019-08-31 03:59:11 -04:00
  • 29967f0983 Automatic changelog generation for PR #9219 [ci skip] CitadelStationBot 2019-08-31 02:09:17 -05:00
  • e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219 nik707 2019-08-31 02:09:15 -05:00
  • 2f980a9c91 Automatic changelog generation for PR #9175 [ci skip] CitadelStationBot 2019-08-31 02:06:35 -05:00
  • c826e1b412 Merge pull request #9175 from lolman360/master nik707 2019-08-31 02:06:33 -05:00
  • 7e8e32f848 idiot nik707 2019-08-31 02:05:13 -05:00
  • daff8899dd retard nik707 2019-08-31 02:04:58 -05:00
  • ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool Sishen 2019-08-31 02:55:29 -04:00
  • 1d49765d4e Merge pull request #9218 from Citadel-Station-13/kevinz000-patch-79 nik707 2019-08-31 01:48:20 -05:00
  • 0a7a875d39 Automatic changelog generation for PR #9216 [ci skip] CitadelStationBot 2019-08-31 01:37:52 -05:00
  • 01e4e80cca Merge pull request #9216 from Trilbyspaceclone/patch-218 nik707 2019-08-31 01:37:50 -05:00
  • db22ae64d4 im gonna go ape kappa-sama 2019-08-30 22:46:52 -04:00
  • 38023a05fa update master kappa-sama 2019-08-30 22:40:35 -04:00
  • fee4209ec3 fffffffffffffffffffffffffffffffa lolman360 2019-08-31 10:16:03 +10:00
  • c20bcccee8 gggggggggggggggggggggggg lolman360 2019-08-31 10:11:47 +10:00
  • f2ed4c5085 Merge pull request #2 from lolman360/ddddddd lolman360 2019-08-31 10:10:14 +10:00
  • 15cfcfc8c3 ffffffff lolman360 2019-08-31 10:09:37 +10:00
  • 689ba1246b eeeeee eeeeeee eeeeeeeeeeee lolman360 2019-08-31 10:08:31 +10:00
  • 64b29e9e1f Update supermatter.dm kevinz000 2019-08-30 15:22:58 -07:00
  • 975b55e26d Update singularity.dm kevinz000 2019-08-30 15:19:30 -07:00
  • a3917a81b0 Update energy_ball.dm kevinz000 2019-08-30 15:18:22 -07:00
  • bc74ce110a Update energy_ball.dm kevinz000 2019-08-30 15:17:23 -07:00
  • b69c928419 FOR THE EMPEROR Sishen 2019-08-30 16:50:03 -04:00
  • 85fc947dd7 Allows furranium grown from organic sources. Fermi 2019-08-30 20:44:39 +01:00
  • 77eef5de6f Heat plays a component now. Fermi 2019-08-30 20:42:22 +01:00
  • 9c9e1b1da3 Update life.dm Trilbyspaceclone 2019-08-30 09:24:58 -04:00
  • 6b5388951f Ohwait let's not return on a normal process. :^) Poojawa 2019-08-30 03:16:18 -05:00
  • 2849f82d0b let's be sure people don't have negative bleeding, because that would be weird as fuck. Poojawa 2019-08-30 03:15:46 -05:00
  • b2252a1c74 Medical assistance treats bleed_rate to stop phantom bleeding Poojawa 2019-08-30 02:46:57 -05:00
  • 931527ff7c Update mob.dm kevinz000 2019-08-29 22:54:41 -07:00
  • dae3e91293 MIGHT HELP IF SYNTHETICS EXISTED, WHOOPS Poojawa 2019-08-30 00:07:06 -05:00
  • 583cf3d2ed Maps in Blood generators Poojawa 2019-08-29 23:15:44 -05:00
  • dca90db321 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-08-29 23:03:26 -05:00