f898c99f62
Merge pull request #9304 from Trilbyspaceclone/bs_blood
...
Its a blood bath! A BlueSpace Blood Bath!
2019-09-21 01:39:29 -07:00
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
5ecf68918b
tada
2019-09-18 03:47:52 -04: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
5b2dba354a
Merge branch 'master' into fruit
2019-09-13 14:00:11 -04: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
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
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
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07: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
dbdaae83b6
Update medicine_reagents.dm
2019-09-04 13:29:58 -04:00
ea7235d089
Merge branch 'master' into fruit
2019-08-29 21:15:18 -04:00
c1d9e3f03b
Failing is frustrating
2019-08-29 00:37:18 +01:00
5b144ef1c6
Removed unused var
2019-08-29 00:13:24 +01:00
124d8503dc
Tests and fixes.
2019-08-29 00:12:16 +01:00
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
6c6391b4c4
Merge branch 'master' into fruit
2019-08-19 07:37:12 -04:00
cce33ec7e5
Update drink_reagents.dm
2019-08-19 07:17:57 -04:00
5840284e9e
Update alcohol_reagents.dm
...
Edited a typo at line 2144.
2019-08-18 22:14:41 -04:00
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
bcf65dc901
Update drink_reagents.dm
2019-08-17 00:58:02 -04:00
3851739533
Update other_reagents.dm
2019-08-17 00:06:58 -04:00
c81fd8fcd4
Update drink_reagents.dm
2019-08-17 00:02:22 -04:00
5225665516
kev fix
2019-08-16 23:48:41 -04:00
0056e3eb61
Update other_reagents.dm
2019-08-13 11:49:00 -04:00
3224e6ca4a
..()
2019-08-13 11:46:52 -04:00
51a6ae96a0
R.data
2019-08-12 00:37:57 +01:00
c0bbb099f8
Fixes disappearing chems.
2019-08-12 00:36:45 +01:00
821463f59c
Nya
2019-08-11 11:47:56 -04:00
251ac24e02
[NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction.
2019-08-11 00:35:36 +01:00
004b79d4cd
Vodka is alkaline
2019-08-08 15:31:07 +01:00
99e95dcedf
Guess who forgot message admins
2019-08-07 18:57:38 +01:00
10b2cec485
Adds a analyse function for advanced chems
2019-08-07 16:52:58 +01:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
25eba5829d
Merge pull request #8980 from Ghommie/Ghommie-cit159
...
Fixes hypovials unable to dump liquids and chem master unable to dispense in pill bottles.
2019-07-29 04:44:08 -07:00
3713533c18
Merge pull request #8983 from Ghommie/Ghommie-cit161
...
One liner fix for the most useless feature of the year.
2019-07-29 04:41:23 -07:00
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
kevinz000