Commit Graph

1964 Commits

Author SHA1 Message Date
Fermi 4b44b31aa3 Okay, feature done 2019-09-21 08:24:46 +01:00
Fermi 2b80998f64 Adds: cybernetic_heart_u and VV viewer. 2019-09-21 04:19:34 +01:00
Fermi 491ff293c5 Tweaks and jazz 2019-09-21 02:59:06 +01:00
Fermi 2bd5ee184d THIS SHOULDN'T FIND IT'S WAY INTO A PR 2019-09-21 01:50:39 +01:00
Fermi 079fbbed2b Merge branch 'Reagents_bitflats' into Wiki-fermi 2019-09-21 01:40:13 +01:00
Fermi 0d49fdff54 Blob 2019-09-21 01:37:35 +01:00
Fermi 37a1e39744 Merge branch 'master' into Wiki 2019-09-21 01:29:45 +01:00
Fermi f37215ec5a Okay, few misses. 2019-09-21 01:26:48 +01:00
Fermi 5b11ffd281 Should be kinda working maybe. But with feeling!! 2019-09-21 01:23:26 +01:00
Fermi 8b477a8bcf Edits output to be a .md and now you can open it in game!! Magic! 2019-09-20 23:30:51 +01:00
Fermi 13cf5a7822 Updates 2019-09-20 22:51:14 +01:00
Fermi 59c82894a1 Sprinkles! 2019-09-20 22:15:55 +01:00
Fermi 55c3a48026 Oops 2019-09-20 21:56:39 +01:00
Fermi d12fd72ebf Updates a buncha stuff. 2019-09-20 21:11:20 +01:00
Fermi e6a5530363 Fixes 2019-09-20 20:06:38 +01:00
Fermi 9cca272986 Fixes quant errors, I hope. 2019-09-20 19:54:21 +01:00
Fermi 79b1d33008 classic oops 2019-09-20 19:46:53 +01:00
Fermi 9b2f67d67d reagent_flags is used elsewhere, renamed to chemical_flags 2019-09-20 19:43:37 +01:00
Ghommie ec9bf9ed17 Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene. 2019-09-20 19:04:28 +02:00
Fermi 3f2933adbf Ghommies' requests. 2019-09-19 23:31:36 +01:00
Thalpy 79011190c1 Merge branch 'master' into tg-Organ-port 2019-09-19 21:26:42 +01:00
Fermi b8190552f1 Update defines, and vars, and created new procs 2019-09-19 21:24:50 +01:00
Fermi d2c49d7987 On_mob_dead! 2019-09-19 20:30:35 +01:00
Fermi 70098f8bc8 Merge branch 'master' into Reagents_bitflats 2019-09-19 20:04:10 +01:00
Thalpy 641196b9dd Merge branch 'master' into FERMICHEMCurTweaks 2019-09-19 19:57:57 +01:00
Fermi 7ef5ab0332 TO TEST - also needs #9099 merging. 2019-09-19 17:52:45 +01:00
Fermi 08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Fermi 587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
TrilbySpaceClone 5ecf68918b tada 2019-09-18 03:47:52 -04:00
Fermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -05:00
Fermi 6814aae0f8 Tweaks! 2019-09-16 21:28:23 +01:00
Fermi 41c8c7dde6 Why tho 2019-09-16 01:12:49 +01:00
Fermi f6b96a818e Update 2019-09-15 00:55:40 +01:00
Poojawa ec4b1fba72 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 23:27:50 -05:00
Poojawa 0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 23:26:27 -05:00
Fermi e281384b7a It's actually less laggy than I thought. 2019-09-14 03:10:54 +01:00
Fermi c823a2d23a Preview. 2019-09-14 03:09:32 +01:00
Fermi 80b79ef94e Mostly complete for now 2019-09-14 02:26:06 +01:00
Fermi e62a491c18 Now does chem reactions too. 2019-09-14 00:08:23 +01:00
Fermi 80997e4ef3 Works. 2019-09-13 23:06:09 +01:00
Fermi 04b492924b Works kinda 2019-09-13 20:23:07 +01:00
Fermi 87de05622e Justin case 2019-09-13 19:26:20 +01:00
Fermi eeddcfa295 I think it works, well, not sure about the CR stuff 2019-09-13 19:22:05 +01:00
Trilbyspaceclone 5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
Poojawa 53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa 9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 12:56:57 -05:00
kevinz000 591a584785 Merge pull request #9275 from Thalpy/InitialD
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
2019-09-13 10:43:22 -07:00
Fermi 44cff04515 Atom stop crashing pls 2019-09-13 18:03:39 +01:00