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
kevinz000
0a71762444
Merge pull request #9308 from Sishen1542/greyboiz2
...
fix greyshirt response team
2019-09-20 14:16:17 -07:00
Fermi
59c82894a1
Sprinkles!
2019-09-20 22:15:55 +01:00
Fermi
55c3a48026
Oops
2019-09-20 21:56:39 +01:00
Fermi
a8747449c2
All good
2019-09-20 21:50:04 +01:00
Fermi
d12fd72ebf
Updates a buncha stuff.
2019-09-20 21:11:20 +01:00
CitadelStationBot
8182eda2cb
Automatic changelog generation for PR #9203 [ci skip]
2019-09-20 14:09:36 -05:00
kevinz000
9108c1ce89
Merge pull request #9203 from Trilbyspaceclone/fancy
...
Makes brass tools look better*
2019-09-20 12:09:33 -07: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
74cc70ed72
Like this?
2019-09-20 03:16:26 +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
kevinz000
18afb348fe
Merge pull request #9294 from Poojawa/patch-1
...
Updates Travis to 512.1484
2019-09-19 10:25:32 -07:00
CitadelStationBot
65bcf40c9a
Automatic changelog generation for PR #9099 [ci skip]
2019-09-19 12:22:02 -05:00
kevinz000
0694dce05e
Merge pull request #9099 from Thalpy/NeuroFix
...
[Ready] [Please merge me] Fixes Neurotoxin and makes it a fermireaction. Additionally merges Fermireactions mechanics with all chems, making it possible for people to port chems over.
2019-09-19 10:21:59 -07: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
Sishen
fa4f05b919
Update ert.dm
2019-09-18 20:13:12 -04:00
CitadelStationBot
2c70bd097c
Automatic changelog generation for PR #9295 [ci skip]
2019-09-18 00:03:31 -05: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
CitadelStationBot
aa610617f8
Automatic changelog generation for PR #9302 [ci skip]
2019-09-18 00:01:02 -05: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
kevinz000
893f82f6bf
Merge pull request #9303 from Ghommie/Ghommie-cit198
...
Making sure #9301 works, speedmerging cut this commit out.
2019-09-17 21:59:29 -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
BlackMajor
2c0ab567fa
Merge pull request #9301 from Ghommie/Ghommie-cit198
...
flex-taping the gamebreaking bug with savefiles prefs.
2019-09-18 14:14:22 +12: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
CitadelStationBot
9d32611e64
Automatic changelog generation for PR #9277 [ci skip]
2019-09-16 17:25:34 -05:00
BlackMajor
adb3d6704b
Merge pull request #9277 from Poojawa/are-those-horns-are-are-you-just-retarded
...
Adding Horn colors, Alternate Digi Leg framework, and species squash
2019-09-17 10:25:31 +12: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
