Commit Graph

2033 Commits

Author SHA1 Message Date
Ghommie 1fa40dac38 Changes. 2019-09-23 17:25:08 +02:00
Ghommie 05a9b63b79 spam. 2019-09-23 17:06:15 +02:00
Ghommie 4795c60670 Reduces holy water message spam for blood/clock cultists. 2019-09-23 16:48:21 +02:00
Poojawa f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
XDTM 947bb8cc69 port muscled veins too why not 2019-09-22 19:59:17 -05:00
Poojawa 5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
Fermi bbe6b4ab15 Okay! Should be good. 2019-09-22 02:43:12 +01:00
Fermi 0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Fermi 97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
Fermi 13c28933c6 There we are 2019-09-21 13:51:27 +01:00
Fermi 4aca2c1b31 Breakout 2019-09-21 13:23:28 +01:00
Fermi f8dfb1e3aa Okay. 2019-09-21 12:45:10 +01:00
TrilbySpaceClone 45a5b4974d Merge branch 'master' into unmodular_2 2019-09-21 06:21:06 -04:00
Fermi a3ae942c1d Okay.. I think this fixes it all. 2019-09-21 11:13:20 +01:00
Fermi f0ea842c17 lil tweaks. 2019-09-21 09:58:37 +01:00
kevinz000 5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
kevinz000 313956002b Merge pull request #9269 from Thalpy/FermiGrenades
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
kevinz000 f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood
Its a blood bath! A BlueSpace Blood Bath!
2019-09-21 01:39:29 -07:00
Fermi a08c1229d6 OKAY now I'm done I think. 2019-09-21 09:31:53 +01:00
Fermi 4b44b31aa3 Okay, feature done 2019-09-21 08:24:46 +01:00
Fermi 2b80998f64 Adds: cybernetic_heart_u and VV viewer. 2019-09-21 04:19:34 +01:00
Fermi 491ff293c5 Tweaks and jazz 2019-09-21 02:59:06 +01:00
Fermi 2bd5ee184d THIS SHOULDN'T FIND IT'S WAY INTO A PR 2019-09-21 01:50:39 +01:00
Fermi 079fbbed2b Merge branch 'Reagents_bitflats' into Wiki-fermi 2019-09-21 01:40:13 +01:00
Fermi 0d49fdff54 Blob 2019-09-21 01:37:35 +01:00
Fermi 37a1e39744 Merge branch 'master' into Wiki 2019-09-21 01:29:45 +01:00
Fermi f37215ec5a Okay, few misses. 2019-09-21 01:26:48 +01:00
Fermi 5b11ffd281 Should be kinda working maybe. But with feeling!! 2019-09-21 01:23:26 +01:00
Fermi 8b477a8bcf Edits output to be a .md and now you can open it in game!! Magic! 2019-09-20 23:30:51 +01:00
Fermi 13cf5a7822 Updates 2019-09-20 22:51:14 +01:00
Fermi 59c82894a1 Sprinkles! 2019-09-20 22:15:55 +01:00
Fermi 55c3a48026 Oops 2019-09-20 21:56:39 +01:00
Fermi d12fd72ebf Updates a buncha stuff. 2019-09-20 21:11:20 +01:00
Fermi e6a5530363 Fixes 2019-09-20 20:06:38 +01:00
Fermi 9cca272986 Fixes quant errors, I hope. 2019-09-20 19:54:21 +01:00
Fermi 79b1d33008 classic oops 2019-09-20 19:46:53 +01:00
Fermi 9b2f67d67d reagent_flags is used elsewhere, renamed to chemical_flags 2019-09-20 19:43:37 +01:00
Ghommie ec9bf9ed17 Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene. 2019-09-20 19:04:28 +02:00
Fermi 3f2933adbf Ghommies' requests. 2019-09-19 23:31:36 +01:00
Thalpy 79011190c1 Merge branch 'master' into tg-Organ-port 2019-09-19 21:26:42 +01:00
Fermi b8190552f1 Update defines, and vars, and created new procs 2019-09-19 21:24:50 +01:00
Fermi d2c49d7987 On_mob_dead! 2019-09-19 20:30:35 +01:00
Fermi 70098f8bc8 Merge branch 'master' into Reagents_bitflats 2019-09-19 20:04:10 +01:00
Thalpy 641196b9dd Merge branch 'master' into FERMICHEMCurTweaks 2019-09-19 19:57:57 +01:00
Fermi 7ef5ab0332 TO TEST - also needs #9099 merging. 2019-09-19 17:52:45 +01:00
Fermi 08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Fermi 587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
TrilbySpaceClone 5ecf68918b tada 2019-09-18 03:47:52 -04:00
Fermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00