 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
|
ad3b709c40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
|
2019-06-29 06:39:21 +02: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
|
6c77443887
|
Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
|
2019-06-28 05:28:35 -07:00 |
|
|
kevinz000
|
f7bbca8918
|
Merge pull request #8731 from Ghommie/Ghommie-cit81
Ports in microwave updates and its radial menu.
|
2019-06-28 05:19:04 -07:00 |
|
|
deathride58
|
d979dfef59
|
Merge pull request #8738 from Ghommie/Ghommie-cit86
porting pizza fixes.
|
2019-06-28 00:53:23 -04: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 |
|
|
kevinz000
|
b33aa0f049
|
Merge pull request #8695 from Ghommie/Ghommie-cit71
Porting smartfridge improvements.
|
2019-06-23 06:53:02 -07:00 |
|
|
Ghommie
|
13c939ae41
|
porting pizza fixes.
|
2019-06-23 09:07:59 +02:00 |
|
|
Ghommie
|
2e30b91567
|
Ports in microwave updates and its radial menu.
|
2019-06-23 06:10:49 +02:00 |
|
|
Ghommie
|
f97a4b3a78
|
changes.
|
2019-06-22 19:50:56 +02:00 |
|
|
Ghommie
|
8a302552f2
|
Ouch really.
|
2019-06-19 06:22:19 +02:00 |
|
|
Ghommie
|
98367a8b00
|
more.
|
2019-06-19 04:44:59 +02:00 |
|
|
Ghommie
|
8764d781a3
|
Porting smartfridge improvements.
|
2019-06-19 04:28:36 +02: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
|
519ad202df
|
fixes.
|
2019-06-17 05:19:30 +02:00 |
|
|
Ghommie
|
1323ace579
|
Peanuts, peanut butter, and sandwiches.
|
2019-06-17 05:17:24 +02:00 |
|
|
kevinz000
|
5d8286f91c
|
Merge pull request #8640 from Trilbyspaceclone/more_cooking1
Makes baklava pie
|
2019-06-16 01:10:47 -07:00 |
|
|
deathride58
|
2f47fbdd8b
|
Merge pull request #8628 from BlackMajor/Pie
Cream Pies now transfer a portion of their reagents on hitting someone
|
2019-06-14 19:18:12 -04:00 |
|
|
TrilbySpaseClone
|
1c45e2c615
|
Suggested
|
2019-06-13 16:02:48 -04:00 |
|
|
BlackMajor
|
142d62908f
|
Actually make it 15, the pie starts with 13u already used
|
2019-06-12 21:18:56 +12:00 |
|
|
BlackMajor
|
7b79bbcb29
|
Changes transfer amount to 10u instead of the full 80
|
2019-06-12 21:17:31 +12:00 |
|
|
BlackMajor
|
90e572ec03
|
Honk
|
2019-06-12 20:03:17 +12:00 |
|
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
|
Trilbyspaceclone
|
01e56cc00d
|
garmmer
|
2019-06-06 14:52:52 -04:00 |
|
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
|
Trilbyspaceclone
|
5e68db7836
|
local files have commas, but I forgot to save
|
2019-06-05 22:22:50 -04:00 |
|
|
Trilbyspaceclone
|
1b463c18b3
|
Update snacks_sandwichtoast.dm
|
2019-06-05 20:14:48 -04:00 |
|
|
Trilbyspaceclone
|
a9ded7a3eb
|
Add files via upload
|
2019-06-05 20:10:07 -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
|
b68565280e
|
Update snacks_other.dm
|
2019-06-05 20:02:22 -04:00 |
|
|
kevinz000
|
7decce3808
|
Merge pull request #8525 from Trilbyspaceclone/patch-161
Makes cookies loved by all
|
2019-06-05 11:35:22 -07:00 |
|
|
kevinz000
|
89bf36e6a9
|
Merge pull request #8491 from Ghommie/Ghommie-cit24
zero, , null, and empty text strings, all fulfill the ! operator.
|
2019-06-05 01:52:17 -07:00 |
|
|
Trilbyspaceclone
|
7fb1f7fba1
|
Update snacks_pastry.dm
|
2019-06-03 18:38:55 -04:00 |
|
|
kevinz000
|
70bad08f95
|
Merge pull request #8473 from Useroth/clown-fu
[MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.
|
2019-05-31 19:23:03 -07:00 |
|
|
BurgerLua
|
5dc3542f90
|
added
|
2019-05-30 15:49:53 -07:00 |
|
|
Ghommie
|
85ab988842
|
0, null, and "", all fulfill the ! operator.
|
2019-05-30 20:09:19 +02:00 |
|
|
Useroth
|
d8d9d6efeb
|
Tweaks. Also, eating human pies makes them chestburst you a'la monkey cubes.
|
2019-05-29 23:45:25 +02:00 |
|
|
Useroth
|
16826eba66
|
Tweaks n' stuff.
|
2019-05-29 08:45:21 +02: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 |
|