Commit Graph

9183 Commits

Author SHA1 Message Date
kevinz000 14d763bd1d Merge pull request #8459 from Trilbyspaceclone/patch-153
Syndicate Sentience Potion costing 2 from 4
2019-05-31 17:46:44 -07:00
kevinz000 8c6d8eb20b Merge pull request #8471 from Sishen1542/buttslol
Butt slaps fix & Masochism! (fixed)
2019-05-31 17:45:07 -07:00
kevinz000 854eb129f6 Merge pull request #8462 from Trilbyspaceclone/patch-156
Makes brainwash disks cost 3 tc not 5
2019-05-31 17:43:53 -07:00
kevinz000 1efdfd38e0 Merge pull request #8436 from Trilbyspaceclone/patch-137
Allows bio genes to make synth meat
2019-05-31 17:43:22 -07:00
kevinz000 f678741a0e Merge pull request #8470 from Ghommie/Ghommie-cit19
Undunks pepper spray & teargas.
2019-05-31 17:42:28 -07:00
kevinz000 ca16cd9467 Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS
[Ready] High alarm ERT suits
2019-05-31 17:41:39 -07:00
kevinz000 a96e414d2f Merge pull request #8486 from BlackMajor/Ooga
Supermatter no longer works while inside of a turf.
2019-05-31 17:40:30 -07:00
Fermi 2eceb6f57b Added a cybernetic tongue and sprites. Fixed furranium. 2019-06-01 01:28:52 +01:00
Fermi abfcc25e91 No changed, just staching a comment. 2019-05-31 23:54:30 +01:00
Trilbyspaceclone ddfe9812a1 Update shotgun.dm 2019-05-31 16:06:26 -04:00
BurgerLua 5f94441cc7 Adds Clockwork Reflectors 2019-05-30 22:52:43 -07:00
Fermi e1577111a0 TO BE TESTED: Added the ability for slimes to make MKUltra. 2019-05-31 05:09:07 +01:00
Fermi d0811e5be6 Adjusted lung health. 2019-05-31 04:26:41 +01:00
Fermi adeffe0c47 Fixed lungs. 2019-05-31 04:16:18 +01:00
Fermi 08e72ba05e Why does adjustLungLoss not workkkkkkkkkkkkkkkkk 2019-05-31 03:49:25 +01:00
Fermi f8005dd625 Moved the secret cat to the respective fermi.dms. 2019-05-31 02:47:08 +01:00
BurgerLua 5dc3542f90 added 2019-05-30 15:49:53 -07:00
Trilbyspaceclone c73884aea4 huh... 2019-05-30 16:12:40 -04:00
Trilbyspaceclone 751b9adb53 Update recipes.dm 2019-05-30 16:10:10 -04:00
Ghommie fa4cf533cb honestly AP bullet spam is ballocks too. 2019-05-30 20:20:05 +02:00
kevinz000 f5b3484e92 Merge pull request #8295 from Trilbyspaceclone/T_T
[Ready] Nerfs(Not really) Engi printing and organized many designs
2019-05-30 11:12:35 -07:00
Ghommie 85ab988842 0, null, and "", all fulfill the ! operator. 2019-05-30 20:09:19 +02:00
Trilbyspaceclone a8ec60d9c1 Update miscellaneous.dm 2019-05-30 13:51:55 -04:00
kevinz000 e75e629a8a Update code/modules/antagonists/changeling/powers/adrenaline.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-05-30 10:32:02 -07:00
Coolgat3 674e8a4227 Glubbs 2019-05-30 18:59:43 +02:00
Trilbyspaceclone 39700503f9 Update miscellaneous.dm 2019-05-30 11:40:37 -04:00
Trilbyspaceclone 618c2c070c Update ert.dm 2019-05-30 11:36:20 -04:00
BlackMajor 0d06605662 Supermatter eats the closed turf it's inside.
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
2019-05-30 16:17:33 +12:00
Useroth d8d9d6efeb Tweaks. Also, eating human pies makes them chestburst you a'la monkey cubes. 2019-05-29 23:45:25 +02:00
Thalpy a58766c885 Fixed explosions not occuring when temps were high enough. 2019-05-29 21:11:21 +01:00
Thalpy 90949f406d Fixed the forceMove issue. 2019-05-29 20:17:22 +01:00
Thalpy 71eb285472 Few tweaks and fixes to last commits. 2019-05-29 20:04:52 +01:00
Thalpy 6117e3a6aa Fixes to the hypnoflash, 2019-05-29 19:09:40 +01:00
Thalpy 6811896f34 Bloodmath redone. 2019-05-29 18:30:22 +01:00
Thalpy 45149ffc11 Beaker resistance check moved. 2019-05-29 18:29:56 +01:00
BlackMajor 93464b8f24 Adds bluespace compression kit 2019-05-30 02:46:34 +12:00
Ghommie 8fbc25ad77 Ports in combat gloves plus. 2019-05-29 16:35:56 +02:00
Useroth 16826eba66 Tweaks n' stuff. 2019-05-29 08:45:21 +02:00
Fermi ae35366e97 Some fixes before bed. 2019-05-29 05:41:12 +01:00
Fermi 6b4188ab86 British spellingggg 2019-05-29 04:33:46 +01:00
Fermi 7129969606 Some comments didn't delete properly. 2019-05-29 04:02:04 +01:00
Fermi 51b4bdb8ea Removed wizard edit (oops) 2019-05-29 03:57:43 +01:00
Fermi 67860a9fff Removed Kev File, sorry Kev. 2019-05-29 03:49:51 +01:00
Fermi 42513fda9b Pre extra file culling. 2019-05-29 03:49:14 +01:00
Fermi 336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Fermi 543dc9a399 Final fixes, finally fixed all problems. 2019-05-29 01:33:07 +01:00
deathride58 3feb11f12a Ports the zulie cloak and blackredgold coat donor items from RP 2019-05-28 19:38:08 -04:00
Trilbyspaceclone 5ead987d53 Update hierophant.dm 2019-05-28 19:01:32 -04:00
Trilbyspaceclone 69a39b4f67 Update hierophant.dm 2019-05-28 18:56:16 -04:00
Fermi 89665de8a7 Last round of test checks. 2019-05-28 22:33:04 +01:00