silicons
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
silicons
|
b767c99bac
|
Merge branch '13144'
|
2020-08-16 18:48:14 -07:00 |
|
silicons
|
fe7d8860f5
|
Merge branch '13124'
|
2020-08-16 18:45:23 -07:00 |
|
Hatterhat
|
57e01902c5
|
density is kill
|
2020-08-16 14:53:19 -05:00 |
|
Hatterhat
|
07e44a176d
|
tempted to just remove the density tbqh
|
2020-08-16 14:52:34 -05:00 |
|
Hatterhat
|
609c7b9cb1
|
this should work for chucking shit over
|
2020-08-13 00:04:20 -05:00 |
|
Hatterhat
|
826e0c4647
|
todo: fix "window", wonder why passthrow isnt working
|
2020-08-12 22:44:52 -05:00 |
|
The0bserver
|
2b36c4dcdf
|
Regis, I will fight you, the irish, and some tea
|
2020-08-11 05:52:48 -04:00 |
|
The0bserver
|
5c6c298547
|
COOL PLANT FACTS:GARLIC WAS IN GROWING.DMI
|
2020-08-11 05:14:02 -04:00 |
|
The0bserver
|
66de3b5a4f
|
Garlic, you will have a harvest state
|
2020-08-11 03:03:36 -04:00 |
|
The0bserver
|
d20a9bcf21
|
Initial Commit: Weed less awful. Garlic visible
|
2020-08-11 02:45:45 -04:00 |
|
lolman360
|
6c57dce54e
|
WX
|
2020-08-09 23:52:21 +10:00 |
|
lolman360
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
silicons
|
8442d69858
|
Merge pull request #12963 from Seris02/morefix
ghost chilis fixed
|
2020-08-05 15:44:48 -07:00 |
|
Seris02
|
9b02b6619d
|
Update code/modules/hydroponics/grown/chili.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-08-06 06:44:17 +08:00 |
|
Letter N
|
454baea55f
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-04 09:31:34 +08:00 |
|
Letter N
|
9a9e3ffef5
|
fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category.
|
2020-08-03 21:14:17 +08:00 |
|
Timothy Teakettle
|
289c186f32
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-08-02 18:11:07 +01:00 |
|
silicons
|
8dfa3fcce8
|
Merge pull request #12947 from Seris02/podpersonfix
replica pod fix bounty
|
2020-08-01 03:29:16 -07:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
Letter N
|
0805265412
|
yet another batch. MAJOR: APC
|
2020-07-30 12:54:53 +08:00 |
|
Seris02
|
0772d6687f
|
ghost chilis fixed
|
2020-07-30 08:01:25 +08:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
Letter N
|
5d4bb48628
|
another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator
|
2020-07-29 15:10:01 +08:00 |
|
Seris02
|
dcd2c11f4e
|
yay indicator
|
2020-07-28 20:43:38 +08:00 |
|
Seris02
|
84e9f406c7
|
yay it fix time for indicator
|
2020-07-28 17:41:17 +08: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 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
lolman360
|
6b23138b31
|
l
|
2020-07-22 22:20:42 +10:00 |
|
lolman360
|
c07e5d544b
|
wweeee
|
2020-07-22 11:27:26 +10: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
|
fefc0530b8
|
Merge pull request #12795 from TheSpaghetti/patch-3
Makes extradimensional oranges weirder. [/TG/ PORT]
|
2020-07-20 16:54:43 -07:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
CameronWoof
|
431c52b7e2
|
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
|
2020-07-17 17:22:43 -07:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
TheSpaghetti
|
1e07a277f4
|
Makes extradimensional oranges weirder.
|
2020-07-16 03:17:28 -04:00 |
|
CameronWoof
|
a493ecdc4a
|
suture and mesh additions
|
2020-07-15 16:44:24 -07:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
silicons
|
31da81aff4
|
Merge pull request #12217 from Putnam3145/putnamos-for-real
The real fastmos: C++ monstermos port
|
2020-07-09 20:37:18 -07:00 |
|
Artur
|
9de8483bcf
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-09 22:14:20 +03:00 |
|
silicons
|
1b97c9954f
|
Merge pull request #12712 from TheObserver-sys/Imadeanoops
Hey, what if you could actually make the donuts?
|
2020-07-08 22:54:53 -07: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 |
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|