Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MDB Ignore] Rkz's Newfood: Part 1 of 4 #3148

Merged
merged 12 commits into from
Jul 30, 2024
Merged

[MDB Ignore] Rkz's Newfood: Part 1 of 4 #3148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b94931d
signals and conversion
Tsar-Salat Jun 24, 2024
233fd19
maps n fixes
Tsar-Salat Jun 24, 2024
29a3dbe
fix duplication bug
Tsar-Salat Jun 24, 2024
6a23bf4
kick it
Tsar-Salat Jun 24, 2024
da2cd47
kick it again
Tsar-Salat Jun 24, 2024
5426a4b
Merge remote-tracking branch 'Upstream/master' into newfood-rkz
Tsar-Salat Jul 13, 2024
8aafad2
Update code/__DEFINES/food.dm
thgvr Jul 13, 2024
ea7c8c4
Update code/datums/components/food/edible.dm
thgvr Jul 13, 2024
ef274d3
Merge remote-tracking branch 'Upstream/master' into newfood-rkz
Tsar-Salat Jul 26, 2024
46dfecc
fix conflict
Tsar-Salat Jul 26, 2024
325a88d
clothing signals
Tsar-Salat Jul 26, 2024
b9604f7
moreee conflicts
Tsar-Salat Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading