 Putnam
|
467f66b2a6
|
Removed crocin/hexacrocin.
|
2020-08-08 00:46:30 -07:00 |
|
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
|
Letter N
|
5b63f0acce
|
fix fix fix^2
|
2020-08-07 15:15:34 +08:00 |
|
|
TrilbySpaceClone
|
3ae10ac826
|
update?
|
2020-08-06 13:09:41 -04:00 |
|
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
|
silicons
|
815ddd1866
|
oh boy
|
2020-08-05 21:34:26 -07:00 |
|
|
TrilbySpaceClone
|
5d5459a318
|
Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea
|
2020-08-04 10:07:10 -04:00 |
|
|
TrilbySpaceClone
|
f2e4b7eacc
|
grammer
|
2020-08-04 10:07:04 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
4ea05ab07e
|
Update drink_reagents.dm
|
2020-08-04 09:33:05 -04:00 |
|
|
TrilbySpaceClone
|
0f29235e6a
|
Tea Party
|
2020-08-04 09:15:44 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
e1e6198140
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-03 10:53:08 -04:00 |
|
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
|
Letter N
|
10fefca674
|
another batch. MAJOR: chem_master, pandemic
|
2020-07-30 14:06:20 +08:00 |
|
|
Timothy TeakettleandGitHub
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
|
LinandGitHub
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
|
siliconsandGitHub
|
20d9c74f9f
|
Merge pull request #12876 from timothyteakettle/species-are-dumb
tidies up species files
|
2020-07-26 22:52:00 -07:00 |
|
|
timothyteakettle
|
28bf5d2344
|
remove c
|
2020-07-26 23:15:56 +01:00 |
|
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
|
timothyteakettle
|
3467bf3515
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-07-26 00:25:26 +01:00 |
|
|
timothyteakettle
|
3ca098fe98
|
bugfixes
|
2020-07-25 00:22:24 +01:00 |
|
|
timothyteakettle
|
8360bb1a7f
|
section 2
|
2020-07-24 23:44:57 +01:00 |
|
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
|
IatotsandGitHub
|
a31e160227
|
this return stone keeps the null tigers away
|
2020-07-24 16:06:35 +02:00 |
|
|
|
83c6dc65ba
|
Update code/modules/reagents/chemistry/reagents/other_reagents.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
|
2020-07-24 15:22:56 +02:00 |
|
|
|
2eade6c149
|
Update code/modules/reagents/chemistry/reagents/other_reagents.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
|
2020-07-24 15:22:38 +02:00 |
|
|
IatotsandGitHub
|
a9c51fc624
|
Update other_reagents.dm
|
2020-07-24 08:40:48 +02:00 |
|
|
timothyteakettle
|
060b3dcd04
|
im sorry moths
|
2020-07-24 03:27:44 +01:00 |
|
|
Timothy TeakettleandGitHub
|
fa489efa79
|
spellcheck
|
2020-07-24 02:39:41 +01:00 |
|
|
Timothy TeakettleandGitHub
|
ed8723e74e
|
Merge branch 'master' into species-are-dumb
|
2020-07-23 22:15:10 +01:00 |
|
|
Timothy Teakettle
|
8f8aaee36c
|
fixes up drinks
|
2020-07-23 22:09:14 +01:00 |
|
|
Timothy Teakettle
|
450509347a
|
tidy species more
|
2020-07-23 21:57:32 +01:00 |
|
|
IatotsandGitHub
|
4da365851f
|
up to regulations now.
|
2020-07-23 21:27:00 +02:00 |
|
|
IatotsandGitHub
|
21ef5fb1b7
|
Update other_reagents.dm
|
2020-07-23 21:14:46 +02:00 |
|
|
IatotsandGitHub
|
967dfb7bc4
|
Update other_reagents.dm
|
2020-07-23 19:59:08 +02:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
lolman360
|
0854702762
|
whoops
|
2020-07-22 12:45:42 +10:00 |
|
|
lolman360
|
17d1fd0692
|
fixes
|
2020-07-22 12:42:46 +10:00 |
|
|
lolman360
|
0f1aa3c0ca
|
'lolman? did you test your code?'
no i did not ms. kevinz
|
2020-07-22 10:49:56 +10:00 |
|
|
Timothy TeakettleandGitHub
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
|
siliconsandGitHub
|
3d2995b4e8
|
Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
|
2020-07-20 17:01:32 -07:00 |
|
|
silicons
|
416b989e12
|
changes
|
2020-07-20 11:35:10 -07:00 |
|
|
Timothy Teakettle
|
eab0ae8af0
|
small changes
|
2020-07-20 17:20:54 +01:00 |
|
|
timothyteakettle
|
e2b68797b7
|
bugfixes
|
2020-07-20 00:49:00 +01:00 |
|
|
timothyteakettle
|
8709a72fc0
|
fry everything
|
2020-07-20 00:40:18 +01:00 |
|
|
Timothy TeakettleandGitHub
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
|
CameronWoof
|
431c52b7e2
|
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
|
2020-07-17 17:22:43 -07:00 |
|
|
siliconsandGitHub
|
c924290cd1
|
Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
Slime Extractification
|
2020-07-17 17:10:32 -07:00 |
|
|
CameronWoof
|
a493ecdc4a
|
suture and mesh additions
|
2020-07-15 16:44:24 -07:00 |
|
|
Artur
|
d0f1a805e4
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-14 16:15:48 +03:00 |
|