The0bserver
|
989fb101f0
|
No more Human Harvests!
|
2021-04-02 20:05:50 -04:00 |
|
Hatterhat
|
6e18f10ead
|
forgot i wasnt usin that oops
|
2021-01-17 01:50:28 -06:00 |
|
Hatterhat
|
cb1ef2d8ba
|
cotton stack pull
|
2021-01-17 01:42:32 -06:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
The0bserver
|
6304a4010b
|
provisional chanterelle fix
|
2020-10-04 01:41:57 -04:00 |
|
The0bserver
|
16425912da
|
fairygrass-dead -> grass-dead
|
2020-10-04 01:14:03 -04:00 |
|
silicons
|
1f82e8985c
|
Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
|
2020-10-01 12:15:49 -07:00 |
|
Blue Wildrose
|
13230d502e
|
oops I fucked up
|
2020-09-09 22:36:11 -07:00 |
|
Blue Wildrose
|
7f028899fa
|
Forgot valid salid - also included ambrosia deus, white cannabis, and lime fruit
|
2020-09-09 22:18:17 -07:00 |
|
The0bserver
|
5f5279d2ff
|
You wish for change... (Added instabilities.)
|
2020-09-02 03:15:03 -04: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
Winter Flare
|
482785d922
|
Fixes Bee Balm
|
2020-07-05 19:14:03 -04:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
The0bserver
|
ed4e6a7937
|
Actually adds juice results to laughpeas
|
2020-06-24 04:28:18 -04:00 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
Timothy Teakettle
|
34c9a2f821
|
part 4
|
2020-06-11 21:45:32 +01:00 |
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|