shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
916 Commits
Author SHA1 Message Date
GhomandGitHub 22a041f72b Merge pull request #11160 from Hatterhat/chem-combat-sucked-anyway 
a mouth cover check for pies
 2020-02-20 11:00:00 +01:00
kevinz000 c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
Hatterhat 9929cecec5 wack 2020-02-19 20:01:40 -06:00
Hatterhat 6b1a721f1c literally a mouth cover check 2020-02-19 17:51:18 -06:00
kevinz000 9289ca8873 fix 2020-02-19 08:14:28 -07:00
Winter Flare 00d66c9b91 Renamed CAT_FISH to CAT_EASTERN 2020-02-18 22:19:58 -05:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01: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
TrilbyspacecloneandGitHub 21e2a0892d Update meat.dm (#11028) 2020-02-16 07:46:45 +01:00
kevinz000andGitHub 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
kevinz000andGitHub f79148d549 Merge pull request #10947 from Ghommie/Ghommie-cit563 
Holopad static fix and a few other mistakes.
 2020-02-15 12:16:23 -07:00
Ghommie 4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
GhomandGitHub e76fc296a4 Merge pull request #11081 from Detective-Google/prefbreakies-ooh-woo 
Makes the valentines chocolates no longer rule 9 bait
 2020-02-14 07:46:41 +01:00
Detective Google 6c4c4b3f81 removes the crocin from the valentines candy 2020-02-13 19:59:38 -06:00
Winter Flare ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 2020-02-13 03:34:44 -05:00
Winter Flare f32affdb1c Made Mugs Colorful 2020-02-13 03:26:35 -05:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000andGitHub c790478a3d Merge pull request #11012 from keronshb/RatvarDrink 
Introduces the Ratvarian mixed drink, the CogChamp!
 2020-02-12 23:58:14 -07:00
GhomandGitHub 2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port 
Ports /vg/station drink sliding
 2020-02-12 09:06:03 +01:00
Winter Flare 5549cd93f1 Merge branch 'master' into tinytweaks-2-9-20 2020-02-11 07:20:16 -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
Ghommie c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01: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
Ghommie 83a08ee9f5 Extras and tg#45018 2020-02-07 05:21:08 +01:00
Ghommie 0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
Seris02 d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02 6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Ghommie 5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
ancientpower dd521ef009 i swear it compiled locally 2020-02-04 17:18:13 -06:00
ancientpower 5fb82a2e6b fixes for the requested changes' fixes 2020-02-04 17:10:02 -06:00
ancientpower 335c28ff25 fixes for the requested changes 2020-02-04 17:02:13 -06:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
ancientpower a85f05a628 requested changes 2020-02-04 16:58:24 -06:00
ancientpower 0d6ffbc432 fixed it for real this time 2020-02-04 16:38:20 -06:00
ancientpower 6342116168 forgot to remove this bit 2020-02-04 16:13:28 -06:00
ancientpower 9dd411f11b fixes the restoration for reals 2020-02-04 16:11:12 -06:00
ancientpower 524836c2b2 restores drink flinging 2020-02-04 15:48:03 -06:00
Artur 0391513220 Works now 2020-02-04 12:05:15 +01:00
Ghommie a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
ancientpower 937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06: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
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +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
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Artur e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00