Linzolle
|
b50804dfc3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection
|
2019-10-11 20:06:26 -05:00 |
|
Thalpy
|
6b986632be
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-11 22:23:18 +01:00 |
|
kevinz000
|
2e74833e72
|
Merge pull request #9444 from Thalpy/Updates-holder
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
|
2019-10-11 12:08:12 -07:00 |
|
Fermi
|
f165b5e813
|
darn nutrients.
|
2019-10-11 18:58:53 +01:00 |
|
Thalpy
|
e517ece612
|
Darnit beaker
|
2019-10-11 08:41:08 +01:00 |
|
Poojawa
|
2286d40882
|
why am I making it ignore injections????
The world may never know
|
2019-10-11 01:34:26 -05:00 |
|
Winter Flare
|
2bce423ec3
|
Added a -ton- of stuff to the Kinkmate
|
2019-10-10 14:08:14 -04:00 |
|
kevinz000
|
fb028b7997
|
Merge pull request #9432 from Putnam3145/pandemic-qol
Made PanD.E.M.I.C beaker stuff more like ChemMaster
|
2019-10-10 02:12:41 -07:00 |
|
Thalpy
|
8909b0f6c3
|
Merge branch 'master' into Updates-holder
|
2019-10-09 09:01:09 +01:00 |
|
Fermi
|
89d3a0534c
|
Tweaker
|
2019-10-09 07:53:20 +01:00 |
|
Fermi
|
ad0f34cdf8
|
Tweaks wiki a lil
|
2019-10-09 06:04:06 +01:00 |
|
Fermi
|
f5bc825ef0
|
Merge branch 'Wiki-fermi' into Updates-holder
|
2019-10-09 05:35:05 +01:00 |
|
Poojawa
|
26e35376d6
|
ok
|
2019-10-08 15:15:56 -05:00 |
|
Poojawa
|
c7f52fa292
|
Update other_reagents.dm
|
2019-10-08 14:29:22 -05:00 |
|
Poojawa
|
17090d9aff
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 13:51:02 -05:00 |
|
Fermi
|
10ce91c686
|
aaa
|
2019-10-08 13:45:16 +01:00 |
|
Fermi
|
b397c4868f
|
Theres a bit more limits now
|
2019-10-08 13:23:35 +01:00 |
|
Thalpy
|
9bb045b60a
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-08 13:10:35 +01:00 |
|
Fermi
|
db416defd6
|
Fixes/updates some chems.
|
2019-10-08 13:08:13 +01:00 |
|
Fermi
|
a9ad80691e
|
Okay this too
|
2019-10-08 12:57:06 +01:00 |
|
Fermi
|
f0e803f056
|
PANIC
|
2019-10-08 12:38:39 +01:00 |
|
Fermi
|
1da86bec1c
|
Kev pls
|
2019-10-08 12:31:01 +01:00 |
|
Fermi
|
bc118d5ead
|
Merge branch 'master' into Updates-holder
|
2019-10-08 12:21:56 +01:00 |
|
Fermi
|
06ad17e539
|
More mild
|
2019-10-08 12:16:33 +01:00 |
|
Fermi
|
b8c87a5f40
|
Spicy
|
2019-10-08 12:05:06 +01:00 |
|
Poojawa
|
d7ab97dffc
|
does some of the television's demands
|
2019-10-08 04:02:20 -05:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
GrayRachnid
|
9f8ad74bf9
|
New traumas and some other things.
|
2019-10-08 03:53:01 -04:00 |
|
kevinz000
|
8aacedaefa
|
Merge pull request #9316 from Thalpy/Reagents_bitflats
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
|
2019-10-08 00:33:21 -07:00 |
|
kevinz000
|
6fc746a5af
|
Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
|
2019-10-08 00:30:54 -07:00 |
|
kevinz000
|
3d404b6967
|
Merge pull request #9287 from Thalpy/Wiki
Adds a markdown parse of all chems for use with github wiki to debug menu.
|
2019-10-08 00:30:00 -07:00 |
|
kevinz000
|
76ede7a473
|
Merge pull request #9406 from Poojawa/carpet-colors
More Carpet colors and liquid carpet varients
|
2019-10-07 23:39:52 -07:00 |
|
kevinz000
|
dcb37bfd0e
|
Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
|
2019-10-07 23:36:11 -07:00 |
|
kevinz000
|
d3f29c4084
|
Merge pull request #9413 from Poojawa/sprays-obey-fashion
Makes Medsprays align with patches
|
2019-10-07 23:32:48 -07:00 |
|
Thalpy
|
564c1fde9f
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-08 07:31:03 +01:00 |
|
kevinz000
|
0073d99a22
|
Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
|
2019-10-07 23:29:19 -07:00 |
|
Putnam
|
caf9bc56da
|
Make replacement update icon
|
2019-10-07 01:34:22 -07:00 |
|
Putnam
|
b452de12ff
|
Made PanD.E.M.I.C beaker stuff more like ChemMaster
|
2019-10-07 01:23:17 -07:00 |
|
kevinz000
|
dd46509597
|
Merge pull request #9377 from Thalpy/Fixes_melting_grenades
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
|
2019-10-06 21:37:50 -07:00 |
|
Poojawa
|
ee5155bdbb
|
fixes oddities
|
2019-10-06 04:27:46 -05:00 |
|
Thalpy
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
Thalpy
|
5f5c719326
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-05 23:40:26 +01:00 |
|
Ghommie
|
3d22f4ec60
|
Porting a load of disease/symptoms code updates.
|
2019-10-05 07:14:25 +02:00 |
|
Poojawa
|
4edfbd1dfa
|
clarifying grammar
|
2019-10-04 17:23:41 -05:00 |
|
Poojawa
|
0c574fb62a
|
Update medicine_reagents.dm
|
2019-10-04 16:53:32 -05:00 |
|
Poojawa
|
26c7a0ddb7
|
Promotes more chemical variety
|
2019-10-04 16:45:25 -05:00 |
|
Poojawa
|
9f88a72142
|
Makes Medsprays align with patches
Also ensures you can't spray it on ghosts, ai eyes, etc.
|
2019-10-04 16:06:07 -05:00 |
|
Poojawa
|
e52652f8c8
|
Differing carpet reactions
|
2019-10-03 23:19:52 -05:00 |
|
Fermi
|
7f74a98372
|
.9
|
2019-10-04 04:55:36 +01:00 |
|
Fermi
|
62737884f0
|
lye was 13 oops
|
2019-10-04 04:55:16 +01:00 |
|