Skip to content

Commit

Permalink
Fixes condiment packs (#3350)
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
fixes #2367
also removes the /food/ from the path since it does nothing
<!-- 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

<!-- 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:
fix: condiment packs are no longer invisible and missing names
/: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: FalloutFalcon <[email protected]>
  • Loading branch information
@FalloutFalcon
FalloutFalcon authored Sep 29, 2024
1 parent 25e6275 commit f727ce8
Show file tree
Hide file tree
Showing 50 changed files with 436 additions and 349 deletions.
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_float_resort.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1314,10 +1314,10 @@
/area/ruin/beach/float_resort)
"Ja" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/condiment/ketchup{
/obj/item/reagent_containers/condiment/ketchup{
pixel_y = 18
},
/obj/item/reagent_containers/food/condiment/mayonnaise{
/obj/item/reagent_containers/condiment/mayonnaise{
pixel_x = -8;
pixel_y = 16
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,9 @@
/obj/item/reagent_containers/food/snacks/fishmeat/carp,
/obj/item/reagent_containers/food/snacks/fishmeat/carp,
/obj/item/reagent_containers/food/snacks/fishmeat/carp,
/obj/item/reagent_containers/food/condiment/pack/ketchup,
/obj/item/reagent_containers/food/condiment/pack/ketchup,
/obj/item/reagent_containers/food/condiment/pack/ketchup,
/obj/item/reagent_containers/condiment/pack/ketchup,
/obj/item/reagent_containers/condiment/pack/ketchup,
/obj/item/reagent_containers/condiment/pack/ketchup,
/obj/effect/turf_decal/corner/opaque/black{
dir = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -8;
pixel_y = 5
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
dir = 5
},
/obj/item/stack/cable_coil/cut/green,
/obj/item/reagent_containers/food/condiment/peppermill,
/obj/item/reagent_containers/condiment/peppermill,
/turf/open/floor/plating/rust,
/area/ruin/jungle/interceptor/starhall)
"au" = (
Expand Down Expand Up @@ -992,9 +992,9 @@
/obj/structure/closet/wall/directional/east,
/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/rice,
/turf/open/floor/plasteel/tech/techmaint,
/area/ruin/jungle/interceptor/starhall)
"hO" = (
Expand Down Expand Up @@ -2887,7 +2887,7 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/food/condiment/saltshaker{
/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 5;
pixel_y = 5
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1465,19 +1465,19 @@
pixel_x = 9
},
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -3;
pixel_y = 6
},
/obj/item/reagent_containers/glass/beaker{
pixel_x = -2
},
/obj/item/reagent_containers/food/condiment/peppermill{
/obj/item/reagent_containers/condiment/peppermill{
desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
pixel_x = -8;
pixel_y = 2
},
/obj/item/reagent_containers/food/condiment/saltshaker{
/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2100,11 +2100,11 @@
pixel_y = 29;
pixel_x = -2
},
/obj/item/reagent_containers/food/condiment/saltshaker{
/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 17;
pixel_x = -3
},
/obj/item/reagent_containers/food/condiment/peppermill{
/obj/item/reagent_containers/condiment/peppermill{
pixel_y = 17;
pixel_x = 4
},
Expand Down Expand Up @@ -2549,7 +2549,7 @@
pixel_y = 7;
pixel_x = -9
},
/obj/item/reagent_containers/food/condiment/bbqsauce{
/obj/item/reagent_containers/condiment/bbqsauce{
pixel_y = 6;
pixel_x = 7
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3133,7 +3133,7 @@
/obj/structure/closet/secure_closet/freezer/kitchen/wall{
pixel_y = 29
},
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/condiment/rice,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/unpowered/crashed_starwalker)
Expand Down
16 changes: 8 additions & 8 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,11 +705,11 @@
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/rice,
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/soymilk,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/reagent_containers/condiment/milk,
/obj/item/storage/box/ingredients/vegetarian,
/turf/open/floor/wood,
/area/ruin/lavaland/factory/adminstrative)
Expand Down Expand Up @@ -1578,11 +1578,11 @@
/obj/effect/turf_decal/corner/opaque/bar,
/obj/machinery/light/directional/east,
/obj/item/storage/box/ingredients/vegetarian,
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/soymilk,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/rice,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
/obj/machinery/reagentgrinder{
pixel_y = 5
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -2;
pixel_y = 6
},
Expand Down Expand Up @@ -517,7 +517,7 @@
pixel_x = -1;
pixel_y = 3
},
/obj/item/reagent_containers/food/condiment/sugar{
/obj/item/reagent_containers/condiment/sugar{
pixel_x = 5;
pixel_y = 5
},
Expand Down Expand Up @@ -769,12 +769,12 @@
"mO" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/item/reagent_containers/food/condiment/peppermill{
/obj/item/reagent_containers/condiment/peppermill{
desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
pixel_x = -8;
pixel_y = 2
},
/obj/item/reagent_containers/food/condiment/saltshaker{
/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
Expand Down
34 changes: 17 additions & 17 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
/obj/structure/catwalk/over,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table/glass,
/obj/item/reagent_containers/food/condiment/sugar{
/obj/item/reagent_containers/condiment/sugar{
pixel_y = 13;
pixel_x = -2;
layer = 2.8
Expand All @@ -65,7 +65,7 @@
pixel_y = 6;
layer = 2.8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 10;
pixel_x = 10
},
Expand Down Expand Up @@ -296,8 +296,8 @@
/obj/effect/turf_decal/industrial/outline/red,
/obj/item/reagent_containers/food/snacks/grown/corn,
/obj/item/reagent_containers/food/snacks/grown/corn,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/food/snacks/grown/corn{
pixel_y = 3
},
Expand Down Expand Up @@ -1250,33 +1250,33 @@
"om" = (
/obj/structure/catwalk/over,
/obj/structure/closet/crate/hydroponics,
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 8;
pixel_x = -8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 8;
pixel_x = -8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 8
},
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 8
},
/turf/open/floor/plating/rockplanet/lit,
Expand Down Expand Up @@ -2140,12 +2140,12 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/rack,
/obj/item/reagent_containers/food/condiment/sugar{
/obj/item/reagent_containers/condiment/sugar{
pixel_y = 13;
pixel_x = -2;
layer = 2.8
},
/obj/item/reagent_containers/food/condiment/sugar{
/obj/item/reagent_containers/condiment/sugar{
pixel_y = 7;
pixel_x = -2;
layer = 2.8
Expand Down Expand Up @@ -2897,10 +2897,10 @@
/obj/item/seeds/corn,
/obj/item/seeds/corn,
/obj/item/seeds/corn,
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -8
},
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/condiment/enzyme,
/obj/item/reagent_containers/food/snacks/grown/corn{
pixel_y = 4
},
Expand Down
30 changes: 15 additions & 15 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1430,10 +1430,10 @@
name = "Kiosk Shutters";
dir = 4
},
/obj/item/reagent_containers/food/condiment/sugar{
/obj/item/reagent_containers/condiment/sugar{
pixel_y = 5
},
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar,
/obj/structure/closet/wall/directional/north,
/obj/item/spacecash/bundle/c100,
/turf/open/floor/plasteel/dark,
Expand Down Expand Up @@ -2212,10 +2212,10 @@
"iE" = (
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/condiment/saltshaker{
/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4
},
/obj/item/reagent_containers/food/condiment/peppermill{
/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -4
},
/obj/machinery/door/poddoor/shutters{
Expand Down Expand Up @@ -3478,10 +3478,10 @@
/area/ruin/space/has_grav/spacemall)
"ns" = (
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/item/reagent_containers/food/condiment/sugar{
/obj/item/reagent_containers/condiment/sugar{
pixel_y = -5
},
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/condiment/flour,
/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/dorms)
Expand Down Expand Up @@ -5966,15 +5966,15 @@
pixel_x = -30;
dir = 4
},
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/food/condiment/rice,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/rice,
/obj/item/reagent_containers/condiment/rice,
/obj/item/reagent_containers/condiment/rice,
/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/dorms)
Expand Down
12 changes: 6 additions & 6 deletions _maps/map_files/generic/CentCom.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4407,7 +4407,7 @@
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
"aOO" = (
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/condiment/enzyme,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/book/manual/wiki/drinks,
/obj/structure/closet/crate,
Expand Down Expand Up @@ -4515,11 +4515,11 @@
"aPq" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/item/reagent_containers/food/condiment/saltshaker{
/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
/obj/item/reagent_containers/food/condiment/peppermill{
/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/mug,
Expand Down Expand Up @@ -10956,11 +10956,11 @@
/area/centcom/control)
"lii" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/condiment/saltshaker{
/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
/obj/item/reagent_containers/food/condiment/peppermill{
/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
/obj/item/melee/knife/kitchen,
Expand Down Expand Up @@ -14482,7 +14482,7 @@
"rUH" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/snacks/mint,
/obj/item/reagent_containers/food/condiment/enzyme{
/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/obj/effect/turf_decal/corner/transparent/neutral{
Expand Down
Loading

0 comments on commit f727ce8

Please sign in to comment.