Skip to content

Commit

Permalink
[MDB Ignore] Rkz's Newfood: Part 1 of 4 (#3148)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This is a port of my beestation newfood pr. It's the culmination of many
months of effort during my free time in university, and my first
large-scale project on bee.

Due to interest from a few shiptest people, I have ported the PR
mostly-as-is from Bee, additional alterations where needed.

Ports from TG:
- tgstation/tgstation#49192
- tgstation/tgstation#53047
- tgstation/tgstation#53225
- tgstation/tgstation#53316
- tgstation/tgstation#53574
- tgstation/tgstation#66257
- tgstation/tgstation#69095
- tgstation/tgstation#71449

Ports from Bee, from yours truly:
- BeeStation/BeeStation-Hornet#8748


A rundown of the plan:
- This is Part 1 of newfood. This is basically the foundational newfood
shit that's needed for the rest of the system we want to work.

- Part 2 will complete all the foundational shit (killing oldfood), with
some minor refactors to ready cooking for the upcoming features. This
will conclude the development of the edible component and things left in
limbo from part 1. It will remove the temporary vars and procs, and
customizable food will be fully reenabled.

- Part 3 will contain the cooking features (Griddle). 

Now for the changes:
1. convert bread to newfood
2. convert spaghetti to newfood
3. convert cake to newfood
4. Cleaned up the edible component. It should be a lot more consistent
going forward, and will basically be completely functional as of part
2's merge.
5. Adds Food Storage component, which lets you hide small items in large
food. (Stick a shard of glass inside a cake to fuck over someone.)
6. Adds FOOD_FINGER_FOOD food flag, which lets you eat food whilst
moving. It applies to small food that really shouldnt take your full
concentration to consume whilst walking, like lollipops!
7. Sets PRAGMATIC weights for as many foods as I could. Seriously this
sucked really bad. candycorn and cakes are not the same ducking size.
8. food trash is sane, stuff thats clearly eaten on a plate and has a
plate underneath it, will spawn a plate rubbish when completely eaten.
(you dont eat the plate on cake any more smh)
9. Begins the framework of something called Accidental Consumption. Its
basically if you end up eating non-food related it will cause you
differing effects. This is again very early stages, and will require
wounds, full newfood implementation, and bringing over tg's stomach
metabolism. The proc exists, but its not getting called until part 2 or
3 is merged.
10. Adjusts some nutritional values. Minor, but I will note that I did
so

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Newfood seems to be a heavily requested feature here. This is but the
framework. Really, players wont notice the difference besides the
incompatiblity between oldfood & newfood, but once the griddle is
implemented in part 3, it will be glorious.

When discussing with shiptest, I floated my plan and I received overall
agreement. This should hopefully be less painful for me and for you than
a bulk merge.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: rkz, benbot(benjamin), Time-Green, SteelSlayer, floyd, Qustinuus,
ArcaneDefence, FlowerCuco
add: Food storage! Hide some glass in the captains cake! Begone
digestive tract!
add: Bread, Cake and Spaghetti to Newfood
add: some smaller foods can now be eaten whilst on the run! (This ONLY
applies to newfood items thus far!)
add: converted edible component to work with newfood
del: oldfood for Bread, Cake and Spaghetti
del: Temporarily removes customfood bread, cake, pasta, and sandwiches
tweak: edited a few messed up values
tweak: food trash is sensible now. Finishing stuff like cake will
actually spawn a plate rubbish. Instead of you eating the plate, biggun,
perhaps properly dispose of it!
fix: Wildly STUPID item weights. Candycorn and cakes are no longer the
SAME size
code: provides some semblance of sorting for signal defines
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: thgvr <[email protected]>
Co-authored-by: thgvr <[email protected]>
  • Loading branch information
