Commit Graph

8140 Commits

Author SHA1 Message Date
Fermi
05067463c5 Missed a comment. 2019-06-06 23:02:14 +01:00
Fermi
83666abfea Small text edits and tightening up of self MKU OD. 2019-06-06 22:56:59 +01:00
Fermi
228ab5b7c9 +Acute hepatic pharmacokinesis. (untested, will test with alterations)CC 2019-06-05 00:23:42 +01:00
Fermi
40aa231b64 Made MKUltra's OD on self turn the player into a narcissist. 2019-06-01 04:31:34 +01:00
Thalpy
d9058fa53d Merge pull request #13 from Citadel-Station-13/master
OH BOY HERE WE GO AGAIN
2019-06-01 03:23:48 +01:00
kevinz000
70bad08f95 Merge pull request #8473 from Useroth/clown-fu
[MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.
2019-05-31 19:23:03 -07:00
Useroth
a46312ede6 Update godhand.dm 2019-06-01 04:20:27 +02:00
kevinz000
e63f9f385b Merge pull request #8359 from Useroth/pneumatic-and-stun-buff
[MERGE READY]Reduces the complexity of the two new circuits: pneumatic cannon and stunner.
2019-05-31 19:18:53 -07:00
Useroth
8af39b8da7 Update godhand.dm 2019-06-01 04:16:37 +02:00
Fermi
e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01:00
kevinz000
32f6427cf1 Merge pull request #8434 from Ghommie/Ghommie-cit16
I'm tired of my pulls on horizontal spacemen breaking off because of crawling delays.
2019-05-31 18:00:47 -07:00
kevinz000
8b27926fee Merge pull request #8463 from Trilbyspaceclone/metal_shields
Makeshift Metal shield crafting
2019-05-31 18:00:12 -07:00
kevinz000
140e065525 Merge pull request #8495 from BurgerLUA/Anti-Obese
Obesity is now a warning instead of a notice.
2019-05-31 17:59:09 -07:00
kevinz000
59e88e0808 Merge pull request #8477 from deathride58/portsnerditems
Ports the zulie cloak and blackredgold coat donor items from RP
2019-05-31 17:58:48 -07:00
kevinz000
7507831ffa Merge pull request #8449 from Trilbyspaceclone/patch-144
Makes PDA bomb cart cost 5 not 6
2019-05-31 17:52:40 -07:00
kevinz000
c645d2129f Merge pull request #8453 from Trilbyspaceclone/patch-148
Tuberculosis 12tc - > 8tc
2019-05-31 17:52:25 -07:00
kevinz000
4224606c5f Merge pull request #8452 from Trilbyspaceclone/patch-147
Makes mulligan cost only 3
2019-05-31 17:50:59 -07:00
kevinz000
61f9c2edcd Merge pull request #8461 from Trilbyspaceclone/patch-155
Makes golden toolboxes cost 3 not 5
2019-05-31 17:47:08 -07:00
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
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
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
Trilbyspaceclone
a8ec60d9c1 Update miscellaneous.dm 2019-05-30 13:51:55 -04: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
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