Commit Graph

  • 69eca2ae4b progress, just need to fiddle with footprints again Poojawa 2019-05-07 13:23:49 -05:00
  • d14943d4b0 well we have footprints now, xenoblood back to blood subtype. Poojawa 2019-05-07 05:29:45 -05:00
  • 2b1261ab03 Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44 deathride58 2019-05-07 02:19:40 -04:00
  • a3317ffe89 Merge pull request #8280 from Citadel-Station-13/kevinz000-patch-43 deathride58 2019-05-07 02:19:28 -04:00
  • 7be3f6d01a Update ninjaDrainAct.dm Useroth 2019-05-07 06:07:19 +02:00
  • 3333a7eac1 Update strings/phobia.json deathride58 2019-05-06 23:55:24 -04:00
  • 7e853a620c Update strings/phobia.json deathride58 2019-05-06 23:55:03 -04:00
  • f897144a66 Update strings/phobia.json deathride58 2019-05-06 23:54:57 -04:00
  • 9adeccc5e1 Update autolathe_designs.dm Trilbyspaceclone 2019-05-06 23:47:39 -04:00
  • ae75bf2fd1 Update autolathe_designs.dm Trilbyspaceclone 2019-05-06 23:46:31 -04:00
  • e22908a0ae Automatic changelog generation for PR #8278 [ci skip] CitadelStationBot 2019-05-06 21:13:52 -05:00
  • f318ad7d1b Merge pull request #8278 from Trilbyspaceclone/patch-106 deathride58 2019-05-06 22:13:50 -04:00
  • 5e2a9669d1 Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45 deathride58 2019-05-06 22:08:43 -04:00
  • 24cfef7329 Merge pull request #8299 from Citadel-Station-13/kevinz000-patch-48 deathride58 2019-05-06 22:08:16 -04:00
  • 9d6f85d555 Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47 deathride58 2019-05-06 22:04:12 -04:00
  • 765c84a710 Automatic changelog generation for PR #8306 [ci skip] CitadelStationBot 2019-05-06 20:58:47 -05:00
  • 0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco deathride58 2019-05-06 21:58:44 -04:00
  • aaa06473b7 Merge pull request #8276 from Citadel-Station-13/hahaha deathride58 2019-05-06 21:23:55 -04:00
  • bb9c479566 Merge pull request #8313 from BurgerLUA/SlurringFix deathride58 2019-05-06 21:00:33 -04:00
  • e70d9c4928 Automatic changelog generation for PR #8305 [ci skip] CitadelStationBot 2019-05-06 19:56:30 -05:00
  • 1a483f19a2 Merge pull request #8305 from Poojawa/NPR-for-discord deathride58 2019-05-06 20:56:28 -04:00
  • b8841db3bb Automatic changelog generation for PR #8318 [ci skip] CitadelStationBot 2019-05-06 19:20:00 -05:00
  • c6f56d5a59 Merge pull request #8318 from BurgerLUA/bane-damage deathride58 2019-05-06 20:19:58 -04:00
  • c926320902 Merge pull request #8320 from Citadel-Station-13/kevinz000-patch-50 deathride58 2019-05-06 20:18:55 -04:00
  • 9aa74f4fc2 Update all_nodes.dm Trilbyspaceclone 2019-05-06 19:58:45 -04:00
  • 8abd98cec7 Merge pull request #8162 from Trilbyspaceclone/patch-87 deathride58 2019-05-06 19:24:38 -04:00
  • fda9883bae Update inducer.dm Trilbyspaceclone 2019-05-06 14:48:16 -04:00
  • 996662ebea adjust and reset things Poojawa 2019-05-06 04:35:09 -05:00
  • 105b40a4f8 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-05-06 02:53:42 -05:00
  • f31a46e029 Fixed a few things, 1/2 way through MC chem. Fermi 2019-05-05 20:32:07 +01:00
  • 5e5c470dc9 Update all_nodes.dm Trilbyspaceclone 2019-05-05 06:51:10 -04:00
  • 7d310f407b Update inducer.dm Trilbyspaceclone 2019-05-05 06:50:22 -04:00
  • cc34a8fa4e Update all_nodes.dm Trilbyspaceclone 2019-05-05 06:47:03 -04:00
  • 5904d1d281 Update power_designs.dm Trilbyspaceclone 2019-05-05 06:45:40 -04:00
  • 642cad2bb2 Update inducer.dm Trilbyspaceclone 2019-05-05 06:40:07 -04:00
  • dc4aa42525 Update magweapon_energy.dm Trilbyspaceclone 2019-05-05 06:35:32 -04:00
  • 03ce6d3f9c Update recharger.dm Trilbyspaceclone 2019-05-05 06:32:29 -04:00
  • c618e73618 Add files via upload Trilbyspaceclone 2019-05-05 06:31:10 -04:00
  • 664c8145fe Delete tools.dmi Trilbyspaceclone 2019-05-05 06:26:37 -04:00
  • b63c3d5301 Merge pull request #39 from Citadel-Station-13/master Trilbyspaceclone 2019-05-05 06:25:23 -04:00
  • 663999732e Update recharger.dm Trilbyspaceclone 2019-05-05 06:17:59 -04:00
  • c039043d0f Automatic changelog generation for PR #8317 [ci skip] CitadelStationBot 2019-05-05 01:18:38 -05:00
  • 383cae2949 Merge pull request #8317 from deathride58/herewegoagain kevinz000 2019-05-04 23:18:36 -07:00
  • 1b387eb5e3 Merge pull request #8314 from Poojawa/mawp kevinz000 2019-05-04 23:18:14 -07:00
  • 1480d53407 Automatic changelog generation for PR #8315 [ci skip] CitadelStationBot 2019-05-05 01:17:53 -05:00
  • 1caa3ba720 Merge pull request #8315 from Trilbyspaceclone/patch-115 kevinz000 2019-05-04 23:17:51 -07:00
  • 9cc8ed4bba Automatic changelog generation for PR #8319 [ci skip] CitadelStationBot 2019-05-05 01:17:20 -05:00
  • d25a59f567 Merge pull request #8319 from BurgerLUA/Penis-Enlargement-Pills kevinz000 2019-05-04 23:17:18 -07:00
  • 0bfac54070 Update magweapon_energy.dm kevinz000 2019-05-04 23:16:27 -07:00
  • f13e48b014 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 Ghommie 2019-05-04 19:39:41 +02:00
  • b71bc7d9dc Added happiness, psicodine, neurine and 2/6th of MC chem Fermi 2019-05-04 17:50:43 +01:00
  • bca578ab2c About 1/6th done of MC base code Fermi 2019-05-03 03:02:37 +01:00
  • 8d7297c178 Update traumas.dm Trilbyspaceclone 2019-05-02 20:07:18 -04:00
  • 21d4c0614d Update traumas.dm Trilbyspaceclone 2019-05-02 18:50:24 -04:00
  • 44b4c5f916 Update phobia.json Trilbyspaceclone 2019-05-02 18:36:21 -04:00
  • 16dff1969e Update traumas.dm Trilbyspaceclone 2019-05-02 18:32:33 -04:00
  • 1557c33008 Adds Penis Enlargement Pills BurgerLua 2019-05-02 14:55:04 -07:00
  • 05c800aab3 Update phobia.json Trilbyspaceclone 2019-05-02 17:46:54 -04:00
  • 44e02f7f6a Update traumas.dm Trilbyspaceclone 2019-05-02 17:40:39 -04:00
  • f92995bc13 Mid MC Fermi 2019-05-02 11:34:42 +01:00
  • 6da47ef05f Adds additional brain damage text BurgerLua 2019-05-02 01:35:34 -07:00
  • e70eac8f53 Futher fixes and for some reason something broke arrrghhh. Fermi 2019-05-02 08:44:06 +01:00
  • 7dd5e563b0 Clamps biogen amount to a sane amount deathride58 2019-05-02 00:21:38 -04:00
  • 29a4750e21 Update autolathe_designs.dm Trilbyspaceclone 2019-05-01 18:38:40 -04:00
  • 0aa78684a5 I guess cookies unlock collars are not intended Trilbyspaceclone 2019-05-01 18:36:54 -04:00
  • 831e450b3f Update weapon_designs.dm Trilbyspaceclone 2019-05-01 16:08:17 -04:00
  • 150db880de Update laser.dm Trilbyspaceclone 2019-05-01 16:07:11 -04:00
  • fd251d3dd2 Update laser.dm Trilbyspaceclone 2019-05-01 15:15:29 -04:00
  • faeb4bc22d Mawp Poojawa 2019-05-01 00:58:19 -05:00
  • b31127bcca Forgot this BurgerLua 2019-04-30 22:26:44 -07:00
  • 9c02505dbd Fixes weird arm/hand overlap Poojawa 2019-05-01 00:16:37 -05:00
  • be0829af53 cleans up loadout screen, fixes some suits, tweaks a few digi hand-holes Poojawa 2019-05-01 00:10:27 -05:00
  • 9374e83e7d fixes armor plate oversight Poojawa 2019-05-01 00:05:14 -05:00
  • d3b856d95f slurring reduction BurgerLua 2019-04-30 22:00:27 -07:00
  • 22c0c9baec Slurring Fix BurgerLua 2019-04-30 21:29:28 -07:00
  • 4aaab992f5 Removed frost oil and spray tan, deep fried items now no longer delete themselves when consumed. BurgerLua 2019-04-30 11:53:48 -07:00
  • 534b5f0287 Merge pull request #8309 from Trilbyspaceclone/Food-5 kevinz000 2019-04-30 05:42:30 -07:00
  • 6168d615ac Automatic changelog generation for PR #8274 [ci skip] CitadelStationBot 2019-04-30 07:38:44 -05:00
  • a5799e8883 Merge pull request #8274 from BurgerLUA/CogFluff kevinz000 2019-04-30 05:38:42 -07:00
  • 3b0ea2e293 Automatic changelog generation for PR #8288 [ci skip] CitadelStationBot 2019-04-30 07:37:05 -05:00
  • 7466f48674 Merge pull request #8288 from BurgerLUA/Accesssssssssssss kevinz000 2019-04-30 05:37:02 -07:00
  • ea9e2a7d14 Automatic changelog generation for PR #8286 [ci skip] CitadelStationBot 2019-04-30 07:32:23 -05:00
  • 7fe7b2d30f Merge pull request #8286 from BurgerLUA/AlcoholTweaks kevinz000 2019-04-30 05:32:20 -07:00
  • 52cff725c4 Automatic changelog generation for PR #8290 [ci skip] CitadelStationBot 2019-04-30 07:31:36 -05:00
  • cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv kevinz000 2019-04-30 05:31:33 -07:00
  • 1d69ac1672 Automatic changelog generation for PR #8294 [ci skip] CitadelStationBot 2019-04-30 07:30:03 -05:00
  • d4721e876e Merge pull request #8294 from Trilbyspaceclone/shotgun_sprites kevinz000 2019-04-30 05:30:00 -07:00
  • 2661b08d28 Automatic changelog generation for PR #8283 [ci skip] CitadelStationBot 2019-04-30 07:28:58 -05:00
  • 709e3375ac Merge pull request #8283 from BurgerLUA/NoMoreOfThisShit kevinz000 2019-04-30 05:28:55 -07:00
  • 202d901c25 Automatic changelog generation for PR #8301 [ci skip] CitadelStationBot 2019-04-30 07:24:19 -05:00
  • 218fd09102 Merge pull request #8301 from Trilbyspaceclone/hell kevinz000 2019-04-30 05:24:16 -07:00
  • 5802c75389 Automatic changelog generation for PR #8289 [ci skip] CitadelStationBot 2019-04-30 07:18:55 -05:00
  • 970dc85b62 Merge pull request #8289 from Trilbyspaceclone/patch-111 kevinz000 2019-04-30 05:18:52 -07:00
  • 8cf8d87658 Automatic changelog generation for PR #8287 [ci skip] CitadelStationBot 2019-04-30 07:18:17 -05:00
  • 7c1d7b60d0 Merge pull request #8287 from Trilbyspaceclone/Lock_and_key kevinz000 2019-04-30 05:18:14 -07:00
  • e77188d461 Automatic changelog generation for PR #8302 [ci skip] CitadelStationBot 2019-04-30 07:14:13 -05:00
  • 05b4854441 Merge pull request #8302 from BurgerLUA/PenisFix kevinz000 2019-04-30 05:14:10 -07:00
  • 397d85cdd8 Merge pull request #8300 from Useroth/jaunt-fix kevinz000 2019-04-30 05:11:01 -07:00
  • 5ade1a27f0 Everything fixed. BE largement (probably) fully functional PE I think has issues ripping clothes? Fermi 2019-04-30 05:43:49 +01:00
  • bf36beb395 Update traumas.dm Trilbyspaceclone 2019-04-29 22:20:01 -04:00