2316 Commits

Author SHA1 Message Date
Fermi d4990d2823 What 2019-04-23 23:05:40 +01:00
Fermi 51d7d62379 Midfix 2019-04-23 22:31:16 +01:00
Fermi 6ec913af78 Futher fixes 2019-04-23 20:55:59 +01:00
Fermi 10e9cd8b68 Minor tweaks and fixes to SDGF and Eigen. 2019-04-23 19:42:35 +01:00
Fermi 0ad81b1bb0 The addiction handling is beautiful. 2019-04-23 12:23:03 +01:00
Fermi 3ac2206f75 Added SDGF's fail chem; SDZF. 2019-04-23 09:41:58 +01:00
Fermi 4c302a1aa3 Small changes 2019-04-23 09:00:13 +01:00
Fermi 5f706f2f09 Added more the SDGF chem. 2019-04-23 08:44:41 +01:00
Fermi d6d6dc77f1 Fixes and tweaks to try to get things to work. 2019-04-23 07:32:56 +01:00
Useroth ac541ff9d2 Fuck if I know. 2019-04-23 08:17:25 +02:00
Useroth ef4b3b8ba1 Merge branch 'FermiChem' of https://github.com/Thalpy/Citadel-Station-13 into FermiChem
I'm not sure what the fuck happened but whatever.
2019-04-23 07:48:22 +02:00
Useroth 45c4e0acaf Let's try this approach 2019-04-23 07:46:32 +02:00
Fermi 09cd6f8b2f Added placeholders for SDGF 2019-04-23 06:41:02 +01:00
Fermi de5906b92d Quick fixes 2019-04-23 06:37:02 +01:00
Fermi 5e54cfd739 Fixed addition mechanics and reaction code. 2019-04-23 06:26:41 +01:00
kevinz000 ab090bd2c1 Start 2019-04-22 21:54:10 -07:00
Fermi 663b60fb15 Fermichem now reacts without hanging the server!! 2019-04-23 01:08:30 +01:00
Fermi 3ba7f57cd1 Setting FermiReact to be part of a PROCESSING call. 2019-04-22 23:53:16 +01:00
Fermi 744b1328e8 Fixing the main holder reaction loop - fermi is it's own proc 2019-04-22 20:08:19 +01:00
kevinz000 f38546b21a Merge pull request #8230 from Trilbyspaceclone/patch-97
[Ready] Makes Mentor chat have better colors as not to confuse Mentors from chat vs helping
2019-04-20 16:40:09 -07:00
kevinz000 901e748675 Merge pull request #8254 from Poojawa/the-great-vore-escape
clears blindness on vore OOC escape
2019-04-20 16:31:59 -07:00
kevinz000 60bc278418 Merge pull request #8227 from Trilbyspaceclone/patch-96
Magrifle/Magpistol nonlethals now do 2 damage rather than 0
2019-04-20 16:30:58 -07:00
Poojawa 1f65b1ebdd clears blindness on vore OOC escape 2019-04-17 01:27:08 -05:00
BurgerLua 7ff2b6817b No more seperate whatever 2019-04-16 21:06:57 -07:00
deathride58 fdd0eb4b17 Update modular_citadel/code/modules/integrated_electronics/subtypes/manipulation.dm
Co-Authored-By: BurgerLUA <BurgerLUA@users.noreply.github.com>
2019-04-16 15:40:55 -07:00
Fermi 390f9a635f Error message addition. 2019-04-16 23:03:24 +01:00
Fermi e038ba40c7 Fixing errors, down to one last error!! 2019-04-16 20:18:14 +01:00
BurgerLua d49178fd84 Removed debug code, made the arousal input just be a flat value. 2019-04-16 12:10:03 -07:00
BurgerLua dba2b6deaf Tweaks Electric Stimulator + Adds Bonermeter 2019-04-16 11:55:54 -07:00
Thalpy 887aad3bf3 Quick merge!! aaaa 2019-04-16 18:02:44 +01:00
Poojawa f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
Thalpy a57dc622ef holder.dm should be fixed!! 2019-04-16 17:28:49 +01:00
Poojawa b3e894dcbb oh god oh fuck oh god it's snowballing 2019-04-16 07:40:37 -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 b4d1b0e906 Midfix of chem side of fermichem 2019-04-15 22:59:19 +01:00
Poojawa 8862d63d0c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-15 14:37:14 -05:00
deathride58 530e021254 Merge pull request #8240 from Poojawa/human-taaaaaaaails
Fixes missing tail wag states
2019-04-15 10:01:45 -04:00
deathride58 c6ef9da679 Merge pull request #8239 from Citadel-Station-13/kevinz000-patch-36
Virgo hairs are now sorted better
2019-04-15 10:01:13 -04:00
Thalpy 0cee082e81 Added default fermichemvals to recipies 2019-04-14 22:57:08 +01:00
deathride58 905f32b193 further optimizes performance by making all of the meta gas properties use their own individual lists instead of being in a messy nested list 2019-04-14 16:40:37 -04:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
Thalpy ccdd077a4c Bugfixes 2019-04-14 16:31:26 +01:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
Thalpy ed27c5dfe4 Main reaction loop set up!! (I hope!!) 2019-04-14 05:38:43 +01:00
Poojawa ba2884d2c7 Fixes missing tail wag states
Also sorts the accessories file a bit more again
2019-04-13 22:01:55 -05:00
deathride58 a39dd310ba Merge branch 'master' into muzzled-masks 2019-04-13 17:48:24 -04:00
Poojawa 5f1db72ba3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-13 02:47:34 -05:00
kevinz000 03ae39f95a Merge pull request #8232 from Poojawa/voremobs
Vore capable simple mobs & fixes
2019-04-13 00:21:42 -07:00
kevinz000 a14092e138 Merge pull request #8216 from Poojawa/lewd-dna
Adds DNA to semen puddles
2019-04-13 00:19:20 -07:00