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
6b76b09449
Missed 2
2019-09-11 23:30:56 +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
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
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
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
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
Fermi
51a6ae96a0
R.data
2019-08-12 00:37:57 +01:00
Fermi
c0bbb099f8
Fixes disappearing chems.
2019-08-12 00:36:45 +01:00
Fermi
004b79d4cd
Vodka is alkaline
2019-08-08 15:31:07 +01:00
Fermi
99e95dcedf
Guess who forgot message admins
2019-08-07 18:57:38 +01:00
Fermi
10b2cec485
Adds a analyse function for advanced chems
2019-08-07 16:52:58 +01:00
Thalpy and GitHub
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
Ghommie
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
Fermi
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
kevinz000 and GitHub
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
Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Fermi
31709938c6
Pushing a buncha stuff so I can fix things.
2019-07-28 23:23:45 +01:00
kevinz000 and GitHub
e79bf3ab07
Merge pull request #8969 from Sishen1542/hypofix
...
chemmaster now spits out 60u hypovials
2019-07-27 21:54:36 -07:00
Ghommie
911f148003
Fixes hypovials unable to dump liquids and chem master unable to dispense in pill bottles.
2019-07-27 03:48:21 +02:00
Sishen
a1a626ba29
hypovial shit
...
iddqd
2019-07-25 19:11:58 -04:00
Thalpy and GitHub
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
kevinz000 and GitHub
ab3c5acb0e
Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT
...
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
2019-07-20 11:59:05 -07:00
deathride58 and GitHub
adaac8322c
Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47
...
buffs pepperspray to hardstun (knockdown + drop items) for 0.1 ds because for some reason we don't have a standalone knockdown without hardstun when are we porting the /tg/ mobility flags that I made?
2019-07-17 17:53:39 -04:00
BurgerLUA and GitHub
03ef2c5257
Merge branch 'master' into NO-MORE-FETISH-CONTENT
2019-07-17 14:17:33 -07:00
Thalpy and GitHub
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
Ghommie
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
kevinz000 and GitHub
c06d495731
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
...
REMOVE #C8A5DC. COLOR STRONG.
2019-07-14 14:48:49 -07:00
Thalpy and GitHub
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
kevinz000 and GitHub
2259ea2e1c
Merge pull request #8874 from Ghommie/Ghommie-cit132
...
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-14 03:33:37 -07:00
Thalpy and GitHub
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
kevinz000 and GitHub
280aa9da08
Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
...
Zelus oil - CWC gear
2019-07-12 07:41:28 -07:00
BurgerLua
5bd2f28d69
Removed #C8A5DC
2019-07-12 01:02:43 -07:00
Ghommie
d36bae06a7
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-12 07:39:17 +02:00
Trilbyspaceclone and GitHub
27a8876e99
I dont care anymore, It works in testing to function fine
...
I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim.
2019-07-11 01:15:39 -04:00
Trilbyspaceclone and GitHub
146276014c
Update other_reagents.dm
2019-07-10 20:42:12 -04:00
Trilbyspaceclone and GitHub
48e15307c5
Update other_reagents.dm
2019-07-10 19:14:57 -04:00
Trilbyspaceclone and GitHub
ac9c672fa8
I guess this is better
2019-07-10 18:56:32 -04:00
Trilbyspaceclone and GitHub
ed89ac874b
this was fine
2019-07-10 18:44:14 -04:00
Trilbyspaceclone and GitHub
baf4529e52
Update other_reagents.dm
2019-07-10 18:32:10 -04:00
d53d11de6b
Apply suggestions from code review
...
Grammer and such
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-07-10 18:21:03 -04:00
Fermi
8f555b0fdd
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
2019-07-10 21:35:47 +01:00
Trilbyspaceclone and GitHub
c9e13f8d62
better wording*
2019-07-10 02:43:18 -04:00
