Commit Graph

18 Commits

Author SHA1 Message Date
SkyratBot
44f1877b18 [MIRROR] Finally, peas for the whole station. (#1462)
* Finally, peas for the whole station. (#54573)

This PR brings three new plants, and 6 new food recipes into being. This is a combined port of Citadel-Station-13/Citadel-Station-13#12211 and Citadel-Station-13/Citadel-Station-13#12510, along with the fixes made along the way.

Laugh Peas contains 7% Laughter.
World Peas contains 10% Pax and Happiness, but takes at least 21 cycles to bear a harvest, by having a maturation time of 20.
Salad of Eden contains 3 units of Earthsblood, 5 units of Omnizine, and 2 units of Happiness, but requires one of every ambrosia leaf, as well as a world pea.

Credits to TripleZeta for the base peas sprite, and Stewydeadmike for the Laugh, World, and food sprites. Without them, the peas would have remained an ideasguy sort of deal.

* Finally, peas for the whole station.

Co-authored-by: TheObserver-sys <58029438+TheObserver-sys@users.noreply.github.com>
2020-10-25 11:12:08 +01:00
SkyratBot
c46e5c919c [MIRROR] Add Lasagna to the game (#1419)
* Add Lasagna to the game (#54438)

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Add Lasagna to the game

Co-authored-by: alphanerdd <60521518+alphanerdd@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
2020-10-22 04:38:47 +02:00
SkyratBot
f02e30a50e [MIRROR] Implements timed_action_flags for do_after-like procs (#1385)
* Implements timed_action_flags for do_after-like procs (#54409)

Originally I wanted to fix an issue where the `get_up()` `do_after()` would ignore the callback checks, because it was `uninterruptible`, so that made me refactor these procs to allow for higher granularity on checks and standardize behavior a bit more.
There's more work to be done for them, but one thing at a time.

* Removes the `uninterruptible` check in favor of the more granular `timed_action_flags`
* Cleans code on the `do_atom`, `do_after_mob`, `do_mob` and `do_after` procs to standardize them a little better.

* Implements timed_action_flags for do_after-like procs

* Update horror_form.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-21 07:06:03 +02:00
SkyratBot
af7fb6428e [MIRROR] Fixes slices on pizza and resizes some foods (#1291)
* Fixes slices on pizza and resizes some foods (#54353)

fix: you can no longer cut pizza into bugged slices
fix: some small foods are actually small again

* Fixes slices on pizza and resizes some foods

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-10-13 23:05:12 +02:00
SkyratBot
b0215f179a [MIRROR] Takes some lessons from Jimmy Neutron (#1269)
* sodium chloride is now called salt (#54328)

* Takes some lessons from Jimmy Neutron

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-10-12 23:18:45 +02:00
SkyratBot
bba021046c [MIRROR] Converts Pizza to use the new food component. (#1205)
* Converts Pizza to use the new food component. (#53641)

pizzas now use processing component

* Converts Pizza to use the new food component.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2020-10-08 17:30:13 +02:00
SkyratBot
8f853ea80d [MIRROR] Fixes monkeycube size and organ callback and microwaves (#1107)
* Fixes monkeycube size and organ callback and microwaves (#54095)

* fixes

* dumb runtime

* fixes eggs

* Fixes monkeycube size and organ callback and microwaves

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-10-01 21:41:47 +02:00
SkyratBot
49eb12c332 [MIRROR] Restores some functions food had (#1087)
* Restores some functions food had (#53892)

Synthmeat steaks are a subtype of plain so that they can be used in burgers the way they could before
Colored burgers have color again, as they were just the greyscale sprite

* Restores some functions food had

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2020-09-30 22:48:41 +02:00
SkyratBot
ada67ac929 [MIRROR] Ports soup, snacks, icecream, salads and meat to newfood (#1074)
* Ports soup, snacks, icecream, salads and meat to newfood (#54028)

Ports soup, snacks, icecream, salads and meat to newfood

* Ports soup, snacks, icecream, salads and meat to newfood

* Update true_changeling.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-30 14:37:15 +02:00
SkyratBot
d922283b26 [MIRROR] edible + food trash component fixes (#894)
* edible + food trash component fixes (#53837)

* food

* done

* edible + food trash component fixes

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-09-20 17:29:52 +02:00
SkyratBot
7f84409fd4 [MIRROR] Adds the CRAZY HAMBURGER (#877)
* Merge pull request #53812 from SgtHunk/ITS-HAURRIBLE

Adds the CRAZY HAMBURGER

* Adds the CRAZY HAMBURGER

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-09-20 00:35:23 +01:00
SkyratBot
bfb7add1b0 [MIRROR] Apple cakes no longer give slime cake slices. (#838)
* Apple cakes no longer give slime cake slices. (#53731)

* Apple cakes no longer give slime cake slices.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-17 02:07:21 +01:00
SkyratBot
7847364fc2 [MIRROR] s-s-s-spaghetti to newfood (#818)
* s-s-s-spaghetti to newfood (#53574)

🆑 Qustinnus
code: Moves spaghetti to new food
fix: Fixes some more size problems on food
fix: Fixes organs having wrong params
/🆑

fixes #53482 fixes #53572

* s-s-s-spaghetti to newfood

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-09-16 03:41:02 +01:00
SkyratBot
39c1a99020 [MIRROR] Moves over cakes to newfood and transfers reagents when crafting (#688)
* Moves over cakes to newfood and transfers reagents when crafting (#53316)

* Moves over cakes to newfood and transfers reagents when crafting

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-09-09 08:09:36 +02:00
SkyratBot
656ee54f39 [MIRROR] Refactors burgers to use components & auto-eating (#569)
* Refactors burgers to use components & auto-eating (#53224)

* Refactors burgers to use components & auto-eating

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-08-30 05:13:44 +02:00
SkyratBot
f3a0fd3231 [MIRROR] Componentizes Food Storage (#561)
* Componentizes Food Storage (#53116)

Moves the food storage behavior on (formerly) bread, cheese wheels, and cakes from /food/snacks/store/ to a component.
This lets just about any food/edible thing be used for storing fun things like glass shards, which is pretty neat. Also helps work towards the food refactor.

* Componentizes Food Storage

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2020-08-29 20:32:58 +01:00
SkyratBot
7bbe8ec530 [MIRROR] [READY] Vatgrowing: Third time's the charm (#508)
* Merge pull request #53020 from Qustinnus/fatgrowing

[READY] Vatgrowing: Third time's the charm

* [READY] Vatgrowing: Third time's the charm

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
2020-08-25 01:36:10 +02:00
SkyratBot
6da6b33009 [MIRROR] Food refactor part 1: Bread destruction and processable element (#447)
* Food refactor part 1: Bread destruction and processable element (#53047)

* Food refactor part 1: Bread destruction and processable element

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-08-21 14:15:57 +01:00