updatepaths 2: electric boogaloo

shiptest-ss13 · Jun 2, 2024 · a76cb67 · a76cb67
1 parent 9214761
commit a76cb67
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 35 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -1859,15 +1859,8 @@
 	pixel_y = -32;
 	pixel_x = 32
 	},
-/obj/item/reagent_containers/food/drinks/solgovcup{
-	desc = "A cup with a strange flag emblazoned on it.";
-	pixel_y = 4;
-	pixel_x = 9
-	},
-/obj/item/reagent_containers/food/drinks/solgovcup{
-	desc = "A cup with a strange flag emblazoned on it.";
-	pixel_y = -2
-	},
+/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/reagent_containers/food/drinks/bottle/wine{
 	pixel_y = 10;
 	pixel_x = -9

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
@@ -1156,10 +1156,7 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ruin/whitesands/pubbycrash/engine_room)
 "Ak" = (
-/obj/item/reagent_containers/food/drinks/solgovcup{
-	pixel_x = 9;
-	pixel_y = -3
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/trash/pistachios{
 	pixel_y = 5
 	},

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm
@@ -2138,7 +2138,7 @@
 /area/ruin/powered)
 "Zs" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/solgovcup,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/effect/turf_decal/corner/opaque/green,
 /obj/effect/turf_decal/corner/opaque/green{
 	dir = 4

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -4184,7 +4184,7 @@
 "aNr" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/solgovcup,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -4532,7 +4532,7 @@
 /obj/item/reagent_containers/food/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/drinks/solgovcup,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel,
 /area/tdome/tdomeobserve)

diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -3689,10 +3689,7 @@
 	pixel_y = -5;
 	pixel_x = -9
 	},
-/obj/item/reagent_containers/food/drinks/solgovcup{
-	pixel_x = -7;
-	pixel_y = 10
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/effect/turf_decal/trimline/opaque/blue/filled/line{
 	dir = 4
 	},

diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
@@ -1341,10 +1341,7 @@
 	pixel_x = 8;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/solgovcup{
-	pixel_x = -6;
-	pixel_y = -1
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/phone{
 	pixel_x = 9;
 	pixel_y = -2
@@ -3159,10 +3156,7 @@
 	pixel_x = 4;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/food/drinks/solgovcup{
-	pixel_x = -5;
-	pixel_y = 7
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/effect/turf_decal/siding/wood,
 /obj/item/lipstick{
 	pixel_x = -5;
@@ -4835,9 +4829,7 @@
 	dir = 4
 	},
 /obj/structure/table/wood/reinforced,
-/obj/item/reagent_containers/food/drinks/solgovcup{
-	pixel_x = 9
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/canteen)
 "VK" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -11028,10 +11028,7 @@
 	pixel_x = -5;
 	pixel_y = -12
 	},
-/obj/item/reagent_containers/food/drinks/solgovcup{
-	pixel_x = 8;
-	pixel_y = -4
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/newspaper{
 	pixel_x = -8;
 	pixel_y = 5

diff --git a/tools/UpdatePaths/Scripts/3109_drinks_lore_update.txt b/tools/UpdatePaths/Scripts/3109_drinks_lore_update.txt
@@ -7,3 +7,5 @@
 /obj/item/reagent_containers/food/drinks/soda_cans/shamblers : /obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch
 /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull : /obj/item/reagent_containers/food/drinks/soda_cans/crosstalk
 /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy : /obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy
+/obj/item/reagent_containers/food/drinks/britcup : /obj/item/reagent_containers/food/drinks/mug
+/obj/item/reagent_containers/food/drinks/solgovcup : /obj/item/reagent_containers/food/drinks/mug