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 |
|
kevinz000
|
0a71762444
|
Merge pull request #9308 from Sishen1542/greyboiz2
fix greyshirt response team
|
2019-09-20 14:16:17 -07:00 |
|
kevinz000
|
9108c1ce89
|
Merge pull request #9203 from Trilbyspaceclone/fancy
Makes brass tools look better*
|
2019-09-20 12:09:33 -07: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 |
|
Sishen
|
fa4f05b919
|
Update ert.dm
|
2019-09-18 20:13:12 -04:00 |
|
kevinz000
|
a6f4548349
|
Merge pull request #9295 from Ghommie/Ghommie-cit196
Raising police baton and tele baton cooldown from 0.8 to 1.4 seconds.
|
2019-09-17 22:03:29 -07: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
|
cc6e436e96
|
further fixes
|
2019-09-17 21:48:48 -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 |
|
Ghommie
|
5e52c62f29
|
actual balance.
|
2019-09-17 03:41:53 +02:00 |
|
Fermi
|
6814aae0f8
|
Tweaks!
|
2019-09-16 21:28:23 +01:00 |
|
Ghommie
|
0d9b284784
|
unneeded variable, no gameplay changes.
|
2019-09-16 18:12:05 +02:00 |
|
Ghommie
|
ca95d39a46
|
Slowing down police baton and tele baton speed.
|
2019-09-16 17:47:22 +02: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 |
|
Trilbyspaceclone
|
5b2dba354a
|
Merge branch 'master' into fruit
|
2019-09-13 14:00:11 -04:00 |
|
Poojawa
|
f0afc9c490
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-09-13 12:59:15 -05:00 |
|
Poojawa
|
9376bfb44d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
|
2019-09-13 12:56:57 -05:00 |
|
kevinz000
|
39beca1a0f
|
Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
|
2019-09-13 10:47:15 -07:00 |
|
kevinz000
|
e107c51e19
|
Merge pull request #9241 from Linzolle/oracleui
Ports Oracle UI framework, and updates UI for paper and disposal bins.
|
2019-09-13 10:46:11 -07:00 |
|
kevinz000
|
eab0b8934f
|
Merge pull request #9279 from Ghommie/Ghommie-cit192
Fixing undergarments color preferences resetting each round.
|
2019-09-13 10:43:43 -07:00 |
|
kevinz000
|
591a584785
|
Merge pull request #9275 from Thalpy/InitialD
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
|
2019-09-13 10:43:22 -07:00 |
|