Commit Graph

12247 Commits

Author SHA1 Message Date
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
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
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
JMFrench
1d9bf5b3b4 Moonsugar
Added Moonsugar effects
2019-04-01 18:01:39 +01:00
Fermi
8e2775bbe3 A few changes (mix edit for Neko)
MeowMeowMeowMeowMeowMeowMeow
2019-03-14 03:27:25 +00:00
Fermi
4558110dfb aaaa what did I doooo
Github pains me greatly
2019-03-11 18:21:09 +00:00
kevinz000
821a31afb8 Merge pull request #8090 from deathride58/tgpushes
Replaces disarm right click action with tgstation/tgstation#42958's disarm pushes
2019-03-10 13:51:44 -07:00
kevinz000
b17b2a0a4a Merge pull request #8097 from AmatsuDF/master
Adds Chilling effects to Slime Crossbreeding
2019-03-10 13:50:37 -07:00
kevinz000
698adb7c7d Merge pull request #8056 from deathride58/tegnerf
Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe
2019-03-10 13:48:42 -07:00
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
2019-03-10 13:44:57 -07:00
kevinz000
ac8636e127 Merge pull request #8084 from Poojawa/patch-4
Removes specific names from clone pod reports
2019-03-10 13:44:33 -07:00
kevinz000
4451d8e3ad Merge pull request #8070 from deathride58/consensualcults
Makes bloodcult conversions consensual, similar to Bay.
2019-03-10 13:44:20 -07:00
kevinz000
7628289ad6 Merge pull request #8091 from deathride58/fixesz1hyperspace
Fixes centcom zlevel hyperspace acting like normal space (and also fixes the title screen while im at it)
2019-03-10 13:43:21 -07:00
kevinz000
0652c32c23 Merge pull request #8058 from deathride58/joggingslipresistance
Makes jogging let you avoid water slips, but only if you have less than 20% staminaloss
2019-03-10 13:43:05 -07:00
kevinz000
b143f6f883 Merge pull request #8098 from Coolgat3/patch-2
Equalizes security helmet and beret armor
2019-03-10 13:42:44 -07:00