shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,302 Commits 5 Branches 0 Tags
3dca4dd3796d94de37a394d9423826903c75d59f
Commit Graph

99 Commits

Author SHA1 Message Date
Ghommie
3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
kevinz000
bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
Ghommie
3291b9c47a Porting in donut fixes, beepsky smash and Neurotoxin reworks. 2019-06-28 23:17:12 +02:00
kevinz000
2b50f355d7 Merge pull request #8666 from Ghommie/Ghommie-cit60 
Fixes roffle waffle, mushroom hallucinogen and some invalid reagents.
 2019-06-23 06:54:05 -07:00
Ghom
95dc8084f1 Moving some tablecrafting recipes to the appropriate categories (#8658) 
* Moving some recipes to the appropriate categories

* Fixes the not-a-sandwich recipe being M.I.A.
 2019-06-17 11:18:49 -07:00
Ghommie
1c93c43e20 Fixes roffle waffle, mushroom halluginogen and some invalid reagent. 2019-06-17 09:16:45 +02:00
Ghommie
1323ace579 Peanuts, peanut butter, and sandwiches. 2019-06-17 05:17:24 +02:00
TrilbySpaseClone
1c45e2c615 Suggested 2019-06-13 16:02:48 -04:00
Trilbyspaceclone
5e68db7836 local files have commas, but I forgot to save 2019-06-05 22:22:50 -04:00
Trilbyspaceclone
e5b538af71 Update recipes_frozen.dm 2019-06-05 20:09:21 -04:00
Trilbyspaceclone
b7a759017d Add files via upload 2019-06-05 20:05:56 -04:00
Trilbyspaceclone
9b2991d0f2 Update recipes_misc.dm 2019-06-05 20:05:22 -04:00
Trilbyspaceclone
e922a0cb18 Update recipes_sandwich.dm 2019-06-05 20:04:40 -04:00
Trilbyspaceclone
0d868bc660 Rename snacks_sushi.dm to recipes_sushi.dm 2019-04-29 18:52:04 -04:00
Trilbyspaceclone
ee007ecae0 Update snacks_sushi.dm 2019-04-29 18:26:19 -04:00
Trilbyspaceclone
482ee83621 Update recipes_meat.dm 2019-04-29 18:22:31 -04:00
Trilbyspaceclone
c03febe17e THATS WHY 2019-04-29 18:20:38 -04:00
Trilbyspaceclone
fd5554dc21 Update recipes_meat.dm 2019-04-29 18:17:53 -04:00
Trilbyspaceclone
0d099cb627 Update recipes_meat.dm 2019-04-29 18:13:42 -04:00
Trilbyspaceclone
adc6ef506e Update recipes_meat.dm 2019-04-29 17:58:17 -04:00
Trilbyspaceclone
862512fba7 Update recipes_sandwich.dm 2019-04-29 17:53:44 -04:00
Trilbyspaceclone
2a33dcd333 Add files via upload 2019-04-29 17:45:48 -04:00
kevinz000
8b54d33286 Merge pull request #8215 from Trilbyspaceclone/Sush 
[Ready] Sushi!
 2019-04-22 21:40:28 -07:00
Trilbyspaceclone
1a680b142f grammar 2019-04-19 14:06:02 -04:00
Trilbyspaceclone
e8e7467a50 Update recipes_cake.dm 2019-04-19 13:50:02 -04:00
Trilbyspaceclone
7f526242c3 grammar and lowering of Well made 5 -> 2 2019-04-08 02:39:17 -04:00
Trilbyspaceclone
47e0f5b946 Update recipes_misc.dm 2019-04-07 19:50:52 -04:00
Trilbyspaceclone
b4b9e57058 Update recipes_meat.dm 2019-04-07 19:50:09 -04:00
Trilbyspaceclone
6b9e9e23bf Update recipes_meat.dm 2019-04-05 18:44:02 -04:00
Trilbyspaceclone
e6ff7f811b Update recipes_misc.dm 2019-04-05 18:27:59 -04:00
Trilbyspaceclone
78caec991a 15 is 3 x 5 more lucky? 2019-04-05 18:08:05 -04:00
Trilbyspaceclone
8098cd8fd7 Update recipes_meat.dm 2019-04-05 17:58:55 -04:00
Trilbyspaceclone
9a4a315118 Update recipes_meat.dm 2019-04-05 17:44:18 -04:00
Trilbyspaceclone
8036f25ad9 Update recipes_misc.dm 2019-04-05 17:30:39 -04:00
Trilbyspaceclone
870b0d6cd8 Update recipes_meat.dm 2019-04-05 17:29:12 -04:00
Trilbyspaceclone
9cb9da788e Update recipes_misc.dm 2019-04-05 16:59:43 -04:00
Trilbyspaceclone
54ac242454 Update recipes_meat.dm 2019-04-05 16:57:28 -04:00
deathride58
e1496198e4 Merge pull request #8125 from Trilbyspaceclone/Pizza 
Anomaly pizza crafting
 2019-03-21 15:11:43 -04:00
Trilbyspaceclone
8d213cb1c6 Update drinks_recipes.dm 2019-03-18 19:45:51 -04:00
Trilbyspaceclone
44d4c177e2 Merge branch 'master' into Pizza 2019-03-16 17:53:52 -04:00
Trilbyspaceclone
f88de367ed Update recipes_pizza.dm 2019-03-16 13:26:45 -04:00
Trilbyspaceclone
9408fd8daf Update recipes_pizza.dm 2019-03-16 12:58:49 -04:00
Cyprian
456d998ad5 Adding a donut 2019-02-25 16:26:52 +01:00
Trilbyspaceclone
dab1591bca Update drinks_recipes.dm (#7962) 2019-01-27 00:35:43 -08:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
CitadelStationBot
eafb25535a [MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094) 
* Adds a new drink: Peppermint Patty from Archer! (#38427)

* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too

* Adds a new drink: Peppermint Patty from Archer!
 2018-06-15 02:46:40 -07:00
LetterJay
db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -05:00
LetterJay
2b0a4f6737 Update drinks_recipes.dm 2018-05-17 23:44:36 -05:00
ThePainkiller
e2bcf82341 Adds Fernet, a digestif that reduces your satiety. 2018-05-17 10:19:40 -05:00