shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,355 Commits 5 Branches 0 Tags
1e07a277f492217c3b5e6fc3409a8237e1a49708
Commit Graph

444 Commits

Author SHA1 Message Date
TheSpaghetti
1e07a277f4 Makes extradimensional oranges weirder. 2020-07-16 03:17:28 -04: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
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
Winter Flare
482785d922 Fixes Bee Balm 2020-07-05 19:14:03 -04:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02: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
Timothy Teakettle
34c9a2f821 part 4 2020-06-11 21:45:32 +01:00
coldud13
17d4c99b25 alt click to remove containers from reagent grinder and biogenerator 2020-06-02 19:10:41 +10:00
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
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
kevinz000
f6a5f92ff3 Merge pull request #11918 from Ghommie/Ghommie-cit689 
nerf to biogenerator upgrades, removal of flour and glass bottles designs.
 2020-04-25 16:59:38 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
59f2b66fd9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit689 2020-04-18 18:44:46 +02:00
Ghommie
0663a3f01c ceiling to avoid infinity ez nutriment. 2020-04-18 18:18:22 +02:00
Ghommie
beb34321e7 nerf to biogenerator upgrades and purge of inorganic glass bottles designs. 2020-04-18 17:53:00 +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
kevinz000
9208c42747 Merge pull request #11722 from timothyteakettle/bye-separated-chems 
goodbye separated chemicals
 2020-04-09 02:02:55 -07: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
timothyteakettle
378e188b3b goodbye slip prickles 2020-04-06 23:57:00 +01:00
Timothy Teakettle
0919737c21 fixes shadow emission (#11713) 2020-04-03 14:23:24 +02:00
Timothy Teakettle
6b3de998c0 remove noreact from being used in plants 2020-04-02 21:18:27 +01:00
Timothy Teakettle
0dcc630c4a ports some trait changes 2020-04-02 21:15:04 +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
Trilbyspaceclone
7ad1831b44 Update fermenting_barrel.dm (#11534) 2020-03-20 15:52:09 +01:00
Putnam3145
480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 
Fix runtimes some more.
 2020-03-11 17:01:13 -07: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
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +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
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600 
Porting a couple material datums code updates and fixes.
 2020-03-06 00:17:21 -07:00
Ghom
5c67c71e90 Update towercap.dm 2020-03-06 05:41:49 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00