and Fermi
e281384b7a
It's actually less laggy than I thought.
2019-09-14 03:10:54 +01:00
and Fermi
c823a2d23a
Preview.
2019-09-14 03:09:32 +01:00
and Fermi
80b79ef94e
Mostly complete for now
2019-09-14 02:26:06 +01:00
and Fermi
e62a491c18
Now does chem reactions too.
2019-09-14 00:08:23 +01:00
and Fermi
80997e4ef3
Works.
2019-09-13 23:06:09 +01:00
and Fermi
04b492924b
Works kinda
2019-09-13 20:23:07 +01:00
and Fermi
87de05622e
Justin case
2019-09-13 19:26:20 +01:00
and Fermi
eeddcfa295
I think it works, well, not sure about the CR stuff
2019-09-13 19:22:05 +01: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
and Fermi
44cff04515
Atom stop crashing pls
2019-09-13 18:03:39 +01: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
TrilbySpaceClone
17f6304acf
hm
2019-09-11 06:54:50 -04: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
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04: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
Trilbyspaceclone and GitHub
275457001d
It didnt save my last change
2019-09-08 21:52:28 -04:00
TrilbySpaceClone
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04: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
TrilbySpaceClone
36695d556f
Lets have all the ammo and kegs together
2019-08-31 15:38:26 -04:00
TrilbySpaceClone
ea7235d089
Merge branch 'master' into fruit
2019-08-29 21:15:18 -04:00
TrilbySpaceClone
d3852ebd56
even more
2019-08-29 19:39:10 -04:00
Fermi
c1d9e3f03b
Failing is frustrating
2019-08-29 00:37:18 +01:00
Fermi
5b144ef1c6
Removed unused var
2019-08-29 00:13:24 +01:00
Fermi
124d8503dc
Tests and fixes.
2019-08-29 00:12:16 +01:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
167b18d045
Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
...
Error spotted at 2138 and fixed by Sishen, aka Papa Pax!
Co-Authored-By: Sishen1542 <sishen1542@gmail.com >
2019-08-19 15:28:51 -04:00
TrilbySpaceClone
6c6391b4c4
Merge branch 'master' into fruit
2019-08-19 07:37:12 -04:00
Trilbyspaceclone and GitHub
cce33ec7e5
Update drink_reagents.dm
2019-08-19 07:17:57 -04:00
Code-Cygnet and GitHub
5840284e9e
Update alcohol_reagents.dm
...
Edited a typo at line 2144.
2019-08-18 22:14:41 -04:00
Code-Cygnet and GitHub
975a33aad7
Update alcohol_reagents.dm
...
Adds commander and chief, starting at line 2125 and ending at 2146.. hopefully.
2019-08-17 19:38:58 -04:00
Trilbyspaceclone and GitHub
bcf65dc901
Update drink_reagents.dm
2019-08-17 00:58:02 -04:00
Trilbyspaceclone and GitHub
3851739533
Update other_reagents.dm
2019-08-17 00:06:58 -04:00
Trilbyspaceclone and GitHub
c81fd8fcd4
Update drink_reagents.dm
2019-08-17 00:02:22 -04:00
Trilbyspaceclone and GitHub
5225665516
kev fix
2019-08-16 23:48:41 -04:00
Trilbyspaceclone and GitHub
0056e3eb61
Update other_reagents.dm
2019-08-13 11:49:00 -04:00
