 Lin
|
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 |
|
|
silicons
|
20d9c74f9f
|
Merge pull request #12876 from timothyteakettle/species-are-dumb
tidies up species files
|
2020-07-26 22:52:00 -07:00 |
|
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
|
Iatots
|
a31e160227
|
this return stone keeps the null tigers away
|
2020-07-24 16:06:35 +02:00 |
|
|
Iatots
|
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 |
|
|
Iatots
|
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 |
|
|
Iatots
|
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 Teakettle
|
fa489efa79
|
spellcheck
|
2020-07-24 02:39:41 +01:00 |
|
|
Timothy Teakettle
|
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 |
|
|
Iatots
|
4da365851f
|
up to regulations now.
|
2020-07-23 21:27:00 +02:00 |
|
|
Iatots
|
21ef5fb1b7
|
Update other_reagents.dm
|
2020-07-23 21:14:46 +02:00 |
|
|
Iatots
|
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 |
|
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
|
silicons
|
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 Teakettle
|
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 |
|
|
silicons
|
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 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
|
silicons
|
72c5c2234e
|
ok
|
2020-07-12 05:15:55 -07:00 |
|
|
Lin
|
955d9fa0cc
|
Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
|
2020-07-11 16:40:38 -05:00 |
|
|
silicons
|
00867c064c
|
Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals
Drinkable and Sell-able Telecrystals
|
2020-07-11 00:49:15 -07:00 |
|
|
The0bserver
|
db625eb93f
|
Initial Commit: Adds slimeball recipe
|
2020-07-10 23:04:25 -04:00 |
|
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
|
HeroWithYay
|
bed6f4ac91
|
Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender.
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
|
2020-07-09 16:32:14 +12:00 |
|
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
|
silicons
|
0c0bf46f7f
|
Merge pull request #12696 from Chiirno/emichemmastertweak
increased the amount of stuff the chem master can dispense from 10 to 20
|
2020-07-06 17:34:50 -07:00 |
|
|
Cirno
|
45d97b2251
|
increased the amount of stuff the chem master can dispense from 10 to 20
|
2020-07-05 11:17:37 -03:00 |
|
|
silicons
|
e9c4ac8c3c
|
Merge pull request #12658 from timothyteakettle/okay-its-bad
slightly tweaks the cooking oil damage formula
|
2020-07-04 00:11:09 -07:00 |
|
|
Artur
|
f0154f3f1c
|
conflicts!!!
|
2020-07-03 15:45:11 +03:00 |
|
|
silicons
|
d85edbf8fb
|
ok
|
2020-07-03 02:15:06 -07:00 |
|
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
|
Sonic121x
|
ea7fed0c8e
|
givme that pilltype button
Fix pill type button
|
2020-07-02 22:30:28 +08:00 |
|
|
silicons
|
e2975a44a1
|
Merge branch 'master' into policy
|
2020-07-02 01:23:19 -07:00 |
|
|
Letter N
|
b35e3f2b93
|
fix: R&D Console, Vending, and chem master
|
2020-07-01 19:07:03 +08:00 |
|
|
timothyteakettle
|
0f0e0298e5
|
newline at end of file
|
2020-07-01 03:34:17 +01:00 |
|
|
timothyteakettle
|
d1f92da74a
|
20 is fine if we edit volume
|
2020-07-01 03:29:22 +01:00 |
|
|
timothyteakettle
|
4865831b6e
|
alright this is a bad meme
|
2020-07-01 03:28:37 +01:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
Artur
|
2797aefc3a
|
Clockworkslab and ui resizing
|
2020-06-30 01:05:43 +03:00 |
|