and Fermi
2bbcc7f660
Fixes them sneaky nades
2019-10-01 06:48:15 +01:00
kevinz000 and GitHub
8d9520ee58
Merge pull request #9336 from Thalpy/beakerpH_tweaks
...
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
2019-09-28 00:26:51 -07:00
kevinz000 and GitHub
3ce5b318ca
Merge pull request #9317 from Ghommie/Ghommie-cit199
...
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
2019-09-28 00:21:47 -07:00
and Fermi
146219edf9
Merge branch 'master' into beakerpH_tweaks
2019-09-27 11:50:31 +01:00
nik707 and GitHub
3f1f234686
Merge pull request #9170 from Trilbyspaceclone/more_cooking2
...
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
2019-09-26 23:54:17 -05:00
kevinz000 and GitHub
06eb6e1537
Merge pull request #9318 from Thalpy/clingy-Chems
...
[Fix] Fixes small residues of chems sitting in holders without breaking slow reactions.
2019-09-26 19:31:58 -07:00
TrilbySpaceClone
41fbb759b2
Merge branch 'master' into more_cooking2
2019-09-25 14:56:11 -04:00
Ghommie
5a822d95a4
M to L
2019-09-23 18:20:45 +02:00
Ghommie
1fa40dac38
Changes.
2019-09-23 17:25:08 +02:00
Ghommie
05a9b63b79
spam.
2019-09-23 17:06:15 +02:00
Ghommie
4795c60670
Reduces holy water message spam for blood/clock cultists.
2019-09-23 16:48:21 +02:00
and Fermi
0dcdede8fa
In response to poll and feedback.
2019-09-22 02:28:59 +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
e6a5530363
Fixes
2019-09-20 20:06:38 +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
08eeda97f5
Heck
2019-09-19 01:45:21 +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
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
