Commit Graph

1353 Commits

Author SHA1 Message Date
Fermi
eab52a51e6 Fixed compile errors. 2019-06-13 03:05:34 +01:00
Fermi
9effbb1e33 Removed increase/decrease blood var. 2019-06-13 01:58:26 +01:00
Fermi
18292d4fc6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:46:10 +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
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
Fermi
0eec1ed3f3 Pooj changes. 2019-06-02 22:49:04 +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
e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01:00
Fermi
ee2d75ae22 Removed special screen obj, as I didn't like how they looked. 2019-05-30 20:05:06 +01:00
Trilbyspaceclone
0eb468e3a5 Update ert.dm 2019-05-30 11:33:38 -04: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
af80bf3204 MINUTE defines. 2019-05-29 18:41:51 +01:00
Fermi
ae35366e97 Some fixes before bed. 2019-05-29 05:41:12 +01:00
Fermi
336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Fermi
4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00
Fermi
4cb697d2ec Final changes before checks. 2019-05-26 17:37:20 +01:00
Fermi
91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
kevinz000
d0819246bc Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
Fermi
f932fadfc6 Blood commit. 2019-05-22 18:46:46 +01:00
nero1024
732bb6575b tweak footstep frequency 2019-05-21 14:49:15 -05:00
kevinz000
a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker
[Ready]Makes a blue space bike horn HONK
2019-05-20 23:40:17 -07:00
Fermi
a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
Fermi
bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01:00
Nero1024
cbdb98988c fix footsteps for naga/tentacle 2019-05-17 20:42:54 -05:00
Nero1024
752f368ed2 Ports additional footsteps
And actually make it all compile.
2019-05-17 19:12:22 -05:00
Nero1024
2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
Poojawa
f95da1aae5 Heart Attacks will murder you now
Also sanity check for cursed heart overlay
2019-05-17 05:59:28 -05:00
Fermi
246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Fermi
ec2f33ceb5 Added Hatmium and a few slight fixes. 2019-05-12 03:42:23 +01:00
Fermi
ddad7a173d All compiling errors fixed!! I did it!! 2019-05-11 15:47:58 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Thalpy
926bd65392 Merge branch 'master' into FermiChem 2019-05-11 14:14:20 +01:00
Fermi
6466ef562c 100 down, 66 to go. 2019-05-11 02:05:25 +01:00
Fermi
29d4a2fdde Finished MCchem, now to fix compling errors. 2019-05-11 00:14:04 +01:00
Fermi
b71bc7d9dc Added happiness, psicodine, neurine and 2/6th of MC chem 2019-05-04 17:50:43 +01:00
kevinz000
709e3375ac Merge pull request #8283 from BurgerLUA/NoMoreOfThisShit
Adds a new trait that makes you immune* to Crocin and Hexacrocin
2019-04-30 05:28:55 -07:00
kevinz000
7c1d7b60d0 Merge pull request #8287 from Trilbyspaceclone/Lock_and_key
Lockable Collars - Requested by Frack
2019-04-30 05:18:14 -07:00
Useroth
cd5317d137 Fixed katana jaunt not working on dark tiles. 2019-04-28 15:49:00 +02:00
Trilbyspaceclone
33e3df8157 What in the hell? 2019-04-25 20:46:39 -04:00
Trilbyspaceclone
a69b845509 Update pockets.dm 2019-04-25 20:41:34 -04:00
BurgerLua
1f78520b68 Adds a new trait that makes you immune from the "positive" effects of hexacrocin and crocin. 2019-04-24 20:13:21 -07:00
Poojawa
f767069dc2 Custom Species names 2019-04-15 13:50:21 -05:00
kevinz000
18ccc7d1f0 Merge pull request #8208 from Trilbyspaceclone/patch-93
Local cat forgets to add the same word twice braking a quirk - The fixing
2019-04-06 19:13:06 -07:00
kevinz000
2eefef2681 Merge pull request #8196 from deathride58/definetimeprocs
Attempts to improve the performance of /mob/Stat() by turning various time procs into defines
2019-04-03 23:46:02 -07:00
Trilbyspaceclone
9e020eedf7 Update good.dm 2019-04-03 22:44:30 -04:00