cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB IGNORE] Fixes some missed drinks in the refactor and resets the migration script to upstream (#15875)

Browse Source 
Gotta fix that migration
This commit is contained in:
ORCACommander
2022-08-27 13:32:47 -04:00
committed by GitHub
parent 2f3628d6d6
commit 95d282f6be
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm
+12 -12
View File
@@ -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" = (
tools/UpdatePaths/Scripts/69081_drinks_refactor.txt
+12 -12
View File
@@ -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}