Commit Graph

7831 Commits

Author SHA1 Message Date
Fermi
f932fadfc6 Blood commit. 2019-05-22 18:46:46 +01:00
Fermi
41d991e81c Pre blood commit 2019-05-22 18:13:12 +01:00
Fermi
7cb7f5de73 Update of master required. 2019-05-22 16:50:53 +01:00
Fermi
e86585935f MidFix - compile unsafe. 2019-05-22 02:25:05 +01:00
Fermi
485def8d28 More fixed upon the last! 2019-05-21 22:06:55 +01:00
Fermi
ac3f0c790e Fixed compling errors from last time. 2019-05-21 20:28:40 +01:00
Fermi
be4f188589 FermiChem? More like, FermiFixes! 2019-05-21 20:08:46 +01:00
Fermi
71088eace9 More fixes 2019-05-21 05:05:32 +01: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
Fermi
a6ede9fecc Endless fixes 2019-05-19 23:32:30 +01:00
Fermi
072a4ce6a6 Sleepy fixes 2019-05-19 04:20:34 +01:00
Fermi
8130a10d3a Gosh darn fixes 2019-05-19 03:39:26 +01:00
Fermi
791d021d50 Even more fixes. 2019-05-19 01:37:20 +01:00
Fermi
a837eda98b More fixes. 2019-05-18 22:50:20 +01:00
Fermi
4ef1355933 Made "heyo" a phase 2 2019-05-18 03:32:58 +01:00
Fermi
0700e0c080 Near completion - missing Neko's pH paper and reaction vars. 2019-05-18 03:02:14 +01:00
Fermi
2f75f861ce Explode proc set up 2019-05-18 01:19:04 +01:00
Fermi
cabf490134 Fixed compiling errors for Neko. 2019-05-17 16:57:42 +01:00
Fermi
fa5531285a Push for Neko, probably doesn't compile atm. 2019-05-17 16:23:34 +01:00
Fermi
538c6e98ac On-mob_life proc doesn't work for some reason. Fix it/badger helpers. 2019-05-16 01:26:46 +01:00
Fermi
246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Fermi
6dba14eafd Final fix. 2019-05-15 05:34:16 +01:00
Fermi
2218956a09 Gearing up for PR 2019-05-15 05:27:09 +01:00
Fermi
0d907db516 Almost done. Just need to update reagent vars. 2019-05-14 21:20:38 +01:00
Fermi
76aec5a5ed Holder fixes 2019-05-14 16:51:03 +01:00
Fermi
3229e4bf3a Reverted holder, (sorry Kev) 2019-05-14 02:48:12 +01:00
Fermi
be27417633 Stuff and things 2019-05-13 18:07:51 +01:00
Fermi
ec2f33ceb5 Added Hatmium and a few slight fixes. 2019-05-12 03:42:23 +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
6a17d66323 Should be most compiling errors fixed outside of outdated merge problems 2019-05-11 14:04:43 +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
ac8b7be45c Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA) 2019-05-10 03:10:42 +01:00
Thalpy
5287f3f9c7 Merge branch 'master' into pr/7 2019-05-10 02:20:19 +01:00
Fermi
7d567fee63 MC chem 5.5/6 2019-05-10 02:00:17 +01:00
Fermi
854c0097d4 MC 5/6th done, probably. 2019-05-08 23:13:51 +01:00
kevinz000
a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
2019-05-08 01:34:33 -07:00
Fermi
1385e12fe3 MC 4/6th done 2019-05-07 23:38:50 +01:00
deathride58
2b1261ab03 Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44
adds sdql2 new()/instantiation call so it's easier to fill things with cream pies
2019-05-07 02:19:40 -04:00
deathride58
f318ad7d1b Merge pull request #8278 from Trilbyspaceclone/patch-106
Buffs blob Shield armor, as well as weaken state
2019-05-06 22:13:50 -04:00
deathride58
5e2a9669d1 Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45
vent_clog event now respects vent welding
2019-05-06 22:08:43 -04:00
deathride58
24cfef7329 Merge pull request #8299 from Citadel-Station-13/kevinz000-patch-48
disables skewium due to severe code issues
2019-05-06 22:08:16 -04:00
deathride58
9d6f85d555 Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47
adds message monitor to telecomms technode
2019-05-06 22:04:12 -04:00
deathride58
0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco
Muzzled Medical hardsuit fix and sprite organization
2019-05-06 21:58:44 -04:00
deathride58
aaa06473b7 Merge pull request #8276 from Citadel-Station-13/hahaha
Unironically adds elf ears
2019-05-06 21:23:55 -04:00
deathride58
bb9c479566 Merge pull request #8313 from BurgerLUA/SlurringFix
Fixes a few Slurring bugs
2019-05-06 21:00:33 -04:00
Trilbyspaceclone
9aa74f4fc2 Update all_nodes.dm 2019-05-06 19:58:45 -04:00
Fermi
f31a46e029 Fixed a few things, 1/2 way through MC chem. 2019-05-05 20:32:07 +01:00