cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/clara-dev-pink-moo-drink' into clara-dev-pink-moo-drink

Browse Source
This commit is contained in:
Riley
2020-08-13 04:11:14 -04:00
parent 80bc172478 7de3ca1895
commit 4b5a2c60d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/food/drinkingglass/metaglass.dm
View File

@@ -23,7 +23,7 @@
icon = R.glass_icon_file icon = R.glass_icon_file
else else
icon = initial(icon) icon = initial(icon)
if(R.glass_icon_state) if(R.glass_icon_state)
icon_state = R.glass_icon_state icon_state = R.glass_icon_state
else else
@@ -670,4 +670,4 @@ Drinks Data
glass_center_of_mass = list("x"=16, "y"=8) glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/ethanol/mojito /datum/reagent/ethanol/mojito
glass_icon_state = "mojito" glass_icon_state = "mojito"