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

Newfood Part 1: The Prequel #2834

Closed
wants to merge 14 commits into from
Closed

Newfood Part 1: The Prequel #2834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a3096ac
[WIP] Newfood: Part 1 of 4 (#8748)
Tsar-Salat May 14, 2023
8a72a0d
Patch
thgvr Mar 11, 2024
13248b9
This commit is far too large
thgvr Mar 12, 2024
e34d210
This commit now compiles
thgvr Mar 12, 2024
fdea656
asdsadfs
thgvr Mar 12, 2024
2006dbf
Unit test
thgvr Mar 12, 2024
e8e9bb9
Lints + Maps
thgvr Mar 12, 2024
56d9980
Maps pt 2
thgvr Mar 12, 2024
74fbcf2
Lint
thgvr Mar 12, 2024
f4d3a60
more lints
thgvr Mar 12, 2024
be25d53
ENOUGH
thgvr Mar 12, 2024
09b4d58
stop!!
thgvr Mar 12, 2024
e75986e
why does it detect commented code
thgvr Mar 12, 2024
3a84356
it didn't catch this one last time
thgvr Mar 12, 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
1 change: 0 additions & 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 @@ -609,7 +609,6 @@
/area/ruin/beach/complex)
"kK" = (
/obj/structure/closet/crate/bin,
/obj/item/reagent_containers/food/snacks/breadslice/moldy,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/concrete/slab_4,
/area/ruin/beach/complex)
Expand Down
3 changes: 0 additions & 3 deletions _maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,6 @@
icon_state = "1-4"
},
/obj/structure/spacevine/weak,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = 5
},
/turf/open/floor/pod,
/area/ruin/beach/starwalker)
"lq" = (
Expand Down
4 changes: 0 additions & 4 deletions _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,10 +240,6 @@
},
/obj/structure/table/wood/reinforced,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = 3;
pixel_y = 6
},
/obj/item/storage/fancy/nugget_box{
pixel_y = 10;
pixel_x = -5
Expand Down
7 changes: 0 additions & 7 deletions _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5384,9 +5384,6 @@
"Ih" = (
/obj/structure/table/wood,
/obj/machinery/light/directional/south,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = -8
},
/obj/item/reagent_containers/food/snacks/grown/berries/poison{
pixel_x = -6;
pixel_y = 6
Expand Down Expand Up @@ -7512,10 +7509,6 @@
},
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
/obj/effect/decal/cleanable/vomit/old,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = -4;
pixel_y = 16
},
/obj/item/reagent_containers/food/snacks/grown/berries/poison{
pixel_x = 2;
pixel_y = 19
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
/area/ruin/unpowered)
"F" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/store/cake/birthday,
/obj/item/food/cake/birthday,
/turf/open/floor/wood{
initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300"
},
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"f" = (
/obj/structure/rack,
/obj/item/reagent_containers/food/snacks/cornchips,
/obj/item/reagent_containers/food/snacks/butterdog,
/obj/item/reagent_containers/food/snacks/candy,
/obj/item/reagent_containers/food/snacks/canned/peaches,
/obj/item/reagent_containers/food/drinks/bottle/sarsaparilla,
Expand Down
15 changes: 2 additions & 13 deletions _maps/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,11 +423,6 @@
},
/turf/closed/wall/r_wall/rust,
/area/ruin/powered)
"lN" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/snacks/cakeslice/lime,
/turf/open/floor/carpet,
/area/ruin/powered)
"lQ" = (
/obj/effect/turf_decal/industrial/loading{
dir = 8
Expand Down Expand Up @@ -661,11 +656,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/powered)
"qv" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/snacks/cakeslice/chocolate,
/turf/open/floor/carpet,
/area/ruin/powered)
"qC" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/opaque/red{
Expand Down Expand Up @@ -1064,7 +1054,6 @@
/area/ruin/powered)
"Aj" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/snacks/cakeslice/cheese,
/turf/open/floor/carpet,
/area/ruin/powered)
"AC" = (
Expand Down Expand Up @@ -2787,7 +2776,7 @@ It
hy
Bz
DT
qv
Aj
AM
Va
"}
Expand Down Expand Up @@ -2851,7 +2840,7 @@ It
Uu
ux
kZ
lN
Aj
dd
Va
"}
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/clericden.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,6 @@
"AU" = (
/obj/structure/table/wood/reinforced,
/obj/item/toy/figure/chaplain,
/obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice,
/turf/open/floor/carpet/royalblack/airless,
/area/ruin/unpowered/no_grav)
"AV" = (
Expand Down
1 change: 0 additions & 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 @@ -1745,7 +1745,6 @@
/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/effect/decal/cleanable/confetti,
/obj/machinery/light/small/broken/directional/east,
/obj/structure/toilet,
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3620,7 +3620,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 @@ -6795,9 +6795,6 @@
dir = 8
},
/obj/item/trash/plate,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_y = 6
},
/obj/item/reagent_containers/food/snacks/spiderling{
pixel_y = 5;
pixel_x = 6
Expand Down
9 changes: 1 addition & 8 deletions _maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@
/area/ruin/powered)
"cS" = (
/obj/structure/table/wood/fancy/orange,
/obj/item/reagent_containers/food/snacks/store/cake/clown_cake,
/turf/open/floor/plating,
/area/ruin/powered)
"cU" = (
Expand Down Expand Up @@ -462,7 +461,6 @@
/area/ruin/powered)
"ep" = (
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/reagent_containers/food/snacks/butterdog,
/obj/structure/table,
/obj/item/coin/plastic,
/turf/open/floor/plating,
Expand Down Expand Up @@ -760,10 +758,6 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/ruin/powered)
"hd" = (
/obj/item/reagent_containers/food/snacks/cakeslice/clown_slice,
/turf/open/floor/mineral/bananium,
/area/ruin/powered)
"he" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
Expand Down Expand Up @@ -1396,7 +1390,6 @@
/area/ruin/powered)
"nc" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/snacks/cakeslice/brain,
/turf/open/floor/plating,
/area/ruin/powered)
"nd" = (
Expand Down Expand Up @@ -5822,7 +5815,7 @@ ik
HL
xx
ZL
hd
gL
Gq
Xe
av
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11619,8 +11619,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/pastatomato,
/obj/item/food/spaghetti/pastatomato,
/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
4 changes: 0 additions & 4 deletions _maps/outpost/nanotrasen_asteroid.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,6 @@
/area/outpost/maintenance/fore)
"aE" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/cakeslice/birthday{
pixel_x = -3;
pixel_y = -5
},
/obj/effect/decal/cleanable/confetti{
pixel_x = -12;
pixel_y = -3
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/independent/independent_lagoon.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,10 +2094,6 @@
pixel_y = 1
},
/obj/item/toy/cards/deck,
/obj/item/reagent_containers/food/snacks/butterbiscuit{
pixel_x = 6;
pixel_y = 6
},
/turf/open/floor/wood,
/area/ship/crew/dorm)
"nE" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/independent/independent_shepherd.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2056,7 +2056,6 @@
/area/ship/crew/library)
"sc" = (
/obj/structure/table/wood/reinforced,
/obj/item/reagent_containers/food/snacks/store/bread/meat,
/obj/item/reagent_containers/food/drinks/bottle/trappist{
pixel_x = -6;
pixel_y = 7
Expand Down
7 changes: 0 additions & 7 deletions _maps/shuttles/independent/independent_tranquility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2747,7 +2747,6 @@
/area/ship/crew/crewtwo)
"wA" = (
/obj/structure/table,
/obj/item/reagent_containers/food/snacks/cakeslice/lime,
/obj/item/kitchen/fork/plastic{
pixel_x = -11
},
Expand Down Expand Up @@ -3534,7 +3533,6 @@
/area/ship/crew/hydroponics)
"CH" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/garlicbread,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange{
pixel_x = -8;
pixel_y = 7
Expand Down Expand Up @@ -6089,11 +6087,6 @@
pixel_x = -11;
pixel_y = 11
},
/obj/item/reagent_containers/food/snacks/store/bread/banana{
pixel_x = 14;
pixel_y = 1
},
/obj/item/reagent_containers/food/snacks/breadslice/banana,
/turf/open/floor/plasteel,
/area/ship/crew/cryo)
"Vg" = (
Expand Down
7 changes: 0 additions & 7 deletions _maps/shuttles/pirate/pirate_ember.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4532,14 +4532,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = -6;
pixel_y = 10
},
/obj/structure/table/wood/reinforced,
/obj/item/reagent_containers/food/snacks/breadslice/creamcheese{
pixel_x = -1
},
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
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 @@ -1837,10 +1837,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 @@ -733,10 +733,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
8 changes: 0 additions & 8 deletions _maps/shuttles/syndicate/syndicate_aegis.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2016,14 +2016,6 @@
pixel_x = -4;
pixel_y = -8
},
/obj/item/reagent_containers/food/snacks/store/cake/bsvc{
pixel_x = 5;
pixel_y = 6
},
/obj/item/reagent_containers/food/snacks/store/cake/bscc{
pixel_x = -4;
pixel_y = 7
},
/turf/open/floor/wood/walnut,
/area/ship/crew/office)
"re" = (
Expand Down
Loading
Loading