From 95d282f6be62ff744d05cced0626cbbe77f287af Mon Sep 17 00:00:00 2001 From: ORCACommander Date: Sat, 27 Aug 2022 13:32:47 -0400 Subject: [PATCH] [MDB IGNORE] Fixes some missed drinks in the refactor and resets the migration script to upstream (#15875) Gotta fix that migration --- .../centcom/centcom_shuttle_dock.dmm | 24 +++++++++---------- .../Scripts/69081_drinks_refactor.txt | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm b/_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm index 179c5a0b606..76e6809c8c2 100644 --- a/_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm +++ b/_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm @@ -686,7 +686,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = 7; pixel_y = 14 }, @@ -694,7 +694,7 @@ pixel_x = -5; pixel_y = 4 }, -/obj/item/reagent_containers/glass/rag{ +/obj/item/reagent_containers/cup/rag{ pixel_x = -4; pixel_y = 11 }, @@ -1202,14 +1202,14 @@ dir = 1 }, /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/condiment/mayonnaise, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/mayonnaise, +/obj/item/reagent_containers/condiment/enzyme, /obj/item/storage/fancy/egg_box, /obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/reagent_containers/food/condiment/soymilk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, /turf/open/floor/iron/kitchen/small, /area/centcom/central_command_areas/evacuation) "Gw" = ( @@ -1642,11 +1642,11 @@ /area/centcom/central_command_areas/evacuation) "QF" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -6; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/item/kitchen/rollingpin, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) @@ -1717,11 +1717,11 @@ "RU" = ( /obj/structure/table/reinforced, /obj/machinery/light/directional/west, -/obj/item/reagent_containers/food/condiment/rice{ +/obj/item/reagent_containers/condiment/rice{ pixel_x = -6; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/condiment/rice, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) "Sa" = ( diff --git a/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt b/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt index 746a1519130..f4447a392ae 100644 --- a/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt +++ b/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt @@ -1,25 +1,25 @@ # Glasses to cups -/obj/item/reagent_containers/cup/@SUBTYPES : /obj/item/reagent_containers/cup/@SUBTYPES {@OLD} +/obj/item/reagent_containers/glass/@SUBTYPES : /obj/item/reagent_containers/cup/@SUBTYPES {@OLD} # Foods -/obj/item/reagent_containers/cup/glass/@SUBTYPES : /obj/item/reagent_containers/cup/glass/@SUBTYPES {@OLD} -/obj/item/reagent_containers/condiment/@SUBTYPES : /obj/item/reagent_containers/condiment/@SUBTYPES {@OLD} +/obj/item/reagent_containers/food/drinks/@SUBTYPES : /obj/item/reagent_containers/cup/glass/@SUBTYPES {@OLD} +/obj/item/reagent_containers/food/condiment/@SUBTYPES : /obj/item/reagent_containers/condiment/@SUBTYPES {@OLD} # Sodas -/obj/item/reagent_containers/cup/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD} -/obj/item/reagent_containers/cup/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD} +/obj/item/reagent_containers/cup/glass/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD} +/obj/item/reagent_containers/food/drinks/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD} # Juices -/obj/item/reagent_containers/cup/glass/glass/bottle/tomatojuice : /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice {@OLD} -/obj/item/reagent_containers/cup/glass/glass/bottle/orangejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice {@OLD} -/obj/item/reagent_containers/cup/glass/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD} -/obj/item/reagent_containers/cup/glass/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD} -/obj/item/reagent_containers/cup/glass/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD} -/obj/item/reagent_containers/cup/glass/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/tomatojuice : /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/orangejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD} /obj/item/reagent_containers/cup/glass/bottle/tomatojuice : /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice {@OLD} /obj/item/reagent_containers/cup/glass/bottle/orangejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice {@OLD} /obj/item/reagent_containers/cup/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD} /obj/item/reagent_containers/cup/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD} /obj/item/reagent_containers/cup/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD} -/obj/item/reagent_containers/cup/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD} +/obj/item/reagent_containers/cup/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD} \ No newline at end of file