and Fermi
0dcdede8fa
In response to poll and feedback.
2019-09-22 02:28:59 +01:00
and Fermi
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
and Fermi
f8dfb1e3aa
Okay.
2019-09-21 12:45:10 +01:00
and Fermi
a3ae942c1d
Okay.. I think this fixes it all.
2019-09-21 11:13:20 +01:00
and Fermi
f0ea842c17
lil tweaks.
2019-09-21 09:58:37 +01:00
kevinz000 and GitHub
313956002b
Merge pull request #9269 from Thalpy/FermiGrenades
...
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
and Fermi
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
and Fermi
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
and Fermi
2b80998f64
Adds: cybernetic_heart_u and VV viewer.
2019-09-21 04:19:34 +01:00
and Fermi
491ff293c5
Tweaks and jazz
2019-09-21 02:59:06 +01:00
and Fermi
13cf5a7822
Updates
2019-09-20 22:51:14 +01:00
and Fermi
59c82894a1
Sprinkles!
2019-09-20 22:15:55 +01:00
and Fermi
55c3a48026
Oops
2019-09-20 21:56:39 +01:00
and Fermi
d12fd72ebf
Updates a buncha stuff.
2019-09-20 21:11:20 +01:00
and Fermi
e6a5530363
Fixes
2019-09-20 20:06:38 +01:00
and Fermi
9cca272986
Fixes quant errors, I hope.
2019-09-20 19:54:21 +01:00
and Fermi
79b1d33008
classic oops
2019-09-20 19:46:53 +01:00
and 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
and Fermi
3f2933adbf
Ghommies' requests.
2019-09-19 23:31:36 +01:00
Thalpy and GitHub
79011190c1
Merge branch 'master' into tg-Organ-port
2019-09-19 21:26:42 +01:00
and Fermi
b8190552f1
Update defines, and vars, and created new procs
2019-09-19 21:24:50 +01:00
and Fermi
d2c49d7987
On_mob_dead!
2019-09-19 20:30:35 +01:00
and Fermi
70098f8bc8
Merge branch 'master' into Reagents_bitflats
2019-09-19 20:04:10 +01:00
and Fermi
7ef5ab0332
TO TEST - also needs #9099 merging.
2019-09-19 17:52:45 +01:00
and Fermi
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
and Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
and Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
and Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01: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
Trilbyspaceclone and GitHub
5b2dba354a
Merge branch 'master' into fruit
2019-09-13 14:00:11 -04: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 and GitHub
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
Poojawa
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
and Fermi
6b76b09449
Missed 2
2019-09-11 23:30:56 +01:00
and Fermi
c003352d35
Made it 2.5x
2019-09-11 19:08:57 +01:00
and Fermi
db8586950f
Made it 3x
2019-09-11 19:07:40 +01:00
and Fermi
c79c4aafa5
Cleans up var/test into targetReagent
2019-09-11 18:51:05 +01:00
and Fermi
409cbe876a
Okay ACTUALLY does what I want it to.
2019-09-11 18:46:32 +01:00
and Fermi
d59196f430
oops
2019-09-11 16:38:55 +01:00
Thalpy and GitHub
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
and Fermi
29a6f12a4e
Alligns removal rate to be 2x instead of flat.
2019-09-11 15:00:58 +01:00
kevinz000 and GitHub
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
and Fermi
6da9f1c64c
Indent
2019-09-10 21:51:35 +01:00
kevinz000 and GitHub
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
and Fermi
816ae638a2
[TO_TEST]
2019-09-05 23:19:53 +01:00
and Fermi
29e5c1c10a
Still some residual chems kicking about..!!
2019-09-05 23:15:30 +01:00
Trilbyspaceclone and GitHub
dbdaae83b6
Update medicine_reagents.dm
2019-09-04 13:29:58 -04:00
TrilbySpaceClone
fd585aa6ea
Merge branch 'master' into more_cooking2
2019-09-03 11:22:38 -04:00
Trilbyspaceclone and GitHub
c616c0e288
Update food_reagents.dm
2019-09-02 20:00:38 -04:00
