shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

244 Commits

Author SHA1 Message Date
TheObserver-sys
e4063311fb Finally, peas. (#12211) 
* Establishment of peas, at last. Comes with two mutations! (NO SPRITES YET,SAVING SO I LOSE NO WORK)

* Fixed some shit in my code, like mispellings and an illegal color. God forgive me.

* Eventually, I will find a blue that works.

* It helps when you aren't pants on head, and remember to put the equals sign, my dude.

* Cleaned up some names, added some comments, and trying to make Pax be captialized in the manipulator

* Attempting to fix Pax to be uppercase, also a slight tweak to reagent numbers.

* I honestly don't care enough, and it doesn't like me capitalizing Pax, so fuck it.

* Cleaned some shit up, fixed a problem I noticed where I forgot an entire line of code because I am Big Big Smart Plant.

* Everything should taste now. Thanks to Anne for the advice. (also shifts a few nutriment values about)

* because I am stupid, I forgot a comma.

* Pray for no map by map. 2nd to last commit.

* I really didn't like how the species names looked.

* First set of pea sprites complete, shoutouts to TripleZeta

* Adds Laughin' Peas sprites! Shoutouts to Stewydeadmike!

* fixed a spelling mistake

* Hey look ma, it's not a disorganized mess anymore

* Bugsquashing... maybe?

* Adds World Peas Sprites! Shoutouts to Stewydeadmike!

* It would help if I actually put the harvest product and seed product eh? Try to remember to do that next time.

* Spriter wasn't happy with old laughpeas sprite.

* cleans up taste text, removes empty lines.

* better taste for a terrible wine.

* Travis leave me alone

* Pax reduction

Co-authored-by: The0bserver <Gizmomaster777@gmail.com>
 2020-05-15 07:16:50 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
kevinz000
5b86c334f9 Merge pull request #11863 from Trilbyspaceclone/patch-342 
Honey Palm can be distill into mead
 2020-04-17 05:51:47 -07:00
Trilbyspaceclone
93029c9596 le sigh 2020-04-15 14:48:22 -04:00
Trilbyspaceclone
68272ac91a Update flowers.dm 2020-04-14 23:14:10 -04:00
Artur
fb7dc7a54c Fucking icons 2020-04-14 09:42:11 +03:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
timothyteakettle
c28aa08c71 woops i didnt add it to the seed 2020-04-07 00:16:28 +01:00
timothyteakettle
1b940a5464 space tobacco now has gaseous 2020-04-07 00:01:27 +01:00
Timothy Teakettle
6b3de998c0 remove noreact from being used in plants 2020-04-02 21:18:27 +01:00
Artur
a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
kevinz000
dd90d21f93 Merge pull request #11645 from Trilbyspaceclone/vaild 
Et tu?
 2020-03-28 15:58:56 -07:00
TrilbySpaceClone
879b626cd1 Et tu 2020-03-27 03:12:04 -04:00
Artur
e8f3e0a3a1 Forgot to add the mutation, what a dummy i am 2020-03-26 09:49:20 +02:00
Artur
fdc6a02eea Hm 2020-03-25 12:46:42 +02:00
Artur
9bb7529a49 Progress 2020-03-24 16:55:46 +02:00
Artur
c6a8515297 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-24 12:36:21 +02:00
Winter Flare
0effeb6ed5 Ports Hyper Drinks 
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
 2020-03-22 19:33:50 -04:00
Winter Flare
5c3037b5d0 Fixed Several Foods, Strawberry Juice 
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783

Made lizards like:
Egg Wrap

Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
 2020-03-22 00:19:28 -04:00
Ghom
e41e3a5fbb Update banana.dm 2020-03-12 00:22:53 +01:00
Ghommie
27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Ghom
f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers 
Ashwalkers now can make a well, got their livestock back and more!
 2020-03-06 13:48:03 +01:00
Ghom
5c67c71e90 Update towercap.dm 2020-03-06 05:41:49 +01:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ 
Bloodsucker external blood gain rebalancing
 2020-03-02 16:36:22 +01:00
Artur
5d3f3fc06a WIP 2020-02-28 14:11:38 +02:00
Kraseo
170e092a24 this is going to end well 2020-02-25 13:14:18 +01:00
TrilbySpaceClone
525cedf16a this just works 2020-02-24 11:45:47 -05:00
Artur
d635af0caa Conflict Fix 2020-02-19 13:11:33 +02:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Trilbyspaceclone
0bd1357e5f flour 2020-02-12 15:03:15 -05:00
Trilbyspaceclone
1ce9232958 Update cereals.dm 2020-02-12 15:00:08 -05:00
Artur
788d8c5873 Just in case. 2020-02-12 14:13:26 +02:00
Artur
7d1cf6a5a0 Hopefully makes blood useless 2020-02-12 11:27:57 +02:00
Ghom
dd4e1d8f57 Update flowers.dm 2020-02-04 06:57:07 +01:00
Ghom
4e4b0d718a Update mushrooms.dm 2020-02-04 06:52:54 +01:00
Ghom
dcb3447c12 Update misc.dm 2020-02-04 06:51:50 +01:00
Ghommie
b6509d25e6 Ports "Cleans up plante gene mutability." 2020-02-04 06:34:42 +01:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Ghom
78e4c608ad Merge pull request #10319 from Seris02/coconutsyep 
porting azarak's coconuts from hyper station
 2019-12-31 13:16:07 +01:00
Ghommie
49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01: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
Ghommie
7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00