From 3b3df27daccc41fd499af7145e7484f0e0920b4a Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Fri, 18 Jun 2021 17:00:11 -0400
Subject: [PATCH] Fix metaglass stuff

The conversion to Pink Russian PR overlooked this metaglass portion. Fixy.

~Also sneaking in map file name fixes because OCD, kek. 5-8-9 = no. 5-6-7 = yes.~
---
 .../food/drinkingglass/metaglass_vr.dm        |   4 ++--
 icons/obj/drinks_vr.dmi                       | Bin 37986 -> 37985 bytes
 ...her-08-mining.dmm => tether-06-mining.dmm} |   0
 ...her-09-solars.dmm => tether-07-solars.dmm} |   0
 maps/tether/tether.dm                         |   4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename maps/tether/{tether-08-mining.dmm => tether-06-mining.dmm} (100%)
 rename maps/tether/{tether-09-solars.dmm => tether-07-solars.dmm} (100%)

diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm
index a718acf86db..06abdba8c18 100644
--- a/code/modules/food/drinkingglass/metaglass_vr.dm
+++ b/code/modules/food/drinkingglass/metaglass_vr.dm
@@ -118,8 +118,8 @@
 	glass_center_of_mass = list("x"=16, "y"=8)
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
-/datum/reagent/ethanol/pink_moo
-	glass_icon_state = "pinkmooglass"
+/datum/reagent/ethanol/pink_russian
+	glass_icon_state = "pinkrussianglass"
 	glass_center_of_mass = list("x"=16, "y"=9)
 	glass_icon_file = 'icons/obj/drinks_vr.dmi'
 
diff --git a/icons/obj/drinks_vr.dmi b/icons/obj/drinks_vr.dmi
index f1a34845330abbf4e3f0a878ba9e5604295d7949..57178d2a828a69e9d693ddacd57fe0885c3eb2e6 100644
GIT binary patch
delta 147
zcmV;E0Brx_r~=`r0+1vDY_TN*1Am9M#OQ>%{n?Y5+z{`N-szrWp@stZIQa+Tk4*pC
zA|v-o^##lW%SnHr?QQgAm1}dRU>guh$^mG&t`QB)_eq9?q5&)HNbzEUP@%|tCq)Ns
z<rTxU>MxhNzg#{7KNnxWzZS3G-j@FX_REFdadUZi001BWNkl<Zc%1B=d9$YjyO6Qm
BNihHb

delta 147
zcmV;E0Brx^r~=}s0+1vDZLuW+1Ams4mwt4@-2UvzOm2tw$L@5$u~0(+e4PAq@kgeA
zZIF?BrSbyif#sw>(DpWZvdWb?Q?LyPCFSrlT-S&O=6fVVLeYQ~cBFW*K&Vh;zKf!R
zw(^QWTJ@Jp-Cr&rfuD=7-(QQ@Z*R;00A>_~B$q@mOaK5N07*naRCt{1owKC_ypZku
BNdy1@

diff --git a/maps/tether/tether-08-mining.dmm b/maps/tether/tether-06-mining.dmm
similarity index 100%
rename from maps/tether/tether-08-mining.dmm
rename to maps/tether/tether-06-mining.dmm
diff --git a/maps/tether/tether-09-solars.dmm b/maps/tether/tether-07-solars.dmm
similarity index 100%
rename from maps/tether/tether-09-solars.dmm
rename to maps/tether/tether-07-solars.dmm
diff --git a/maps/tether/tether.dm b/maps/tether/tether.dm
index 1dee1fc0422..94137cb8ee1 100644
--- a/maps/tether/tether.dm
+++ b/maps/tether/tether.dm
@@ -16,8 +16,8 @@
 		#include "tether-03-surface3.dmm"
 		#include "tether-04-transit.dmm"
 		#include "tether-05-station1.dmm"
-		#include "tether-08-mining.dmm"
-		#include "tether-09-solars.dmm"
+		#include "tether-06-mining.dmm"
+		#include "tether-07-solars.dmm"
 	#endif
 
 	#include "submaps/_tether_submaps.dm"