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 |
|
Ghommie
|
ec9bf9ed17
|
Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene.
|
2019-09-20 19:04:28 +02:00 |
|
Ghommie
|
277f031143
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
|
2019-09-20 02:27:39 +02:00 |
|
Fermi
|
3f2933adbf
|
Ghommies' requests.
|
2019-09-19 23:31:36 +01:00 |
|
Thalpy
|
79011190c1
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 21:26:42 +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
|
b9a2a5ce38
|
Oops
|
2019-09-19 15:41:26 +01:00 |
|
Fermi
|
a398f64b66
|
Okay
|
2019-09-19 15:33:40 +01:00 |
|
Fermi
|
40bac8c807
|
t
|
2019-09-19 14:44:12 +01:00 |
|
Fermi
|
d8e6f4247e
|
Traaavis
|
2019-09-19 13:40:44 +01:00 |
|
Trilbyspaceclone
|
cce3889abb
|
1/4 the blood taken rate
|
2019-09-19 08:39:17 -04:00 |
|
Linzolle
|
573932437e
|
COMMA
|
2019-09-18 23:55:52 -05:00 |
|
Linzolle
|
cd2e894ebe
|
display results and wording
|
2019-09-18 23:51:35 -05:00 |
|
Linzolle
|
4bf9c8cc84
|
citadel fixes
|
2019-09-18 23:15:05 -05:00 |
|
XDTM
|
023428f6a4
|
port experimental dissection
|
2019-09-18 23:04:11 -05:00 |
|
XDTM
|
8ad11d7250
|
ports ligament surgeries
|
2019-09-18 22:55:46 -05: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 |
|
Fermi
|
587568bf88
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 01:33:15 +01:00 |
|
Fermi
|
107dd67cbe
|
Well it compiles; just synthtissue and TongueLoss now.
|
2019-09-19 01:14:12 +01:00 |
|
Fermi
|
dfa40a4b22
|
tg Code complete, now to bugtest and clear compile errors.
|
2019-09-18 23:57:21 +01:00 |
|
BurgerLua
|
9003404ea8
|
Further tweak
|
2019-09-18 15:16:02 -07:00 |
|
BurgerLua
|
fe3117a006
|
Added Jetpack Tweaks
|
2019-09-18 14:49:00 -07:00 |
|
kappa-sama
|
34d109f6a2
|
on further thought, all of them
|
2019-09-18 17:12:06 -04:00 |
|
kappa-sama
|
9bdbf444e4
|
abductor batteries to tech tree
|
2019-09-18 17:09:24 -04:00 |
|
TrilbySpaceClone
|
5ecf68918b
|
tada
|
2019-09-18 03:47:52 -04: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 |
|
Ghommie
|
abb8450e29
|
ninja shoes.
|
2019-09-18 04:07:51 +02: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
|
3ba5a2fd69
|
Fixes undershirts n socks colors.
|
2019-09-17 18:34:16 +02:00 |
|
Fermi
|
c23d6f0113
|
I missed an earlier port.
|
2019-09-17 01:08:37 +01: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 |
|
Ghommie
|
f3a5e2e321
|
leftover legcuffs/handcuffs overlays fix.
|
2019-09-15 20:30:10 +02:00 |
|
Ghommie
|
300c572886
|
Added work boots and bananium clown shoes inhands, more fixes. ready.
|
2019-09-15 18:21:48 +02:00 |
|
Ghommie
|
89360c3574
|
Fixes clown shoes and work boots.
|
2019-09-15 17:56:20 +02:00 |
|
Ghommie
|
c813555697
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-09-15 04:05:14 +02:00 |
|