2688 Commits

Author SHA1 Message Date
Ghommie a65b4d0b1c hopefully a performance improvement to stop genitalia from having to update everytime. 2019-10-03 19:08:11 +02:00
Ghommie 7c77f2d2e3 testing... 2019-10-03 08:57:35 +02:00
Jay 70cbd8c1ca fixes bad icon path 2019-10-02 22:11:42 -05:00
Ghommie 6dbac16c74 Sanitizing the fermis code biohazard. 2019-10-03 04:31:11 +02:00
GrayRachnid ad9ddcb6da Reduces cell charge to 750, spoolup time to 1 and reduces self-stun if missed. 2019-10-02 19:30:23 -04:00
GrayRachnid e24c2ac249 Rebalances dogborg pounce/bite around the secborg's harmbaton. 2019-10-02 14:56:32 -04:00
Fermi c7a3651d5e Merge branch 'FERMICHEMCurTweaks' of https://github.com/Thalpy/Citadel-Station-13 into FERMICHEMCurTweaks 2019-10-02 19:42:35 +01:00
Fermi 7d6d2b6e8d Stops mech murder 2019-10-02 19:42:21 +01:00
Sishen 8b766130f8 Update eutactic_blades.dm 2019-10-02 12:48:17 -04:00
Chayse Ramsay 68ca8a5ac0 whoops 2019-10-02 11:55:38 +01:00
Ghommie 02df68a1cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-02 07:26:09 +02:00
Poojawa 0482973e8f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 22:38:12 -05:00
Sishen a2a6fa17fe Update eutactic_blades.dm 2019-10-01 23:33:14 -04:00
Thalpy bfee1c13ff Bhijin's requests. 2019-10-01 20:58:31 +01:00
Fermi 05d292afc8 Yeah 2019-10-01 08:28:37 +01:00
Fermi 6a420d6c6f Merge branch 'FERMICHEMCurTweaks' of https://github.com/Thalpy/Citadel-Station-13 into FERMICHEMCurTweaks 2019-10-01 08:24:36 +01:00
Fermi a4d1eba3b3 Boosts nantites 2019-10-01 08:24:18 +01:00
Thalpy cf8db59649 Merge branch 'master' into FERMICHEMCurTweaks 2019-10-01 08:20:16 +01:00
Fermi 89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
Poojawa 117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
Jay e0b8d28386 donator item 2019-09-30 22:16:27 -05:00
kevinz000 8d9520ee58 Merge pull request #9336 from Thalpy/beakerpH_tweaks
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
2019-09-28 00:26:51 -07:00
kevinz000 d7d4e3cbe2 Merge pull request #9349 from Ghommie/Ghommie-cit210
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-28 00:22:38 -07:00
Poojawa f14272e445 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-27 23:30:05 -05:00
Fermi f5c5e81e67 I thought I removed this in the original PR! 2019-09-27 14:16:36 +01:00
Fermi 146219edf9 Merge branch 'master' into beakerpH_tweaks 2019-09-27 11:50:31 +01:00
Thalpy 1bdb66d5de Okay a few things I just saw 2019-09-27 07:28:02 +01:00
Fermi cc87682c25 Fix and eigen tweak. 2019-09-26 09:04:06 +01:00
Fermi 60adaa9f1b Merge branch 'master' into FERMICHEMCurTweaks 2019-09-26 08:44:21 +01:00
Ghommie ee8f1022cc Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs. 2019-09-24 02:02:24 +02:00
Fermi 8dcf74d5f0 Makes buffers not react with stab agent 2019-09-22 12:02:20 +01:00
Poojawa 5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
Ghommie 33c3f0834e Prevents sofas being wielded and thus transformed into normal chairs. 2019-09-21 20:01:42 +02:00
Fermi 97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
Fermi f8dfb1e3aa Okay. 2019-09-21 12:45:10 +01:00
Fermi a3ae942c1d Okay.. I think this fixes it all. 2019-09-21 11:13:20 +01:00
kevinz000 af157e85fb Update living.dm 2019-09-21 01:48:58 -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 3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
kevinz000 f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
Fermi 15d36cbaa1 I need to stop leaving .dm files open in dreammaker. 2019-09-21 09:37:54 +01: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 a8747449c2 All good 2019-09-20 21:50:04 +01:00
Fermi d12fd72ebf Updates a buncha stuff. 2019-09-20 21:11:20 +01:00
Fermi 9b2f67d67d reagent_flags is used elsewhere, renamed to chemical_flags 2019-09-20 19:43:37 +01: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 70098f8bc8 Merge branch 'master' into Reagents_bitflats 2019-09-19 20:04:10 +01:00