d2c49d7987
On_mob_dead!
2019-09-19 20:30:35 +01:00
70098f8bc8
Merge branch 'master' into Reagents_bitflats
2019-09-19 20:04:10 +01:00
641196b9dd
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-19 19:57:57 +01:00
7ef5ab0332
TO TEST - also needs #9099 merging.
2019-09-19 17:52:45 +01:00
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
5ecf68918b
tada
2019-09-18 03:47:52 -04:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
6814aae0f8
Tweaks!
2019-09-16 21:28:23 +01:00
41c8c7dde6
Why tho
2019-09-16 01:12:49 +01:00
f6b96a818e
Update
2019-09-15 00:55:40 +01:00
ec4b1fba72
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 23:27:50 -05:00
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
e281384b7a
It's actually less laggy than I thought.
2019-09-14 03:10:54 +01:00
c823a2d23a
Preview.
2019-09-14 03:09:32 +01:00
80b79ef94e
Mostly complete for now
2019-09-14 02:26:06 +01:00
e62a491c18
Now does chem reactions too.
2019-09-14 00:08:23 +01:00
80997e4ef3
Works.
2019-09-13 23:06:09 +01:00
04b492924b
Works kinda
2019-09-13 20:23:07 +01:00
87de05622e
Justin case
2019-09-13 19:26:20 +01:00
eeddcfa295
I think it works, well, not sure about the CR stuff
2019-09-13 19:22:05 +01:00
5b2dba354a
Merge branch 'master' into fruit
2019-09-13 14:00:11 -04:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
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
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
44cff04515
Atom stop crashing pls
2019-09-13 18:03:39 +01:00
2bf4d00d29
Double checking my work
2019-09-12 00:46:18 -05:00
65a89030eb
reverts the bleed changes till they can be better tuned
2019-09-12 00:14:26 -05:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
6b76b09449
Missed 2
2019-09-11 23:30:56 +01:00
c003352d35
Made it 2.5x
2019-09-11 19:08:57 +01:00
db8586950f
Made it 3x
2019-09-11 19:07:40 +01:00
c79c4aafa5
Cleans up var/test into targetReagent
2019-09-11 18:51:05 +01:00
409cbe876a
Okay ACTUALLY does what I want it to.
2019-09-11 18:46:32 +01:00
d59196f430
oops
2019-09-11 16:38:55 +01:00
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
29a6f12a4e
Alligns removal rate to be 2x instead of flat.
2019-09-11 15:00:58 +01:00
17f6304acf
hm
2019-09-11 06:54:50 -04:00
6353bd1064
Cult heals do bleed stopping
...
blood cap raised because honestly there's so much bleed_rate heal available now too
2019-09-11 04:37:22 -05:00
ff0c3ee844
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
...
The art of drunken captaining
2019-09-10 22:06:36 -07:00
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04:00
6da9f1c64c
Indent
2019-09-10 21:51:35 +01:00
ce5095321c
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-10 20:52:31 +01:00
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
275457001d
It didnt save my last change
2019-09-08 21:52:28 -04:00
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
816ae638a2
[TO_TEST]
2019-09-05 23:19:53 +01:00
29e5c1c10a
Still some residual chems kicking about..!!
2019-09-05 23:15:30 +01:00
Fermi