97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
f8dfb1e3aa
Okay.
2019-09-21 12:45:10 +01:00
a3ae942c1d
Okay.. I think this fixes it all.
2019-09-21 11:13:20 +01:00
f0ea842c17
lil tweaks.
2019-09-21 09:58:37 +01:00
5608d37fd5
Merge pull request #9263 from Trilbyspaceclone/batter_up
...
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
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
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
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
2b80998f64
Adds: cybernetic_heart_u and VV viewer.
2019-09-21 04:19:34 +01:00
13cf5a7822
Updates
2019-09-20 22:51:14 +01:00
79011190c1
Merge branch 'master' into tg-Organ-port
2019-09-19 21:26:42 +01:00
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
5ecf68918b
tada
2019-09-18 03:47:52 -04:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01: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
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04:00
6da9f1c64c
Indent
2019-09-10 21:51:35 +01:00
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
275457001d
It didnt save my last change
2019-09-08 21:52:28 -04:00
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04: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
Fermi