Trilbyspaceclone
|
5b2dba354a
|
Merge branch 'master' into fruit
|
2019-09-13 14:00:11 -04:00 |
|
kevinz000
|
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 |
|
Fermi
|
6b76b09449
|
Missed 2
|
2019-09-11 23:30:56 +01:00 |
|
Fermi
|
c79c4aafa5
|
Cleans up var/test into targetReagent
|
2019-09-11 18:51:05 +01:00 |
|
Fermi
|
409cbe876a
|
Okay ACTUALLY does what I want it to.
|
2019-09-11 18:46:32 +01:00 |
|
Fermi
|
d59196f430
|
oops
|
2019-09-11 16:38:55 +01:00 |
|
kevinz000
|
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
|
829a2615c5
|
Merge pull request #9247 from Thalpy/QuantFix
Partially fixes tiny runaway decimals in reagents.
|
2019-09-10 10:27:40 -07:00 |
|
Fermi
|
816ae638a2
|
[TO_TEST]
|
2019-09-05 23:19:53 +01:00 |
|
Fermi
|
29e5c1c10a
|
Still some residual chems kicking about..!!
|
2019-09-05 23:15:30 +01:00 |
|
Trilbyspaceclone
|
dbdaae83b6
|
Update medicine_reagents.dm
|
2019-09-04 13:29:58 -04:00 |
|
TrilbySpaceClone
|
ea7235d089
|
Merge branch 'master' into fruit
|
2019-08-29 21:15:18 -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 |
|
Code-Cygnet
|
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
|
cce33ec7e5
|
Update drink_reagents.dm
|
2019-08-19 07:17:57 -04:00 |
|
Code-Cygnet
|
5840284e9e
|
Update alcohol_reagents.dm
Edited a typo at line 2144.
|
2019-08-18 22:14:41 -04:00 |
|
Code-Cygnet
|
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
|
bcf65dc901
|
Update drink_reagents.dm
|
2019-08-17 00:58:02 -04:00 |
|
Trilbyspaceclone
|
3851739533
|
Update other_reagents.dm
|
2019-08-17 00:06:58 -04:00 |
|
Trilbyspaceclone
|
c81fd8fcd4
|
Update drink_reagents.dm
|
2019-08-17 00:02:22 -04:00 |
|
Trilbyspaceclone
|
5225665516
|
kev fix
|
2019-08-16 23:48:41 -04:00 |
|
Trilbyspaceclone
|
0056e3eb61
|
Update other_reagents.dm
|
2019-08-13 11:49:00 -04:00 |
|
Trilbyspaceclone
|
3224e6ca4a
|
..()
|
2019-08-13 11:46:52 -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 |
|
TrilbySpaceClone
|
821463f59c
|
Nya
|
2019-08-11 11:47:56 -04: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
|
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
|
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 |
|
kevinz000
|
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 |
|
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
|
e79bf3ab07
|
Merge pull request #8969 from Sishen1542/hypofix
chemmaster now spits out 60u hypovials
|
2019-07-27 21:54:36 -07:00 |
|
Ghommie
|
acc338378d
|
One liner fix for the most useless feature of the year.
|
2019-07-27 19:44:17 +02: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 |
|
Ghommie
|
c06c1d9b60
|
typo.
|
2019-07-21 12:11:18 +02:00 |
|
Ghommie
|
ce4e86279c
|
Further improvements.
|
2019-07-21 11:58:58 +02:00 |
|
Ghommie
|
5504fb6a6a
|
Alt click examine string.
|
2019-07-21 11:27:26 +02:00 |
|
Ghommie
|
2f46b68e11
|
switching to non combat mode attack_self() and AltClick(), less clunky.
|
2019-07-21 11:22:19 +02:00 |
|
Ghommie
|
1a47fedade
|
More intuitive, way less weird edge cases.
|
2019-07-21 10:26:16 +02:00 |
|
Ghommie
|
fc78d02242
|
Fixing towels and improving them.
|
2019-07-21 09:58:54 +02:00 |
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
kevinz000
|
c657244d9b
|
Merge pull request #8920 from Ghommie/Ghommie-cit149
Towels.
|
2019-07-20 12:06:54 -07:00 |
|
kevinz000
|
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 |
|