Commit Graph

667 Commits

Author SHA1 Message Date
Fermi
2218956a09 Gearing up for PR 2019-05-15 05:27:09 +01:00
Fermi
0d907db516 Almost done. Just need to update reagent vars. 2019-05-14 21:20:38 +01:00
Fermi
76aec5a5ed Holder fixes 2019-05-14 16:51:03 +01:00
Fermi
3229e4bf3a Reverted holder, (sorry Kev) 2019-05-14 02:48:12 +01:00
Fermi
ec2f33ceb5 Added Hatmium and a few slight fixes. 2019-05-12 03:42:23 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Thalpy
926bd65392 Merge branch 'master' into FermiChem 2019-05-11 14:14:20 +01:00
Fermi
ac8b7be45c Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA) 2019-05-10 03:10:42 +01:00
Thalpy
5287f3f9c7 Merge branch 'master' into pr/7 2019-05-10 02:20:19 +01:00
deathride58
24cfef7329 Merge pull request #8299 from Citadel-Station-13/kevinz000-patch-48
disables skewium due to severe code issues
2019-05-06 22:08:16 -04:00
Fermi
b71bc7d9dc Added happiness, psicodine, neurine and 2/6th of MC chem 2019-05-04 17:50:43 +01:00
BurgerLua
1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
Fermi
f92995bc13 Mid MC 2019-05-02 11:34:42 +01:00
Fermi
55cb20ddc9 Small changes to SDGF. 2019-04-29 20:15:54 +01:00
Fermi
00804b9f61 Breasts are still bust
2 new react vars
New broken chems:
Furranium
Yeehaw
2019-04-29 19:30:36 +01:00
kevinz000
e9ce738879 Update toxin_reagents.dm 2019-04-28 03:44:01 -07:00
BurgerLua
fd19d67cc2 "Improves" how slurring works, and adjusts how fast you recover from slurring. 2019-04-25 11:57:02 -07:00
kevinz000
5430a9b673 damnit 2019-04-24 20:15:01 -07:00
kevinz000
8525eeb2b7 holder 2019-04-23 21:03:39 -07:00
Fermi
492f3fde88 Commited uncompliedable code (oops) 2019-04-23 22:38:18 +01:00
Fermi
51d7d62379 Midfix 2019-04-23 22:31:16 +01:00
Fermi
0ad81b1bb0 The addiction handling is beautiful. 2019-04-23 12:23:03 +01:00
Fermi
4c302a1aa3 Small changes 2019-04-23 09:00:13 +01:00
Fermi
d6d6dc77f1 Fixes and tweaks to try to get things to work. 2019-04-23 07:32:56 +01:00
Fermi
5e54cfd739 Fixed addition mechanics and reaction code. 2019-04-23 06:26:41 +01:00
Fermi
0cbefc35ee Quick test to fix. 2019-04-23 01:11:26 +01:00
Fermi
663b60fb15 Fermichem now reacts without hanging the server!! 2019-04-23 01:08:30 +01:00
Fermi
879efcd634 Changed processing to be SSprocessing instead of SSfastprocess. 2019-04-22 23:58:39 +01:00
Fermi
3ba7f57cd1 Setting FermiReact to be part of a PROCESSING call. 2019-04-22 23:53:16 +01:00
Fermi
95ed826faf quick fix to prevent unreactable reactions. 2019-04-22 20:39:35 +01:00
Fermi
53a93c4108 Few code fixes. 2019-04-22 20:31:09 +01:00
Fermi
744b1328e8 Fixing the main holder reaction loop - fermi is it's own proc 2019-04-22 20:08:19 +01:00
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
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