Commit Graph

13130 Commits

Author SHA1 Message Date
Fermi
378af882d3 Ramping up to logging and a few more fixes. 2019-06-13 05:51:28 +01:00
Fermi
14aa7084a8 Breast rename. 2019-06-13 04:37:03 +01:00
Fermi
026f29ba46 Comments and logs. 2019-06-13 04:31:15 +01:00
Fermi
a3aa0408a3 Tongue 2019-06-13 03:37:15 +01:00
Fermi
c3892db433 Liver and lungs. 2019-06-13 03:34:33 +01:00
Fermi
a6b211a4a3 Fixes for beakers. 2019-06-13 03:25:16 +01:00
Fermi
91e58d896e Spelling is hard. 2019-06-13 03:24:02 +01:00
Fermi
93973b630c Moonsugar edit. 2019-06-13 03:08:01 +01:00
Fermi
b07f3b37ff Saline edit 2019-06-13 03:07:25 +01:00
Fermi
eab52a51e6 Fixed compile errors. 2019-06-13 03:05:34 +01:00
Fermi
981c1644c9 Holder changes; removed ferminew. 2019-06-13 02:47:05 +01:00
Fermi
3368d3d98b Fixed taste.dm 2019-06-13 02:32:42 +01:00
Fermi
5e4ced1a60 Sorta changes to say.dm 2019-06-13 02:26:04 +01:00
Fermi
099afc3c8e Removed hypnoflash TC 2019-06-13 02:21:37 +01:00
Fermi
70734b705a Forgot to commit to blood. 2019-06-13 02:01:42 +01:00
Fermi
7c73203fc2 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:58:28 +01:00
Fermi
9effbb1e33 Removed increase/decrease blood var. 2019-06-13 01:58:26 +01:00
Thalpy
ad8c1593f6 Reduced medical jargon on scanners. 2019-06-13 01:47:29 +01:00
Fermi
18292d4fc6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:46:10 +01:00
Fermi
c8bcca5964 Staged hypnoflash removal. 2019-06-13 01:45:48 +01:00
Fermi
fab603fabe Removed hypnotherapy quirk 2019-06-13 01:44:48 +01:00
Thalpy
f3a3e4c47a Removed hypnotherapy quirk 2019-06-13 01:31:28 +01:00
Thalpy
a9aa913860 Added remove() for bloodpressure 2019-06-13 01:24:50 +01:00
Fermi
7b764c9fa9 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:18:16 +01:00
Fermi
281c0ce582 Reduced happiness mood effects. 2019-06-13 01:02:39 +01:00
Fermi
463b4e19ec (var/mob/living/master = parent) fix 2019-06-13 01:01:19 +01:00
Thalpy
0fa194575a Update DNA.dm 2019-06-13 00:42:27 +01:00
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
255aa60441 Final pooj changes. 2019-06-02 22:57:50 +01:00
Fermi
0eec1ed3f3 Pooj changes. 2019-06-02 22:49:04 +01:00
Fermi
a5b3ec7939 Acid changes. 2019-06-02 22:38:55 +01:00
Fermi
a3e60843bc Renamed blood trait and spelt minutes right. 2019-06-02 22:35:16 +01:00
Fermi
4513dd9815 MINUTE define changes. 2019-06-02 22:26:53 +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
2a5bbfdafc Merge pull request #8482 from Ghommie/Ghommie-cit22
fixes pacifism eyestabbing, better this time.
2019-05-31 17:59:33 -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
16c89da587 Merge pull request #8485 from Trilbyspaceclone/plushies
More plushies - Reece Trilby Bhijn Box Justin
2019-05-31 17:55:37 -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