timothyteakettle
bc6294baa9
i too, like food quality.
2020-04-09 01:10:34 +01:00
Artur
a903752ff9
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-31 19:42:35 +03:00
Ghommie
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
kevinz000 and GitHub
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
kevinz000 and GitHub
46e3267d4c
Merge pull request #11557 from Ghommie/Ghommie-cit632
...
Removes species default_features variable.
2020-03-25 12:16:40 -07:00
Timothy Teakettle and GitHub
b789cd246a
frying changes with bad chems ( #11580 )
...
* Update toxin_reagents.dm
* Update snacks_bread.dm
* Update toxin_reagents.dm
2020-03-24 20:03:49 +01:00
Artur
c6a8515297
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-24 12:36:21 +02:00
Ghommie
d336bcf259
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit632
2020-03-23 21:02:47 +01:00
kevinz000 and GitHub
fbe77495e8
Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020
...
Porting Juices, Drinks, and Salami [READY]
2020-03-23 10:36:44 -07: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
Ghommie
3c2cb76792
Fixing owner not being set in mutation/on_aquiring.
2020-03-22 15:23:05 +01: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
Ghommie
26e2ec92ca
Removes species default_features variable.
2020-03-21 02:04:57 +01:00
Artur
ba972cf0eb
Argh
2020-03-18 22:41:21 +02:00
Ghom and GitHub
4020c67956
Update snacks_pie.dm
2020-03-15 16:16:28 +01:00
Ghommie
b453a25e14
Something about banana pies, runtime errors and warnings.
2020-03-15 15:41:32 +01:00
Ghommie
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +01:00
kevinz000 and GitHub
832d894e92
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
...
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
kevinz000 and GitHub
e210f7d535
Merge pull request #11391 from Ghommie/Ghommie-cit612
...
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07: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
Ghom and GitHub
ea556e6357
[s] Ports "Fixes gibber part update"
2020-03-09 16:41:56 +01: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
Ghommie
ad4d290ea7
WIP
2020-03-08 19:26:01 +01:00
Ghom and GitHub
865e859141
Merge pull request #11359 from Trilbyspaceclone/lightswitch
...
Corrects snowcones
2020-03-07 11:35:39 +01:00
kevinz000 and GitHub
5a18cac701
Merge pull request #11338 from Crystal9156/patch-1
...
Fixes Chocolate Jelly Donuts
2020-03-07 03:26:57 -07:00
3e5809ae30
Update code/modules/food_and_drinks/food/snacks_frozen.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-06 16:32:11 -05:00
TrilbySpaceClone
f1116648a8
corrects snowcones
2020-03-06 09:08:05 -05: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
kevinz000 and GitHub
16d6ba9e21
Merge pull request #11323 from Ghommie/Ghommie-cit600
...
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
Crystal9156 and GitHub
adc965d55e
Fixes Chocolate Jelly Donuts
...
Choco Jelly Donuts's icon_state is actually jelly_choco, it /was/ jelly_choc which is incorrect as the dmi says jelly_choco
2020-03-05 20:52:09 -05:00
Ghommie
f2c8a7cd6f
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
kevinz000
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
Artur
5d3f3fc06a
WIP
2020-02-28 14:11:38 +02:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
Ghom and GitHub
eb3f985434
Update drinks_recipes.dm
2020-02-27 14:16:39 +01:00
Trilbyspaceclone and GitHub
cf23018b6a
Update snacks_cake.dm
2020-02-24 22:51:43 -05:00
Ghom and GitHub
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
Trilbyspaceclone and GitHub
342f1cd4c1
Update snacks_meat.dm
2020-02-22 23:17:30 -05:00
Winter Flare
60b4c10215
Fish Category, Misc Moves
2020-02-22 19:02:43 -05:00
kevinz000
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07: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
timothyteakettle