Commit Graph

9437 Commits

Author SHA1 Message Date
Fermi
4aca2c1b31 Breakout 2019-09-21 13:23:28 +01:00
Fermi
491ff293c5 Tweaks and jazz 2019-09-21 02:59:06 +01:00
Fermi
2bd5ee184d THIS SHOULDN'T FIND IT'S WAY INTO A PR 2019-09-21 01:50:39 +01:00
Fermi
079fbbed2b Merge branch 'Reagents_bitflats' into Wiki-fermi 2019-09-21 01:40:13 +01:00
Fermi
0d49fdff54 Blob 2019-09-21 01:37:35 +01:00
Fermi
37a1e39744 Merge branch 'master' into Wiki 2019-09-21 01:29:45 +01:00
Fermi
f37215ec5a Okay, few misses. 2019-09-21 01:26:48 +01:00
Fermi
5b11ffd281 Should be kinda working maybe. But with feeling!! 2019-09-21 01:23:26 +01:00
Fermi
8b477a8bcf Edits output to be a .md and now you can open it in game!! Magic! 2019-09-20 23:30:51 +01:00
Fermi
59c82894a1 Sprinkles! 2019-09-20 22:15:55 +01:00
Fermi
55c3a48026 Oops 2019-09-20 21:56:39 +01:00
Fermi
d12fd72ebf Updates a buncha stuff. 2019-09-20 21:11:20 +01:00
Fermi
9cca272986 Fixes quant errors, I hope. 2019-09-20 19:54:21 +01:00
Fermi
79b1d33008 classic oops 2019-09-20 19:46:53 +01:00
Fermi
9b2f67d67d reagent_flags is used elsewhere, renamed to chemical_flags 2019-09-20 19:43:37 +01:00
Fermi
3f2933adbf Ghommies' requests. 2019-09-19 23:31:36 +01:00
Fermi
b8190552f1 Update defines, and vars, and created new procs 2019-09-19 21:24:50 +01:00
Fermi
d2c49d7987 On_mob_dead! 2019-09-19 20:30:35 +01:00
Fermi
70098f8bc8 Merge branch 'master' into Reagents_bitflats 2019-09-19 20:04:10 +01:00
Fermi
7ef5ab0332 TO TEST - also needs #9099 merging. 2019-09-19 17:52:45 +01:00
Fermi
df4da58ce8 Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix 2019-09-19 01:46:32 +01:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
Thalpy
18ce46d7ec Merge branch 'master' into NeuroFix 2019-09-19 01:44:09 +01:00
kevinz000
2cf1e6ff85 Merge pull request #9302 from deathride58/jobcodesanitychecks
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
2019-09-17 22:00:59 -07:00
Ghommie
8bf4d5754e I'm a moron. 2019-09-18 04:23:52 +02:00
deathride58
18e97451a3 Merge branch 'master' into jobcodesanitychecks 2019-09-17 22:15:09 -04:00
deathride58
d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks 2019-09-17 20:15:06 -04:00
Ghommie
150da1d34a code quality 2019-09-18 01:37:17 +02:00
Ghommie
63fbf225a6 aaaaa 2019-09-18 01:24:44 +02:00
Ghommie
040b6472b4 FUCK 2019-09-18 01:21:18 +02:00
Fermi
6814aae0f8 Tweaks! 2019-09-16 21:28:23 +01:00
Poojawa
6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded 2019-09-15 23:25:22 -05:00
BlackMajor
5a58ac6875 Merge pull request #9027 from Poojawa/job-menu-improvements
Job menu improvements Except maybe Kevin will merge it this time instead of a month later
2019-09-16 16:19:42 +12:00
Fermi
41c8c7dde6 Why tho 2019-09-16 01:12:49 +01:00
Fermi
f6b96a818e Update 2019-09-15 00:55:40 +01:00
kevinz000
f3592a54a7 Merge pull request #9288 from Trilbyspaceclone/patch-227
Fixes orical UI being broken and taking modular files that are not a thing
2019-09-14 15:55:43 -07:00
Sishen
5159a58fef Update strained_muscles.dm 2019-09-14 12:00:28 -04:00
Trilbyspaceclone
bad8a816ab Update themed.dm 2019-09-14 06:51:19 -04:00
Poojawa
bf3d30c0e4 Seperates Insect fluff from wings
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa
0417c0d6af Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 23:28:08 -05:00
Poojawa
0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 23:26:27 -05:00
Poojawa
344ccaf20d cleans up some other species related stuff, unmodularizes some code 2019-09-13 22:18:53 -05:00
Fermi
e281384b7a It's actually less laggy than I thought. 2019-09-14 03:10:54 +01:00
Fermi
c823a2d23a Preview. 2019-09-14 03:09:32 +01:00
Fermi
80b79ef94e Mostly complete for now 2019-09-14 02:26:06 +01:00
Fermi
e62a491c18 Now does chem reactions too. 2019-09-14 00:08:23 +01:00
Fermi
80997e4ef3 Works. 2019-09-13 23:06:09 +01:00
Fermi
04b492924b Works kinda 2019-09-13 20:23:07 +01:00
Fermi
87de05622e Justin case 2019-09-13 19:26:20 +01:00
Fermi
eeddcfa295 I think it works, well, not sure about the CR stuff 2019-09-13 19:22:05 +01:00