Commit Graph

1964 Commits

Author SHA1 Message Date
Fermi faf6585b69 Winding down to the final commits. 2019-05-25 01:04:00 +01:00
Fermi 05aaeb4d70 Current state 2019-05-24 06:06:25 +01:00
Fermi b1c11071de Fixed acid to water and funbits. 2019-05-24 01:50:33 +01:00
Fermi 2f7a4082ab woooah. 2019-05-23 23:09:32 +01:00
Fermi a480ccb9fa Changes 2019-05-23 05:26:38 +01:00
Fermi f932fadfc6 Blood commit. 2019-05-22 18:46:46 +01:00
Fermi 7cb7f5de73 Update of master required. 2019-05-22 16:50:53 +01:00
Poojawa 971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Poojawa f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-22 00:08:13 -05:00
Fermi 485def8d28 More fixed upon the last! 2019-05-21 22:06:55 +01:00
Fermi ac3f0c790e Fixed compling errors from last time. 2019-05-21 20:28:40 +01:00
Fermi be4f188589 FermiChem? More like, FermiFixes! 2019-05-21 20:08:46 +01:00
deathride58 4a17f192e8 Merge pull request #8201 from Citadel-Station-13/kevinz000-patch-19
Changes OD thresholds to match RP server and only trigger when you /exceed/ it per definition of threshold
2019-05-21 08:05:54 -04:00
Fermi 71088eace9 More fixes 2019-05-21 05:05:32 +01:00
Fermi a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
Fermi bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01:00
Fermi a6ede9fecc Endless fixes 2019-05-19 23:32:30 +01:00
Fermi 072a4ce6a6 Sleepy fixes 2019-05-19 04:20:34 +01:00
Fermi 8130a10d3a Gosh darn fixes 2019-05-19 03:39:26 +01:00
Fermi 791d021d50 Even more fixes. 2019-05-19 01:37:20 +01:00
Fermi a837eda98b More fixes. 2019-05-18 22:50:20 +01:00
Fermi 0700e0c080 Near completion - missing Neko's pH paper and reaction vars. 2019-05-18 03:02:14 +01:00
Fermi 2f75f861ce Explode proc set up 2019-05-18 01:19:04 +01:00
Fermi cabf490134 Fixed compiling errors for Neko. 2019-05-17 16:57:42 +01:00
Fermi fa5531285a Push for Neko, probably doesn't compile atm. 2019-05-17 16:23:34 +01:00
deathride58 276a6e9896 Merge pull request #8307 from Citadel-Station-13/kevinz000-patch-49
buff sleepy pens to quickly drain stamina after 10 seconds
2019-05-17 00:54:17 -04:00
Poojawa 0f6677b956 Blood colors happens to footprints now.
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
2019-05-16 08:23:53 -05:00
Fermi 538c6e98ac On-mob_life proc doesn't work for some reason. Fix it/badger helpers. 2019-05-16 01:26:46 +01:00
Fermi 246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Fermi 6dba14eafd Final fix. 2019-05-15 05:34:16 +01:00
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
Poojawa 1a047c0068 I think I got it.
Also gibs should be better too.
2019-05-12 04:06:35 -05: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
Poojawa fcdc748bf1 u h g. I hate this 2019-05-10 07:07:09 -05: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
Poojawa 5ad532f723 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-09 03:08:54 -05:00
Poojawa 5a67114d33 get blood id is my foe now. 2019-05-08 04:53:51 -05:00
kevinz000 1e40a65536 buff this a bit 2019-05-08 01:31:00 -07:00
kevinz000 55d54592d5 Update toxin_reagents.dm 2019-05-08 01:30:24 -07:00
Poojawa 69eca2ae4b progress, just need to fiddle with footprints again 2019-05-07 13:23:49 -05:00
Poojawa d14943d4b0 well we have footprints now, xenoblood back to blood subtype. 2019-05-07 05:29:45 -05: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
Poojawa 105b40a4f8 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-06 02:53:42 -05:00
Fermi b71bc7d9dc Added happiness, psicodine, neurine and 2/6th of MC chem 2019-05-04 17:50:43 +01:00