shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,986 Commits 5 Branches 0 Tags
ce1f1bdf5ed29bf4f3fd0f8a77429ae807afbc4e
Commit Graph
200 Commits
Author SHA1 Message Date
TrilbySpaceClone c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
TrilbySpaceClone 25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
Timothy TeakettleandGitHub cd25a7c145 Merge branch 'master' into food-quality 2020-04-17 15:03:44 +01:00
kevinz000andGitHub e84e6bface Merge pull request #11857 from Trilbyspaceclone/race_drinks 
Race drinks!
 2020-04-17 05:20:53 -07:00
TrilbyspacecloneandGitHub 6f4a3fc179 wine to jello 2020-04-16 17:51:03 -04:00
TrilbyspacecloneandGitHub 8410d6f35f Why are you like this coffee 2020-04-14 19:40:52 -04:00
TrilbySpaceClone d49210fd48 Merge branch 'master' into race_drinks 2020-04-14 19:21:47 -04:00
TrilbySpaceClone a46a6227a9 Finally done... 2020-04-14 19:11:53 -04:00
Linzolle f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
TrilbySpaceClone 79a72a50d4 this is annoying, why is angel not defind as a race 2020-04-14 11:13:49 -04:00
TrilbySpaceClone c5b1324d44 sprites and some basic code 2020-04-13 19:23:35 -04:00
ForrestWick 0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Timothy Teakettle 47be942c92 more quality 2020-04-09 15:29:10 +01:00
Artur a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
kevinz000andGitHub 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 c6a8515297 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-24 12:36:21 +02:00
Winter Flare 29576ee6a7 Travis Please 2020-03-22 20:34:38 -04: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 cd3f8f5df5 Porting More Stuff 
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
 2020-03-22 15:13:00 -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
Winter Flare 8a452b7f09 Food Craft Speed 2020-03-10 01:43:18 -04:00
Winter Flare 9ec222e5b4 Empowered Burger 2020-03-10 00:53:42 -04:00
Winter Flare bb9066e9cb Food Additions / Butter Bear 
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
 2020-03-08 14:36:08 -04:00
Ragolution 597e1210f3 fix quintuple sec mix_sound def 
Fixes mix_sound for Quintuple Sec being assigned to mix_message. The fact that this was never reported before proves how infrequently people actually make quintuple sec.
 2020-03-06 08:38:33 -05:00
Artur 5d3f3fc06a WIP 2020-02-28 14:11:38 +02:00
GhomandGitHub eb3f985434 Update drinks_recipes.dm 2020-02-27 14:16:39 +01:00
GhomandGitHub f86e17d945 Merge pull request #11129 from Owai-Seek/movefood-2-16-20 
Reorganize Food Recipes, "Balance" Tweaks
 2020-02-24 20:53:36 +01:00
Winter Flare 4c03d552ee Gettin Salty. Fish is now Seafood. 2020-02-23 16:22:19 -05:00
Winter Flare 60b4c10215 Fish Category, Misc Moves 2020-02-22 19:02:43 -05:00
Winter Flare d112556ea3 Fix, New Category, file renames. 
Remove Sweets Category
Add Donut Category
Rename recipies_sushi.dm to recipies_eastern_fish.dm (for sorting in the UI)
Rename recipies_pie.dm to recipies_pie_sweets.dm
Remove Onigiri from Misc (It's in Eastern)
 2020-02-21 09:34:13 -05:00
Winter Flare 34c8315c2f I forgot to hit save. 2020-02-21 07:26:32 -05:00
Winter Flare 79967b0ac5 Resolving some convos. 
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
 2020-02-21 07:16:39 -05:00
Winter Flare 00d66c9b91 Renamed CAT_FISH to CAT_EASTERN 2020-02-18 22:19:58 -05:00
Winter Flare 79705d1716 Moving Burgers Around 2020-02-17 08:24:21 -05:00
Winter Flare dc6d1fb359 Sorted Frozen Foods 2020-02-17 05:56:02 -05:00
Winter Flare c97111beda Reorganise Food + Balance Tweaks 
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
 2020-02-17 05:32:03 -05:00
Unknown c0295156ff Adds synthmeat reaction 2020-02-16 11:42:30 -05:00
Winter Flare ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 2020-02-13 03:34:44 -05:00
Winter Flare 082085f143 Poppy Muffin (Fug You Derk) 2020-02-10 23:09:36 -05:00
keronshb 42fda3d88b CogChamp 
Adds the CogChamp drink!  Bloodcult gets one so why not Clock?
 2020-02-10 21:18:51 -05:00
Winter Flare bb641fecf8 Sprites, Tweaks, and Snacks 
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
 2020-02-09 23:07:32 -05:00
Artur 0391513220 Works now 2020-02-04 12:05:15 +01:00
GhomandGitHub 96a38e6c18 Merge pull request #10837 from Owai-Seek/tinytweaks 
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
 2020-02-02 18:07:25 +01:00
Winter Flare 59b5b0b9a6 A bunch of tiny tweaks. 
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
 2020-02-01 04:49:56 -05:00
Artur e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
kevinz000 efe3ebdb53 bet 2020-01-20 17:50:07 -07:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Ghommie 592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Ghommie f93077e730 F to pay respect. 2019-12-29 00:08:34 +01:00