Commit Graph

1992 Commits

Author SHA1 Message Date
Fermi 5657fd8cde endless sadness and exhaustion 2019-04-20 03:40:40 +01:00
Fermi 390f9a635f Error message addition. 2019-04-16 23:03:24 +01:00
Thalpy 887aad3bf3 Quick merge!! aaaa 2019-04-16 18:02:44 +01:00
Thalpy a57dc622ef holder.dm should be fixed!! 2019-04-16 17:28:49 +01:00
Poojawa f58cc09aed Some slight fixes 2019-04-16 08:53:19 -05:00
Poojawa b3e894dcbb oh god oh fuck oh god it's snowballing 2019-04-16 07:40:37 -05:00
Poojawa a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Useroth f55b6ed18a Another round of unspaghettifying the code. A lot still to go. 2019-04-16 00:53:44 +02:00
Useroth 977462387c A couple of bugfixes. Also testing if I can even push to this repo. 2019-04-16 00:11:53 +02:00
Thalpy 02da3c524e Fixed reaction mechanics - pre status edits 2019-04-15 22:08:00 +01:00
Thalpy 3aa92325cf Jubiously day, I fixed the reaction, mostly and xeno broke 2019-04-15 01:05:32 +01:00
Thalpy e2fb670314 Fixed spelling of explode 2019-04-14 23:21:59 +01:00
Thalpy 3d4245905a Accidental double vars 2019-04-14 23:16:18 +01:00
Thalpy 68813cf12a fixed add_reagent 2019-04-14 23:11:55 +01:00
Thalpy f6a6e2b226 Merge branch 'FermiChem' of https://github.com/Thalpy/Citadel-Station-13 into FermiChem 2019-04-14 22:57:12 +01:00
Thalpy 0cee082e81 Added default fermichemvals to recipies 2019-04-14 22:57:08 +01:00
Thalpy bf647c38e8 Variables don't work as I thought and it makes me sad. 2019-04-14 19:52:23 +01:00
Thalpy e025ba8eb1 Fixed merge conflicts 2019-04-14 16:37:10 +01:00
Thalpy ccdd077a4c Bugfixes 2019-04-14 16:31:26 +01:00
Thalpy eac8478812 Minor deltapH tweaks 2019-04-14 06:02:35 +01:00
Thalpy a082b3c532 Fixed purity calculation issue 2019-04-14 05:56:38 +01:00
Thalpy ed27c5dfe4 Main reaction loop set up!! (I hope!!) 2019-04-14 05:38:43 +01:00
Thalpy 8e9ea0b506 Main reaction loop set up!! (I hope!!) 2019-04-14 05:31:04 +01:00
Poojawa 5f1db72ba3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-13 02:47:34 -05:00
Thalpy a86ef643b4 Mid progress through reaction mechanics. 2019-04-12 17:18:23 +01:00
Fermi 28ffc996f7 Added synthetic-derived growth factor amonst some bugfixes. 2019-04-12 05:10:00 +01:00
Fermi f059a19d8b Made plastic&metamaterial beakers slightly larger cause no one uses them 2019-04-12 00:44:54 +01:00
Fermi 5113b3aabc Added eigenstate chem effects, need to add reaction vars. 2019-04-12 00:42:01 +01:00
Trilbyspaceclone 690183b14f Update chem_dispenser.dm 2019-04-11 16:08:42 -04:00
Trilbyspaceclone be6dbd415e Update chem_dispenser.dm 2019-04-11 15:07:45 -04:00
Poojawa 03a174d21f compile fixes except we're memes still
why yes, I'm making the bloods all subtypes of each other at this point. I should probably change the way stuff is colored. but, meh. effort.
2019-04-07 08:54:05 -05:00
kevinz000 b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad
Addtion ways to deal with radiation
2019-04-06 19:14:46 -07:00
Poojawa 60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
deathride58 70ace01312 Merge pull request #8211 from Poojawa/hypo-belts
Medical belt overlays + hypo storage
2019-04-05 20:13:55 -04:00
kevinz000 b287362f99 Merge pull request #8191 from Trilbyspaceclone/patch-92
Makes chem dispenders upgradable once again!
2019-04-05 08:07:46 -07:00
Poojawa d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
Trilbyspaceclone b096e2f4cf Hmm cat brain fails 2019-04-04 16:27:21 -04:00
Trilbyspaceclone 0bf8d345e2 Update pill.dm 2019-04-04 15:52:46 -04:00
Trilbyspaceclone abf3cde518 Update medicine_reagents.dm 2019-04-04 15:20:00 -04:00
Trilbyspaceclone d4b9c06dd2 Update pill.dm 2019-04-04 14:59:23 -04:00
Trilbyspaceclone a1c8155ec8 Update chem_dispenser.dm 2019-04-02 15:42:18 -04:00
kevinz000 e16b632d6f Update holder.dm 2019-04-02 04:03:00 -07:00
JMFrench 1d9bf5b3b4 Moonsugar
Added Moonsugar effects
2019-04-01 18:01:39 +01:00
Trilbyspaceclone de7398b1ed Update chem_dispenser.dm 2019-03-31 23:48:10 -04:00
deathride58 684d6cf074 Merge pull request #8149 from Ragolution/fixes-the-cum
Fixes Semen Vent Foam
2019-03-31 21:25:28 -04:00
Trilbyspaceclone 1b1786800a Update chem_dispenser.dm 2019-03-31 20:29:07 -04:00
Trilbyspaceclone 5883b53a87 Update chem_dispenser.dm 2019-03-31 19:33:13 -04:00
Trilbyspaceclone b108505629 Update chem_dispenser.dm 2019-03-31 19:28:40 -04:00
kevinz000 e9558d1b17 Update pyrotechnics.dm 2019-03-23 12:38:23 -07:00
kevinz000 3175bf1db9 Update pyrotechnics.dm 2019-03-23 12:37:03 -07:00