Tsar-Salat and thgvr authored Jul 30, 2024
1 parent f8a5505 commit 27a3409
Show file tree
Hide file tree
Showing 89 changed files with 3,022 additions and 1,511 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
/area/ruin/beach/complex)
"kK" = (
/obj/structure/closet/crate/bin,
/obj/item/reagent_containers/food/snacks/breadslice/moldy,
/obj/item/food/breadslice/moldy,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/concrete/slab_4,
/area/ruin/beach/complex)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
},
/obj/structure/table/wood/reinforced,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = 3;
pixel_y = 6
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5381,7 +5381,7 @@
"Ih" = (
/obj/structure/table/wood,
/obj/machinery/light/directional/south,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = -8
},
/obj/item/reagent_containers/food/snacks/grown/berries/poison{
Expand Down Expand Up @@ -7509,7 +7509,7 @@
},
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
/obj/effect/decal/cleanable/vomit/old,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = -4;
pixel_y = 16
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
/obj/structure/cable/green{
icon_state = "1-4"
},
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = 5
},
/turf/open/floor/pod,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@
/area/ruin/unpowered/winter_biodome)
"kb" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/breadslice/plain,
/obj/item/food/breadslice/plain,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/turf/open/floor/wood,
/area/ruin/unpowered/winter_biodome/cabin)
Expand Down Expand Up @@ -1006,8 +1006,8 @@
"oR" = (
/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal,
/obj/structure/closet/secure_closet/freezer,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3431,7 +3431,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/secure_closet/freezer/wall/directional/east,
/obj/item/reagent_containers/food/snacks/chips,
/obj/item/reagent_containers/food/snacks/butterdog,
/obj/item/food/butterdog,
/obj/item/reagent_containers/food/snacks/chips{
pixel_x = 2
},
Expand Down
8 changes: 1 addition & 7 deletions _maps/RandomRuins/SpaceRuins/onehalf.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2034,12 +2034,6 @@
},
/turf/open/space,
/area/space/nearstation)
"Ra" = (
/obj/structure/frame/computer{
dir = 8
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf)
"Rv" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood/airless{
Expand Down Expand Up @@ -3328,7 +3322,7 @@ UM
cp
ZX
Gv
Ra
Gv
cU
YE
bU
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/power_puzzle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,7 @@
/area/ruin/space/has_grav/powerpuzzle/secure)
"sc" = (
/obj/effect/mob_spawn/human/corpse/cargo_tech,
/obj/item/reagent_containers/food/snacks/cakeslice/birthday,
/obj/item/food/cakeslice/birthday,
/obj/effect/decal/cleanable/confetti,
/obj/machinery/light/small/broken/directional/east,
/obj/structure/toilet,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3606,7 +3606,7 @@
/area/ruin/space/has_grav/spacemall/shop)
"nS" = (
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/item/reagent_containers/food/snacks/store/bread/spidermeat,
/obj/item/food/bread/spidermeat,
/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/dorms)
Expand Down Expand Up @@ -6776,7 +6776,7 @@
dir = 8
},
/obj/item/trash/plate,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_y = 6
},
/obj/item/reagent_containers/food/snacks/spiderling{
Expand Down
10 changes: 3 additions & 7 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3043,10 +3043,6 @@
/obj/structure/table/wood,
/turf/open/floor/plasteel,
/area/wizard_station)
"aEX" = (
/obj/structure/table/wood,
/turf/open/floor/plasteel,
/area/wizard_station)
"aEY" = (
/obj/structure/table/wood,
/obj/item/bikehorn/golden{
Expand Down Expand Up @@ -11574,8 +11570,8 @@
/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
/obj/item/reagent_containers/food/snacks/spaghetti,
/obj/item/reagent_containers/food/snacks/spaghetti,
/obj/item/food/spaghetti/raw,
/obj/item/food/spaghetti/raw,
/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
/obj/item/reagent_containers/food/snacks/meat/rawcutlet,
Expand Down Expand Up @@ -23766,7 +23762,7 @@ auE
aEc
auE
aAx
aEX
aEW
aqZ
aqZ
aGr
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
/area/outpost/maintenance/fore)
"aE" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/cakeslice/birthday{
/obj/item/food/cakeslice/birthday{
pixel_x = -3;
pixel_y = -5
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_lagoon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,7 @@
pixel_y = 1
},
/obj/item/toy/cards/deck,
/obj/item/reagent_containers/food/snacks/butterbiscuit{
/obj/item/food/butterbiscuit{
pixel_x = 6;
pixel_y = 6
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/independent/independent_tranquility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2735,7 +2735,7 @@
/area/ship/crew/crewtwo)
"wA" = (
/obj/structure/table,
/obj/item/reagent_containers/food/snacks/cakeslice/lime,
/obj/item/food/cakeslice/lime,
/obj/item/kitchen/fork/plastic{
pixel_x = -11
},
Expand Down Expand Up @@ -3515,7 +3515,7 @@
/area/ship/crew/hydroponics)
"CH" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/garlicbread,
/obj/item/food/garlicbread,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange{
pixel_x = -8;
pixel_y = 7
Expand Down Expand Up @@ -6032,11 +6032,11 @@
pixel_x = -11;
pixel_y = 11
},
/obj/item/reagent_containers/food/snacks/store/bread/banana{
/obj/item/food/bread/banana{
pixel_x = 14;
pixel_y = 1
},
/obj/item/reagent_containers/food/snacks/breadslice/banana,
/obj/item/food/breadslice/banana,
/turf/open/floor/plasteel,
/area/ship/crew/cryo)
"Vg" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/solgov/solgov_inkwell.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1848,10 +1848,10 @@
/area/ship/crew/canteen/kitchen)
"mz" = (
/obj/structure/closet/crate,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/solgov/solgov_paracelsus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -731,10 +731,10 @@
/area/ship/hallway/starboard)
"hh" = (
/obj/structure/closet/crate,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_panacea.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6072,7 +6072,7 @@
/area/ship/external/dark)
"JJ" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/store/cake/lemon{
/obj/item/food/cake/lemon{
pixel_y = 5
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
Expand Down
Loading

0 comments on commit 27a3409

Please sign in to comment.