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

466 Commits

Author SHA1 Message Date
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
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02: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
b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
coldud13
17d4c99b25 alt click to remove containers from reagent grinder and biogenerator 2020-06-02 19:10:41 +10:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03: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
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03: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
Artur
321902c35a Ports https://github.com/tgstation/tgstation/pull/50225 2020-04-23 13:28:09 +03: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