Ghom
|
78e4c608ad
|
Merge pull request #10319 from Seris02/coconutsyep
porting azarak's coconuts from hyper station
|
2019-12-31 13:16:07 +01:00 |
|
Seris02
|
46c68f8fd8
|
Update code/modules/hydroponics/gene_modder.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-31 09:34:22 +08:00 |
|
Seris02
|
2e8c671a2f
|
Update code/modules/hydroponics/seeds.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-31 09:34:15 +08:00 |
|
Seris02
|
5e403dd0a7
|
Update code/modules/hydroponics/seeds.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-31 09:34:03 +08:00 |
|
Seris02
|
1030698c10
|
did this actually change anything
|
2019-12-30 21:18:05 +08:00 |
|
Seris02
|
84574a150b
|
weh
|
2019-12-30 21:00:25 +08:00 |
|
Seris02
|
f663c4db96
|
tiny fixes
|
2019-12-30 11:24:12 +08:00 |
|
Trilbyspaceclone
|
a2b79e043f
|
Update code/modules/hydroponics/grown/grass_carpet.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-29 14:57:22 -05:00 |
|
Trilbyspaceclone
|
94f305656d
|
Update grass_carpet.dm
|
2019-12-28 22:57:38 -05:00 |
|
Seris02
|
46f3a70c4b
|
even more weh.
|
2019-12-29 00:09:30 +08:00 |
|
Seris02
|
c0e8e55d70
|
more weh.
|
2019-12-29 00:07:11 +08:00 |
|
Seris02
|
4a2b7c2438
|
cocooooonuuuuuuts
|
2019-12-28 16:02:53 +08:00 |
|
kappa-sama
|
1dcee075e6
|
f
|
2019-12-26 14:20:43 -05:00 |
|
Ghom
|
a33065a728
|
Merge pull request #10190 from Trilbyspaceclone/honeysoda
The new buzz around the new soft drink
|
2019-12-21 18:34:35 +01:00 |
|
nik707
|
c1be6ba222
|
Merge pull request #10067 from Sishen1542/botnayn
You can change a plant's name, description and its seed's description by using a pen on the seed
|
2019-12-19 16:03:22 -06:00 |
|
Putnam3145
|
ed44b3130c
|
Merge pull request #10172 from Ghommie/Ghommie-cit460
Porting several quirks code updates.
|
2019-12-17 11:51:03 -08:00 |
|
Trilbyspaceclone
|
9a2311b72b
|
grammar
|
2019-12-15 02:42:17 -05:00 |
|
TrilbySpaceClone
|
c5cac186fc
|
bad notes bgone
|
2019-12-15 01:50:57 -05:00 |
|
Ghommie
|
b39ae815f3
|
Porting several quirks code updates.
|
2019-12-13 16:12:04 +01:00 |
|
Useroth
|
28ddfd29b6
|
Merge branch 'master' into new-tg-plants
|
2019-12-07 14:25:38 +01:00 |
|
Useroth
|
5f56d40f58
|
Incorporated the bamboo grammar fixes.
|
2019-12-07 06:41:24 +01:00 |
|
Useroth
|
1158c03ed7
|
Added bamboo.
|
2019-12-06 19:00:10 +01:00 |
|
Sishen
|
f6a64b31b7
|
b
|
2019-12-06 07:02:57 -07:00 |
|
Putnam3145
|
6b2d3b116d
|
Merge branch 'master' into Ghommie-cit430
|
2019-12-05 20:53:14 -08:00 |
|
kevinz000
|
e2f9a68c2c
|
Merge pull request #10049 from Useroth/new-tg-plants
Colored fairy grass, because fuck your eyes.
|
2019-12-05 21:43:24 -07:00 |
|
Ghommie
|
9ca7bb759c
|
Ports "Slightly improves visible and audible messages."
|
2019-12-06 02:02:12 +01:00 |
|
BlackMajor
|
b7d0cc6516
|
Merge pull request #9884 from Useroth/blackpowder-alternative
Black powder fix. Alternative to #9861
|
2019-12-06 11:32:17 +13:00 |
|
Useroth
|
f4bffdc56d
|
To make sure it doesn't runtime
|
2019-12-05 19:05:57 +01:00 |
|
Useroth
|
2e84c30e59
|
Tiny touch-ups
|
2019-12-05 16:29:50 +01:00 |
|
Useroth
|
950b884da5
|
Adds colored fairygrass.
|
2019-12-05 01:47:42 +01:00 |
|
Putnam3145
|
a196e3f45b
|
Merge pull request #9977 from Useroth/new-tg-plants
[FIX] Another patch for the recently added tg plants.
|
2019-11-30 22:23:41 -08:00 |
|
Useroth
|
85a6d588a8
|
[fix] Extradimensional oranges now actually grow properly and give proper seeds.
|
2019-11-28 09:26:52 +01:00 |
|
Linzolle
|
829cc3d81c
|
Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
|
2019-11-27 20:23:33 -06:00 |
|
kevinz000
|
6b53845f06
|
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
|
2019-11-26 16:01:48 -07:00 |
|
Putnam3145
|
8219d298a5
|
Merge pull request #9942 from Useroth/new-tg-plants
[Hotfix] Fixed the reagents in the new plants.
|
2019-11-25 04:39:20 -08:00 |
|
Useroth
|
99300229a1
|
Fixed the reagents in the new plants.
|
2019-11-25 13:35:26 +01:00 |
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13:00 |
|
Useroth
|
6a59cc1c99
|
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
|
2019-11-24 10:14:16 +01:00 |
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
Fermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
Fermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
Fermi
|
9eaed4ea8e
|
Revert "pls2"
This reverts commit 0eb635b908.
|
2019-11-24 03:02:04 +00:00 |
|
Fermi
|
cb4bfa65d1
|
Revert "?"
This reverts commit 05d18171e0.
|
2019-11-24 03:01:55 +00:00 |
|
Fermi
|
1f7e9d8ab5
|
Revert "please"
This reverts commit ac53c26d87.
|
2019-11-24 03:01:51 +00:00 |
|
Fermi
|
ac53c26d87
|
please
|
2019-11-24 02:58:15 +00:00 |
|
Fermi
|
05d18171e0
|
?
|
2019-11-24 02:57:46 +00:00 |
|
Fermi
|
0eb635b908
|
pls2
ugh
|
2019-11-24 02:52:17 +00:00 |
|
Fermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
Fermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|